fix

Author: nmarukovich

build/heartbeat-entrypoint.sh

@@ -29,6 +29,8 @@ for i in {1..5}; do
 		sleep "$((TIMEOUT * i))"
 	fi
 done
+
+# If password contains commas they must be escaped with a backslash: “exam,ple” according https://docs.percona.com/percona-toolkit/pt-heartbeat.html
 ESCAPED_HEARTBEAT_PASSWORD="${HEARTBEAT_PASSWORD//,/\\,}"
 
 HEARTBEAT_USER='heartbeat'

build/ps-entrypoint.sh

@@ -212,26 +212,10 @@ ensure_read_only() {
 
 escape_special() {
 	{ set +x; } 2>/dev/null
-
-	# $1 = input string
-	# $2 = optional flag, e.g., "heartbeat" to enable comma escaping
-
-	result="$1"
-
-	# Escape backslashes
-	result=$(echo "$result" | sed 's/\\/\\\\/g')
-	# Escape single quotes
-	result=$(echo "$result" | sed "s/'/\\\\'/g")
-	# Escape double quotes
-	result=$(echo "$result" | sed 's/"/\\\"/g')
-
-	# Escape comma ONLY if second argument is "heartbeat"
-	# If password contains commas they must be escaped with a backslash: “exam,ple” according https://docs.percona.com/percona-toolkit/pt-heartbeat.html
-	if [[ $2 == "heartbeat" ]]; then
-		result=$(echo "$result" | sed 's/,/\\,/g')
-	fi
-
-	echo "$result"
+	echo "$1" \
+		| sed 's/\\/\\\\/g' \
+		| sed 's/'\''/'\\\\\''/g' \
+		| sed 's/"/\\\"/g'
 }
 
 MYSQL_VERSION=$(mysqld -V | awk '{print $3}' | awk -F'.' '{print $1"."$2}')
@@ -374,7 +358,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			GRANT SELECT ON sys_operator.* TO 'orchestrator'@'%';
 
 			CREATE DATABASE IF NOT EXISTS sys_operator;
-			CREATE USER 'heartbeat'@'localhost' IDENTIFIED BY '$(escape_special "${HEARTBEAT_PASSWORD}" "heartbeat")' PASSWORD EXPIRE NEVER;
+			CREATE USER 'heartbeat'@'localhost' IDENTIFIED BY '$(escape_special "${HEARTBEAT_PASSWORD}")' PASSWORD EXPIRE NEVER;
 			GRANT SYSTEM_USER, REPLICATION CLIENT ON *.* TO 'heartbeat'@'localhost';
 			GRANT SELECT, CREATE, DELETE, UPDATE, INSERT ON sys_operator.heartbeat TO 'heartbeat'@'localhost';