From 2a5c3cbda34962cd0c7df81e7ac38da5cc052040 Mon Sep 17 00:00:00 2001
From: gsd <mamu@ebal.net>
Date: Wed, 12 Mar 2025 19:28:58 +0300
Subject: [PATCH] base64 fix

---
 .gitignore          |  2 +-
 docker-compose.yaml |  6 ++----
 entrypoint.sh       | 26 ++++++++++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d76258f..2eea525 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.htpasswd
\ No newline at end of file
+.env
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 765018b..166c82a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,10 +15,8 @@ services:
     restart: unless-stopped
     #COMBO | base auth for this instance
     #GATEWAY | first gateway without pass words
-    environment:
-      - COMBO=test:test;test1:test1
-      - GATEWAY=p_gw:9091;p_gw:9091|user:pass;p_gw:9091|user:pass
-      - PORT=9100
+    env_file:
+      - .env
     #volumes:
     #  - $PWD/srv.conf:/etc/nginx/conf.d/srv.conf:ro
     #  - $PWD/.htpasswd:/etc/nginx/.htpasswd:ro
diff --git a/entrypoint.sh b/entrypoint.sh
index e5d070c..8c28142 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 $COMBO | tr ";" "\n")
+USERS_SPLIT=$(echo -n $COMBO | tr ";" "\n")
 for USER in $USERS_SPLIT
 do
-    USERNAME=$(echo $USER | cut -d ":" -f 1)
-    PASSWORD=$(echo $USER | cut -d ":" -f 2)
+    USERNAME=$(echo -n $USER | cut -d ":" -f 1)
+    PASSWORD=$(echo -n $USER | cut -d ":" -f 2)
     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 $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 $GATEWAY | cut -d "|" -f 1);
+    server $(echo -n $GATEWAY | cut -d "|" -f 1);
 }
 
 EOT
@@ -34,12 +34,19 @@ cat <<EOT >> /etc/nginx/conf.d/srv.conf
 server {
     listen 0.0.0.0:$PORT;
     server_name __;
+    proxy_buffering off;
+    client_body_buffer_size     10M;
+    client_max_body_size        10M;
 
     location / {
+        proxy_pass http://gateway_0;
+    }
+
+    location /metrics {
         auth_basic "Pushgateway server authentication";
         auth_basic_user_file /etc/nginx/.htpasswd;
         proxy_pass http://gateway_0;
-        
+
 EOT
 
 #mirror redirect
@@ -75,14 +82,13 @@ for GATEWAY in $GATEWAYS_SPLIT
 do
 if [ $COUNTER -gt 0 ]; then
     cat <<EOT >> /etc/nginx/conf.d/srv.conf
-    
+
     location = /mirror_$COUNTER {
         internal;
+        rewrite /.* \$request_uri break;
         proxy_pass http://gateway_$COUNTER;
         proxy_set_header X-Is-Mirror 'yes';
-        proxy_pass_header X-Is-Mirror;
-        proxy_set_header Authorization "Basic $(echo $GATEWAY | cut -d "|" -f 2 | base64)";
-        proxy_pass_header Authorization;
+        proxy_set_header Authorization "Basic $(echo -n $GATEWAY | cut -d "|" -f 2 | base64)";
 
         limit_except POST {
             deny all;