github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 04:50:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved database validation

Browse source
This commit is contained in:
Serghey Rodin 2012-12-11 21:58:16 +02:00
commit 868f9052eb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
func/main.sh
View file

@ -590,9 +590,9 @@ validate_format_domain_alias() {
# Database # Database
validate_format_database() { validate_format_database() {
exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]" exclude="[!|@|#|$|^|&|*|(|)|+|-|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]"
if [[ "$1" =~ $exclude ]] || [ 17 -le ${#1} ]; then if [[ "$1" =~ $exclude ]] || [ 17 -le ${#1} ]; then
echo "Error: database $1 is not valid" echo "Error: $2 $1 is not valid"
log_event "$E_INVALID" "$EVENT" log_event "$E_INVALID" "$EVENT"
exit $E_INVALID exit $E_INVALID
fi fi
@ -717,10 +717,10 @@ validate_format(){
backup) validate_format_date "$arg" ;; backup) validate_format_date "$arg" ;;
charset) validate_format_username "$arg" "$arg_name" ;; charset) validate_format_username "$arg" "$arg_name" ;;
charsets) validate_format_common "$arg" 'charsets' ;; charsets) validate_format_common "$arg" 'charsets' ;;
database) validate_format_database "$arg" ;; database) validate_format_database "$arg" 'database';;
day) validate_format_mhdmw "$arg" $arg_name ;; day) validate_format_mhdmw "$arg" $arg_name ;;
dbpass) validate_format_password "$arg" ;; dbpass) validate_format_password "$arg" ;;
dbuser) validate_format_database "$arg" ;; dbuser) validate_format_database "$arg" 'db_user';;
dkim) validate_format_boolean "$arg" 'dkim' ;; dkim) validate_format_boolean "$arg" 'dkim' ;;
dkim_size) validate_format_key_size "$arg" ;; dkim_size) validate_format_key_size "$arg" ;;
domain) validate_format_domain "$arg" ;; domain) validate_format_domain "$arg" ;;