From 1c2e7bdf7a9284849114a757a5f5fc2bad7a899a Mon Sep 17 00:00:00 2001
From: Petro1990 <petrolobanok@gmail.com>
Date: Fri, 13 Mar 2026 22:03:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B2=D1=80=D0=B5=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=85=D0=B5=D1=88=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D0=B5=D0=B9=20(=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=89=D0=B8=D1=82=D0=B0=20=D0=BE=D1=82=20=D1=80=D0=B0=D1=81?=
 =?UTF-8?q?=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85),=20=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D1=81=D0=B8=D1=8F=201.4.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rproxy | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/rproxy b/rproxy
index ef967e3..9a57b5b 100644
--- a/rproxy
+++ b/rproxy
@@ -3,7 +3,7 @@
 # Публикация локальных сервисов через SSH-туннели + nginx на VPS
 # http://5.104.75.50:3000/Petro1990/rProxy
 
-VERSION="1.4.6"
+VERSION="1.4.7"
 CONF_DIR="/opt/etc/rproxy"
 CONF_FILE="$CONF_DIR/rproxy.conf"
 SERVICES_DIR="$CONF_DIR/services"
@@ -676,20 +676,20 @@ NGINXEOF
         ssh_cmd "certbot --nginx -d $domain --non-interactive --agree-tos -m $CERTBOT_EMAIL" || warn "Certbot вернул ошибку"
     fi
 
-    # Сохранение конфига сервиса
-    cat > "$SERVICES_DIR/$name.conf" <<EOF
-SVC_NAME="$name"
-SVC_VPS="$vps_id"
-SVC_TARGET_HOST="$t_host"
-SVC_TARGET_PORT="$t_port"
-SVC_TUNNEL_PORT="$tunnel_port"
-SVC_EXT_PORT="$ext_port"
-SVC_DOMAIN="$domain"
-SVC_SSL="$use_ssl"
-SVC_NDM_AUTH="$use_ndm_auth"
-SVC_HTPASSWD=\"$htpasswd_line\"
-SVC_ENABLED="yes"
-EOF
+    # Сохранение конфига сервиса (используем printf для защиты от спецсимволов и одинарные кавычки)
+    {
+        printf 'SVC_NAME="%s"\n' "$name"
+        printf 'SVC_VPS="%s"\n' "$vps_id"
+        printf 'SVC_TARGET_HOST="%s"\n' "$t_host"
+        printf 'SVC_TARGET_PORT="%s"\n' "$t_port"
+        printf 'SVC_TUNNEL_PORT="%s"\n' "$tunnel_port"
+        printf 'SVC_EXT_PORT="%s"\n' "$ext_port"
+        printf 'SVC_DOMAIN="%s"\n' "$domain"
+        printf 'SVC_SSL="%s"\n' "$use_ssl"
+        printf 'SVC_NDM_AUTH="%s"\n' "$use_ndm_auth"
+        printf "SVC_HTPASSWD='%s'\n" "$htpasswd_line"
+        printf 'SVC_ENABLED="yes"\n'
+    } > "$SERVICES_DIR/$name.conf"
 
     msg "Сервис '$name' добавлен на VPS '$vps_id'!"
     do_start_service "$name"
@@ -732,7 +732,7 @@ do_edit_interactive() {
         sleep 1
         # Обновление htpasswd на VPS если включено
         if [ "$SVC_NDM_AUTH" = "yes" ]; then
-             ssh_cmd "echo '$SVC_HTPASSWD' > /etc/nginx/rproxy_$name.htpasswd"
+             ssh_cmd "printf '%s\n' '$SVC_HTPASSWD' > /etc/nginx/rproxy_$name.htpasswd"
         fi
         do_start_service "$name"
     else