github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 21:04:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

dashes as valid character for mysql databases

Browse source
This commit is contained in:
Serghey Rodin 2012-12-11 22:56:53 +02:00
commit fe7c4cb95c
2 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
func/db.sh
View file

@ -102,17 +102,19 @@ add_mysql_database() {
exit $E_DB exit $E_DB
fi fi
query="CREATE DATABASE $database CHARACTER SET $charset"
query="CREATE DATABASE \`$database\` CHARACTER SET $charset"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="GRANT ALL ON $database.* TO '$dbuser'@'%' IDENTIFIED BY '$dbpass'" query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\`
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="GRANT ALL ON $database.* TO '$dbuser'@'localhost'
IDENTIFIED BY '$dbpass'" IDENTIFIED BY '$dbpass'"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="SHOW GRANTS FOR '$dbuser'" query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost
IDENTIFIED BY '$dbpass'"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="SHOW GRANTS FOR \`$dbuser\`"
md5=$(mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query") md5=$(mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query")
md5=$(echo "$md5" |grep 'PASSWORD' |tr ' ' '\n' |tail -n1 |cut -f 2 -d \') md5=$(echo "$md5" |grep 'PASSWORD' |tr ' ' '\n' |tail -n1 |cut -f 2 -d \')
} }
@ -215,10 +217,11 @@ change_mysql_password() {
exit $E_DB exit $E_DB
fi fi
query="GRANT ALL ON $database.* TO '$DBUSER'@'%' IDENTIFIED BY '$dbpass'" query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\`
IDENTIFIED BY '$dbpass'"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="GRANT ALL ON $database.* TO '$DBUSER'@'localhost' query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost
IDENTIFIED BY '$dbpass'" IDENTIFIED BY '$dbpass'"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
@ -271,13 +274,13 @@ delete_mysql_database() {
exit $E_DB exit $E_DB
fi fi
query="DROP DATABASE $database" query="DROP DATABASE \`$database\`"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="REVOKE ALL ON $database.* FROM '$DBUSER'@'%'" query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="REVOKE ALL ON $database.* FROM '$DBUSER'@'localhost'" query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@localhost"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
if [ "$(grep "DBUSER='$DBUSER'" $USER_DATA/db.conf |wc -l)" -lt 2 ]; then if [ "$(grep "DBUSER='$DBUSER'" $USER_DATA/db.conf |wc -l)" -lt 2 ]; then
@ -409,12 +412,11 @@ suspend_mysql_database() {
exit $E_DB exit $E_DB
fi fi
query="REVOKE ALL ON $database.* FROM '$DBUSER'@'%'" query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="REVOKE ALL ON $database.* FROM '$DBUSER'@'localhost'" query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@localhost"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
} }
# Suspend PostgreSQL database # Suspend PostgreSQL database
@ -458,10 +460,10 @@ unsuspend_mysql_database() {
exit $E_DB exit $E_DB
fi fi
query="GRANT ALL ON $database.* FROM '$DBUSER'@'%'" query="GRANT ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="GRANT ALL ON $database.* TO '$DBUSER'@'localhost'" query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
} }
@ -507,7 +509,7 @@ get_mysql_disk_usage() {
fi fi
query="SELECT SUM( data_length + index_length ) / 1024 / 1024 \"Size\" query="SELECT SUM( data_length + index_length ) / 1024 / 1024 \"Size\"
FROM information_schema.TABLES WHERE table_schema='$database'" FROM information_schema.TABLES WHERE table_schema=\`$database\`"
usage=$(mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" |tail -n1) usage=$(mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" |tail -n1)
if [ "$usage" == 'NULL' ] || [ "${usage:0:1}" -eq '0' ]; then if [ "$usage" == 'NULL' ] || [ "${usage:0:1}" -eq '0' ]; then
usage=1 usage=1
@ -566,13 +568,13 @@ rebuild_mysql_database() {
exit $E_DB exit $E_DB
fi fi
query="CREATE DATABASE $database CHARACTER SET $CHARSET" query="CREATE DATABASE \`$database\` CHARACTER SET $CHARSET"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="GRANT ALL ON $database.* TO '$DBUSER'@'%'" query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\`"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="GRANT ALL ON $database.* TO '$DBUSER'@'localhost'" query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost"
mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null mysql -h $HOST -u $USER -p$PASSWORD -P $PORT -e "$query" &> /dev/null
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER';" query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER';"

2
func/main.sh
View file

@ -590,7 +590,7 @@ 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: $2 $1 is not valid" echo "Error: $2 $1 is not valid"
log_event "$E_INVALID" "$EVENT" log_event "$E_INVALID" "$EVENT"