Skip to content

Commit a885684

Browse files
committed
Sec: Fix input validation in v-add-domain and v-add-letsencrypt-domain
v-add-domain: - restart: Validate bool_format, optional arg v-add-letsencrypt-domain: - mail: Validate bool_format, optional arg
1 parent 28b1aed commit a885684

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

bin/v-add-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ source $HESTIA/conf/hestia.conf
2525
# Verifications #
2626
#----------------------------------------------------------#
2727
check_args '2' "$#" 'USER DOMAIN [IP] [RESTART]'
28-
is_format_valid 'user' 'domain'
28+
is_format_valid 'user' 'domain' 'restart'
2929
if [ ! -z "$ip" ] ; then
3030
is_format_valid 'ip'
3131
fi

bin/v-add-letsencrypt-domain

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
user=$1
1414
domain=$2
1515
aliases=$3
16-
mail=$4
16+
mail=${4// }
1717

1818
# Includes
1919
source $HESTIA/func/main.sh
@@ -67,7 +67,11 @@ check_args '2' "$#" 'USER DOMAIN [ALIASES] [MAIL]'
6767
is_format_valid 'user' 'domain' 'aliases'
6868
is_object_valid 'user' 'USER' "$user"
6969
is_object_unsuspended 'user' 'USER' "$user"
70-
if [[ -z "${mail// }" ]] || [ "$mail" = 'no' ]; then
70+
if [ ! -z "$mail" ]; then
71+
is_boolean_format_valid "$mail" 'mail'
72+
fi
73+
74+
if [ "$mail" = 'no' ]; then
7175
mail=''
7276
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
7377
is_object_valid 'web' 'DOMAIN' "$domain"

0 commit comments

Comments
 (0)