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.

Author: eldering

sql/dj_setup_database.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # @configure_input@
 
 # This script allows one to perform DOMjudge database setup actions.
@@ -52,32 +52,41 @@ not have to pass any of the options above.
 EOF
 }
 
+urlencode()
+{
+	php -r "echo rawurlencode('$1');"
+}
+
 mysql_options()
 {
 	local user pass
+	declare -a _mysql_options=()
 
 	# shellcheck disable=SC2153
 	if [ -n "$DBUSER" ]; then
-		user="-u $DBUSER"
-	else
-		user="${DBA_USER:+-u ${DBA_USER}}"
+		result+=('-u', "$DBUSER")
+	elif [ -n "$DBA_USER" ]; then
+		result+=('-u', "$DBUSER")
 	fi
 	# shellcheck disable=SC2153
 	if [ -n "$PASSWD" ]; then
-		pass="-p$PASSWD"
-	else
-		[ -n "$PROMPT_PASSWD" ] && pass="-p"
-		[ -n "$DBA_PASSWD" ]    && pass="-p$DBA_PASSWD"
+		result+=("-p$PASSWD")
+	elif [ -n "$DBA_PASSWD" ]; then
+		result+=("-p$DBA_PASSWD")
+	elif [ -n "$PROMPT_PASSWD" ]; then
+		result+=('-p')
 	fi
 
-	[ -z "$USE_SOCKET" ] && port="-P$DBPORT"
-	echo $user ${pass:+"$pass"} -h "$DBHOST" ${port:+"$port"}
+	if [ -z "$USE_SOCKET" ]; then
+		results+=("-P$DBPORT")
+	fi
 }
 
 # Wrapper around mysql command to allow setting options, user, etc.
 mysql()
 {
-	command mysql $(mysql_options) --silent --skip-column-names "$@"
+	mysql_options
+	command mysql "${_mysql_options[@]}" --silent --skip-column-names "$@"
 }
 
 # Quick shell hack to get a key from an INI file.
@@ -129,9 +138,9 @@ symfony_console()
 
 		if [ -n "$DBA_USER" ]; then
 			if [ -n "$DBA_PASSWD" ]; then
-				DATABASE_URL=mysql://${DBA_USER}:${DBA_PASSWD}@${domjudge_DBHOST}:${domjudge_DBPORT}/${domjudge_DBNAME}
+				DATABASE_URL="mysql://$(urlencode '${DBA_USER}'):$(urlencode '${DBA_PASSWD}')@$(urlencode '${domjudge_DBHOST}'):${domjudge_DBPORT}/$(urlencode '${domjudge_DBNAME}')"
 			else
-				DATABASE_URL=mysql://${DBA_USER}@${domjudge_DBHOST}:${domjudge_DBPORT}/${domjudge_DBNAME}
+				DATABASE_URL="mysql://$(urlencode '${DBA_USER}')@$(urlencode '${domjudge_DBHOST}'):${domjudge_DBPORT}/$(urlencode '${domjudge_DBNAME}')"
 			fi
 		fi
 	fi