From 16f1d09722de11837ae06250a53d19813d6f2fda Mon Sep 17 00:00:00 2001 From: Matthew Saunders Brown Date: Mon, 30 Dec 2024 10:50:42 -0800 Subject: [PATCH] fix domain regex, domains can start with numbers --- bin/letsencrypt-add.sh | 2 +- bin/letsencrypt-certonly.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/letsencrypt-add.sh b/bin/letsencrypt-add.sh index dd66f71..85056da 100755 --- a/bin/letsencrypt-add.sh +++ b/bin/letsencrypt-add.sh @@ -32,7 +32,7 @@ while getopts "hd:" opt; do d ) # domain name (hostname) to create cert for domain=${OPTARG,,} # basic but good enough domain name regex validation - if [[ ! $domain =~ ^(([a-zA-Z](-?[a-zA-Z0-9])*)\.)+[a-zA-Z]{2,}$ ]] ; then + if [[ ! $domain =~ ^(([a-zA-Z0-9](-?[a-zA-Z0-9])*)\.)+[a-zA-Z]{2,}$ ]] ; then echo "ERROR: Invalid domain name: $1" exit 1 fi diff --git a/bin/letsencrypt-certonly.sh b/bin/letsencrypt-certonly.sh index dffc9cf..168cae6 100755 --- a/bin/letsencrypt-certonly.sh +++ b/bin/letsencrypt-certonly.sh @@ -34,7 +34,7 @@ while getopts "hd:tn" opt; do d ) # domain name (hostname) to create cert for domain=${OPTARG,,} # basic but good enough domain name regex validation - if [[ ! $domain =~ ^(([a-zA-Z](-?[a-zA-Z0-9])*)\.)+[a-zA-Z]{2,}$ ]] ; then + if [[ ! $domain =~ ^(([a-zA-Z0-9](-?[a-zA-Z0-9])*)\.)+[a-zA-Z]{2,}$ ]] ; then echo "ERROR: Invalid domain name: $1" exit 1 fi