From 03ab55def444cd10936f72c75343c3aa455e29d0 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Thu, 29 Aug 2024 17:27:32 +0530
Subject: [PATCH 1/3] fix: password encoding

---
 docker-compose/setup-script/noco.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose/setup-script/noco.sh b/docker-compose/setup-script/noco.sh
index b240b9ef23..a824c762bc 100755
--- a/docker-compose/setup-script/noco.sh
+++ b/docker-compose/setup-script/noco.sh
@@ -90,7 +90,7 @@ urlencode() {
 }
 
 generate_password() {
-    openssl rand -base64 48 | tr -dc 'a-zA-Z0-9!@#$%^&*()-_+=' | head -c 32
+    openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 32
 }
 
 get_public_ip() {
@@ -945,4 +945,4 @@ main() {
     fi
 }
 
-main "$@"
\ No newline at end of file
+main "$@"

From 58850d0888f6a8780dca92fd35639880846ee153 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Thu, 29 Aug 2024 17:30:04 +0530
Subject: [PATCH 2/3] fix: add more cases

---
 docker-compose/setup-script/noco.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/setup-script/noco.sh b/docker-compose/setup-script/noco.sh
index a824c762bc..6ad02fe5b9 100755
--- a/docker-compose/setup-script/noco.sh
+++ b/docker-compose/setup-script/noco.sh
@@ -90,7 +90,7 @@ urlencode() {
 }
 
 generate_password() {
-    openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 32
+    openssl rand -base64 48 | tr -dc 'a-zA-Z0-9_+*' | head -c 32
 }
 
 get_public_ip() {

From 3362dfe3004e56eed7ccf639907575e653510284 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Thu, 29 Aug 2024 17:41:26 +0530
Subject: [PATCH 3/3] encode only the redis_url

---
 docker-compose/setup-script/noco.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/setup-script/noco.sh b/docker-compose/setup-script/noco.sh
index 6ad02fe5b9..30840ea4c7 100755
--- a/docker-compose/setup-script/noco.sh
+++ b/docker-compose/setup-script/noco.sh
@@ -705,7 +705,7 @@ EOF
 
     if [ "${CONFIG_REDIS_ENABLED}" = "Y" ]; then
         cat >> "$env_file" <<EOF
-REDIS_PASSWORD=${ENCODED_REDIS_PASSWORD}
+REDIS_PASSWORD=${CONFIG_REDIS_PASSWORD}
 NC_REDIS_URL=redis://:${ENCODED_REDIS_PASSWORD}@redis:6379/0
 EOF
     fi