diff --git a/bin/v_add_dns_domain b/bin/v_add_dns_domain index ace2fa4e..955d16ea 100755 --- a/bin/v_add_dns_domain +++ b/bin/v_add_dns_domain @@ -116,7 +116,7 @@ increase_user_value "$user" '$U_DNS_DOMAINS' increase_user_value "$user" '$U_DNS_RECORDS' "$records" # Restart named -$BIN/v_restart_web "$EVENT" +$BIN/v_restart_dns "$EVENT" # Logging log_history "$EVENT" diff --git a/func/main.sh b/func/main.sh index a9a0838d..915cd482 100755 --- a/func/main.sh +++ b/func/main.sh @@ -562,6 +562,16 @@ validate_format_domain() { fi } +# Domain alias +validate_format_domain_alias() { + exclude="[!|@|#|$|^|&|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]" + if [[ "$1" =~ $exclude ]] || [[ "$1" =~ "^[0-9]+$" ]]; then + echo "Error: domain alias $1 is not valid" + log_event "$E_INVALID" "$EVENT" + exit $E_INVALID + fi +} + # Database validate_format_database() { exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]" @@ -698,7 +708,7 @@ validate_format(){ dkim) validate_format_boolean "$arg" 'dkim' ;; dkim_size) validate_format_key_size "$arg" ;; domain) validate_format_domain "$arg" ;; - dom_alias) validate_format_domain "$arg" ;; + dom_alias) validate_format_domain_alias "$arg" ;; dvalue) validate_format_dvalue "$arg";; email) validate_format_email "$arg" ;; exp) validate_format_date "$arg" ;;