🐛 Escape special chars for replace

Signed-off-by: mathieu.brunot <[email protected]>
2TAP2B · Sep 5, 2020 · 9c35b5c · 9c35b5c
1 parent abfa5d5
commit 9c35b5c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -60,6 +60,10 @@ wait_for_db() {
 	done
 }
 
+escape_for_replace() {
+	printf '%s\n' "${1}" | sed -e 's/[\/&]/\\&/g'
+}
+
 echo "=="
 if [ -f "/var/www/localhost/htdocs/protected/config/dynamic.php" ]; then
 	echo "Existing installation found!"
@@ -99,14 +103,14 @@ else
 	fi
 
 	echo "Config preprocessing before install ..."
-	sed -i \
-		-e "s/getenv('HUMHUB_REDIS_HOSTNAME')/'${HUMHUB_REDIS_HOSTNAME}'/g" \
-		-e "s/getenv('HUMHUB_REDIS_PORT')/${HUMHUB_REDIS_PORT}/g" \
-		-e "s/getenv('HUMHUB_REDIS_PASSWORD')/'${HUMHUB_REDIS_PASSWORD}'/g" \
-		-e "s/getenv('HUMHUB_CACHE_CLASS')/'${HUMHUB_CACHE_CLASS}'/g" \
-		-e "s/getenv('HUMHUB_QUEUE_CLASS')/'${HUMHUB_QUEUE_CLASS}'/g" \
-		-e "s/getenv('HUMHUB_PUSH_URL')/'${HUMHUB_PUSH_URL}'/g" \
-		-e "s/getenv('HUMHUB_PUSH_JWT_TOKEN')/'${HUMHUB_PUSH_JWT_TOKEN}'/g" \
+	sed \
+		"s|getenv('HUMHUB_REDIS_HOSTNAME')|'$(escape_for_replace ${HUMHUB_REDIS_HOSTNAME} )'|g;
+		s|getenv('HUMHUB_REDIS_PORT')|$(escape_for_replace ${HUMHUB_REDIS_PORT} )|g;
+		s|getenv('HUMHUB_REDIS_PASSWORD')|'$(escape_for_replace ${HUMHUB_REDIS_PASSWORD} )'|g;
+		s|getenv('HUMHUB_CACHE_CLASS')|'$(escape_for_replace ${HUMHUB_CACHE_CLASS} )'|g;
+		s|getenv('HUMHUB_QUEUE_CLASS')|'$(escape_for_replace ${HUMHUB_QUEUE_CLASS} )'|g;
+		s|getenv('HUMHUB_PUSH_URL')|'$(escape_for_replace ${HUMHUB_PUSH_URL} )'|g;
+		s|getenv('HUMHUB_PUSH_JWT_TOKEN')|'$(escape_for_replace ${HUMHUB_PUSH_JWT_TOKEN} )'|g" \
 		/var/www/localhost/htdocs/protected/config/common.php
 
 	if [ "$AUTOINSTALL" != "false" ]; then

diff --git a/humhub/protected/config/common.php b/humhub/protected/config/common.php
@@ -28,7 +28,7 @@
     $common['components']['redis'] = [
         'class' => 'yii\redis\Connection',
         'hostname' => getenv('HUMHUB_REDIS_HOSTNAME'),
-        'port' => getenv('HUMHUB_REDIS_PORT') ? getenv('HUMHUB_REDIS_PORT') : 6379,
+        'port' => !empty(getenv('HUMHUB_REDIS_PORT')) ? getenv('HUMHUB_REDIS_PORT') : 6379,
         'database' => 0,
     ];
     if (!empty(getenv('HUMHUB_REDIS_PASSWORD'))) {