From d9bbc631e2fa6bbfffc1652812a2dc2c018607c9 Mon Sep 17 00:00:00 2001
From: gsd <mamu@ebal.net>
Date: Wed, 12 Mar 2025 20:01:26 +0300
Subject: [PATCH] b64 fix
---
entrypoint.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/entrypoint.sh b/entrypoint.sh
index 87e37d2..4f6ad75 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,11 +3,11 @@
#htpasswd part
rm /etc/nginx/.htpasswd || echo "cleared"
touch /etc/nginx/.htpasswd
-USERS_SPLIT=$(echo -n \"$COMBO\" | tr ";" "\n")
+USERS_SPLIT=$(echo -n $COMBO | tr ";" "\n")
for USER in $USERS_SPLIT
do
- USERNAME=$(echo -n \"$USER\" | cut -d ":" -f 1)
- PASSWORD=$(echo -n \"$USER\" | cut -d ":" -f 2)
+ USERNAME=$(echo -n $USER | cut -d ":" -f 1)
+ PASSWORD=$(echo -n $USER | cut -d ":" -f 2 | head -c-1)
htpasswd -b /etc/nginx/.htpasswd $USERNAME $PASSWORD
done
@@ -15,14 +15,14 @@ done
#gateway_0 is main
rm /etc/nginx/conf.d/srv.conf || echo "cleared"
touch /etc/nginx/conf.d/srv.conf
-GATEWAYS_SPLIT=$(echo -n \"$GATEWAY\" | tr ";" "\n")
+GATEWAYS_SPLIT=$(echo -n $GATEWAY | tr ";" "\n")
COUNTER=0
for GATEWAY in $GATEWAYS_SPLIT
do
cat <<EOT >> /etc/nginx/conf.d/srv.conf
upstream gateway_$COUNTER {
- server $(echo -n \"$GATEWAY\" | cut -d "|" -f 1);
+ server $(echo -n $GATEWAY | cut -d "|" -f 1);
}
EOT
@@ -90,7 +90,7 @@ if [ $COUNTER -gt 0 ]; then
rewrite /.* \$request_uri break;
proxy_pass http://gateway_$COUNTER;
proxy_set_header X-Is-Mirror 'yes';
- proxy_set_header Authorization "Basic $(echo -n \"$GATEWAY\" | cut -d "|" -f 2 | base64)";
+ proxy_set_header Authorization "Basic $(echo -n $GATEWAY | cut -d "|" -f 2 -s | head -c-1 | base64)";
limit_except POST {
deny all;