mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-12 18:41:51 +00:00
Code Issues Releases Wiki Activity

Fix ShadowSocks-Rust check on key instead of password field

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-09-02 14:24:35 +02:00
parent c10983f2de
commit bdee3d1794
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -1063,8 +1063,8 @@ function wizard_add()
ucic:set("shadowsocks-rust","sss0","disabled","1") ucic:set("shadowsocks-rust","sss0","disabled","1")
ucic:set("shadowsocks-rust","sss1","disabled","1") ucic:set("shadowsocks-rust","sss1","disabled","1")
end end
ucic:set("shadowsocks-rust","sss0","key","") ucic:set("shadowsocks-rust","sss0","password","")
ucic:set("shadowsocks-rust","sss1","key","") ucic:set("shadowsocks-rust","sss1","password","")
ucic:set("xray","omrout","s_shadowsocks_password","") ucic:set("xray","omrout","s_shadowsocks_password","")
ucic:save("shadowsocks-rust") ucic:save("shadowsocks-rust")
ucic:commit("shadowsocks-rust") ucic:commit("shadowsocks-rust")

2
luci-app-openmptcprouter/root/bin/anonymous_config.sh
View file

@ -15,7 +15,7 @@ uci show | \
-e "/shadowsocks-libev\.sss.*\.server=/s/......$/xxxxxx'/" \ -e "/shadowsocks-libev\.sss.*\.server=/s/......$/xxxxxx'/" \
-e "/shadowsocks-libev\.sss.*\.key=/s/......$/xxxxxx'/" \ -e "/shadowsocks-libev\.sss.*\.key=/s/......$/xxxxxx'/" \
-e "/shadowsocks-rust\.sss.*\.server=/s/......$/xxxxxx'/" \ -e "/shadowsocks-rust\.sss.*\.server=/s/......$/xxxxxx'/" \
-e "/shadowsocks-rust\.sss.*\.key=/s/......$/xxxxxx'/" \ -e "/shadowsocks-rust\.sss.*\.password=/s/......$/xxxxxx'/" \
-e "/external_ip=/s/......$/xxxxxx'/" \ -e "/external_ip=/s/......$/xxxxxx'/" \
-e "/obfs_host=/s/..........$/xxxxxx'/" \ -e "/obfs_host=/s/..........$/xxxxxx'/" \
-e "/vmess_address=/s/......$/xxxxxx'/" \ -e "/vmess_address=/s/......$/xxxxxx'/" \

4
omr-schedule/files/usr/share/omr/schedule.d/010-services
View file

@ -12,7 +12,7 @@ if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(pgrep -f omr-tracker-ss)" = "" ]
/etc/init.d/shadowsocks-libev restart >/dev/null 2>&1 /etc/init.d/shadowsocks-libev restart >/dev/null 2>&1
sleep 5 sleep 5
fi fi
if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f sslocal)" = "" ] && [ "$(pgrep -f sslocal)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "192.18.1.3" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ]; then if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f sslocal)" = "" ] && [ "$(pgrep -f sslocal)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "192.18.1.3" ] && [ "$(uci -q get shadowsocks-rust.sss0.password)" != "" ]; then
_log "Can't find Shadowsocks Rust, restart it..." _log "Can't find Shadowsocks Rust, restart it..."
/etc/init.d/shadowsocks-rust restart >/dev/null 2>&1 /etc/init.d/shadowsocks-rust restart >/dev/null 2>&1
sleep 5 sleep 5
@ -195,7 +195,7 @@ if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss
/etc/init.d/omr-tracker restart >/dev/null 2>&1 /etc/init.d/omr-tracker restart >/dev/null 2>&1
fi fi
if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.168.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.password)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.168.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
_log "Can't find omr-tracker-ss for Shadowsocks Rust, restart omr-tracker..." _log "Can't find omr-tracker-ss for Shadowsocks Rust, restart omr-tracker..."
/etc/init.d/omr-tracker restart >/dev/null 2>&1 /etc/init.d/omr-tracker restart >/dev/null 2>&1
fi fi

4
omr-tracker/files/bin/omr-tracker-ss
View file

@ -130,7 +130,7 @@ while true; do
/etc/init.d/shadowsocks-libev restart >/dev/null 2>&1 /etc/init.d/shadowsocks-libev restart >/dev/null 2>&1
fi fi
_get_ip _get_ip
elif [ "$type" = "rust" ] && [ "$(uci -q get shadowsocks-rust.ss_rules.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.${server}.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.${server}.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.${server}.disabled)" != "1" ]; then elif [ "$type" = "rust" ] && [ "$(uci -q get shadowsocks-rust.ss_rules.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.${server}.password)" != "" ] && [ "$(uci -q get shadowsocks-rust.${server}.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.${server}.disabled)" != "1" ]; then
_log "Reload Shadowsocks Rust rules" _log "Reload Shadowsocks Rust rules"
/etc/init.d/shadowsocks-rust rules_up 2> /dev/null /etc/init.d/shadowsocks-rust rules_up 2> /dev/null
if ! /etc/init.d/shadowsocks-rust rules_exist ; then if ! /etc/init.d/shadowsocks-rust rules_exist ; then
@ -193,7 +193,7 @@ while true; do
/etc/init.d/shadowsocks-libev restart /etc/init.d/shadowsocks-libev restart
sleep 5 sleep 5
fi fi
if [ "$type" = "rust" ] && [ "$(pgrep sslocal)" = "" ] && [ "$(uci -q get shadowsocks-rust.${server}.key)" != "" ]; then if [ "$type" = "rust" ] && [ "$(pgrep sslocal)" = "" ] && [ "$(uci -q get shadowsocks-rust.${server}.password)" != "" ]; then
_log "Can't find shadowsocks rust, restart it..." _log "Can't find shadowsocks rust, restart it..."
/etc/init.d/shadowsocks-rust restart /etc/init.d/shadowsocks-rust restart
sleep 5 sleep 5