Skip to content

Commit 25b2a01

Browse files
committed
Fixes for supporting passwords with weird characters
Use URL encoding in DATABASE_URL and return mysql_options as an array (via ugly global variable), so each element in it can be separately added to the command line using `@` for expansion. Because of changing the script to bash, also reverts some of the changes in 483200a.
1 parent 506206e commit 25b2a01

File tree

1 file changed

+33
-13
lines changed

1 file changed

+33
-13
lines changed

sql/dj_setup_database.in

+33-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# @configure_input@
33

44
# This script allows one to perform DOMjudge database setup actions.
@@ -52,30 +52,47 @@ not have to pass any of the options above.
5252
EOF
5353
}
5454

55+
urlencode()
56+
{
57+
php -r "echo rawurlencode('$1');"
58+
}
59+
60+
# This is global variable to be able to return the output from
61+
# mysql_options() below as an array, which is not possible otherwise.
62+
declare -a _mysql_options
63+
5564
mysql_options()
5665
{
66+
local user pass
67+
_mysql_options=()
68+
5769
# shellcheck disable=SC2153
5870
if [ -n "$DBUSER" ]; then
59-
_user="-u $DBUSER"
60-
else
61-
_user="${DBA_USER:+-u ${DBA_USER}}"
71+
_mysql_options+=('-u' "$DBUSER")
72+
elif [ -n "$DBA_USER" ]; then
73+
_mysql_options+=('-u' "$DBA_USER")
6274
fi
6375
# shellcheck disable=SC2153
6476
if [ -n "$PASSWD" ]; then
65-
_pass="-p$PASSWD"
66-
else
67-
[ -n "$PROMPT_PASSWD" ] && _pass="-p"
68-
[ -n "$DBA_PASSWD" ] && _pass="-p$DBA_PASSWD"
77+
_mysql_options+=("-p$PASSWD")
78+
elif [ -n "$DBA_PASSWD" ]; then
79+
_mysql_options+=("-p$DBA_PASSWD")
80+
elif [ -n "$PROMPT_PASSWD" ]; then
81+
_mysql_options+=('-p')
6982
fi
7083

71-
[ -z "$USE_SOCKET" ] && port="-P$DBPORT"
72-
echo $_user ${_pass:+"$_pass"} -h "$DBHOST" ${port:+"$port"}
84+
_mysql_options+=('-h' "$DBHOST")
85+
86+
if [ -z "$USE_SOCKET" ]; then
87+
_mysql_options+=("-P$DBPORT")
88+
fi
7389
}
7490

7591
# Wrapper around mysql command to allow setting options, user, etc.
7692
mysql()
7793
{
78-
command mysql $(mysql_options) --silent --skip-column-names "$@"
94+
mysql_options
95+
command mysql "${_mysql_options[@]}" --silent --skip-column-names "$@"
7996
}
8097

8198
# Quick shell hack to get a key from an INI file.
@@ -126,10 +143,13 @@ symfony_console()
126143
fi
127144

128145
if [ -n "$DBA_USER" ]; then
146+
user=$(urlencode "${DBA_USER}")
147+
host=$(urlencode "${domjudge_DBHOST}")
148+
db=$(urlencode "${domjudge_DBNAME}")
129149
if [ -n "$DBA_PASSWD" ]; then
130-
DATABASE_URL=mysql://${DBA_USER}:${DBA_PASSWD}@${domjudge_DBHOST}:${domjudge_DBPORT}/${domjudge_DBNAME}
150+
DATABASE_URL="mysql://$user:$(urlencode "${DBA_PASSWD}")@$host:${domjudge_DBPORT}/$db"
131151
else
132-
DATABASE_URL=mysql://${DBA_USER}@${domjudge_DBHOST}:${domjudge_DBPORT}/${domjudge_DBNAME}
152+
DATABASE_URL="mysql://$user@$host:${domjudge_DBPORT}/$db"
133153
fi
134154
fi
135155
fi

0 commit comments

Comments
 (0)