浏览代码

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
Robert Zollner 6 年之前
父节点
当前提交
a885684a5d
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 1 1
      bin/v-add-domain
  2. 6 2
      bin/v-add-letsencrypt-domain

+ 1 - 1
bin/v-add-domain

@@ -25,7 +25,7 @@ source $HESTIA/conf/hestia.conf
 #                    Verifications                         #
 #----------------------------------------------------------#
 check_args '2' "$#" 'USER DOMAIN [IP] [RESTART]'
-is_format_valid 'user' 'domain'
+is_format_valid 'user' 'domain' 'restart'
 if [ ! -z "$ip" ] ; then
     is_format_valid 'ip'
 fi

+ 6 - 2
bin/v-add-letsencrypt-domain

@@ -13,7 +13,7 @@
 user=$1
 domain=$2
 aliases=$3
-mail=$4
+mail=${4// }
 
 # Includes
 source $HESTIA/func/main.sh
@@ -67,7 +67,11 @@ check_args '2' "$#" 'USER DOMAIN [ALIASES] [MAIL]'
 is_format_valid 'user' 'domain' 'aliases'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
-if [[ -z "${mail// }" ]] || [ "$mail" = 'no' ]; then
+if [ ! -z "$mail" ]; then
+    is_boolean_format_valid "$mail" 'mail'
+fi
+
+if [ "$mail" = 'no' ]; then
     mail=''
     is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
     is_object_valid 'web' 'DOMAIN' "$domain"