Petro1990
/
rProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

фикс: v1.3.5 - устранение бесконечного цикла пароля через Clean Auth и X-Requested-With

This commit is contained in:
Petro1990 2026-03-13 19:45:16 +03:00
parent d5532f8355
commit 12544159e9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rproxy
View File

@ -3,7 +3,7 @@
# Публикация локальных сервисов через SSH-туннели + nginx на VPS # Публикация локальных сервисов через SSH-туннели + nginx на VPS
# http://5.104.75.50:3000/Petro1990/rProxy # http://5.104.75.50:3000/Petro1990/rProxy
VERSION="1.3.4" VERSION="1.3.5"
CONF_DIR="/opt/etc/rproxy" CONF_DIR="/opt/etc/rproxy"
CONF_FILE="$CONF_DIR/rproxy.conf" CONF_FILE="$CONF_DIR/rproxy.conf"
SERVICES_DIR="$CONF_DIR/services" SERVICES_DIR="$CONF_DIR/services"
@ -179,9 +179,13 @@ next_free_port() {
get_router_ip() { get_router_ip() {
# Метод 1: Через ndmq (Keenetic Bridge0) # Метод 1: Через ndmq (Keenetic Bridge0)
local ip=$(ndmq -p "show interface Bridge0" -path "address" 2>/dev/null) local ip=$(ndmq -p "show interface Bridge0" -path "address" 2>/dev/null)
[ -n "$ip" ] && [ "$ip" != "0.0.0.0" ] && echo "$ip" && return
# Метод 2: Через маршруты (default gateway)
ip=$(ip route show | grep default | awk '{print $3}' | head -n 1)
[ -n "$ip" ] && echo "$ip" && return [ -n "$ip" ] && echo "$ip" && return
# Метод 2: Через ip addr (Entware/Keenetic) # Метод 3: Через ip addr (Entware/Keenetic)
ip=$(ip addr show br0 2>/dev/null | grep 'inet ' | awk '{print $2}' | cut -d/ -f1 | head -n1) ip=$(ip addr show br0 2>/dev/null | grep 'inet ' | awk '{print $2}' | cut -d/ -f1 | head -n1)
[ -n "$ip" ] && echo "$ip" && return [ -n "$ip" ] && echo "$ip" && return
@ -197,6 +201,8 @@ enable_router_basic_auth() {
ndmq -p "ip http auth basic" >/dev/null 2>&1 ndmq -p "ip http auth basic" >/dev/null 2>&1
# Принудительно задаем realm # Принудительно задаем realm
ndmq -p "web-server realm Keenetic" >/dev/null 2>&1 ndmq -p "web-server realm Keenetic" >/dev/null 2>&1
# ОЧЕНЬ ВАЖНО: Сохраняем конфигурацию
ndmq -p "system configuration save" >/dev/null 2>&1
} }
next_free_ext_port() { next_free_ext_port() {
@ -535,6 +541,10 @@ do_add_interactive() {
proxy_set_header Origin \"http://$router_ip\"; proxy_set_header Origin \"http://$router_ip\";
proxy_set_header Referer \"http://$router_ip/\"; proxy_set_header Referer \"http://$router_ip/\";
proxy_set_header X-NDM-Realm \"Keenetic\"; proxy_set_header X-NDM-Realm \"Keenetic\";
proxy_set_header X-Requested-With XMLHttpRequest;
# Скрываем заголовки роутера, чтобы они не конфликтовали с нашими
proxy_hide_header WWW-Authenticate;
} }
location @auth_required { location @auth_required {