From 149b03ba77405edaeb48c5e9890bc01a4505cf10 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Mon, 4 Nov 2024 13:28:54 +0800 Subject: [PATCH] luci-app-ssr-plus: sync upstream last commit: https://github.com/fw876/helloworld/commit/2603ac776ffb0517ae6f5b10f92ac8ab5b66cda6 --- luci-app-ssr-plus/Makefile | 4 +- .../model/cbi/shadowsocksr/advanced.lua | 7 ++- .../root/etc/init.d/shadowsocksr | 49 +----------------- luci-app-ssr-plus/root/usr/bin/ssr-rules | 1 - .../share/shadowsocksr/shadowsocksr.config | 51 +++++++++++++++++++ patch-luci-app-ssr-plus.patch | 26 ++++++---- 6 files changed, 74 insertions(+), 64 deletions(-) create mode 100644 luci-app-ssr-plus/root/usr/share/shadowsocksr/shadowsocksr.config diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 9d8a0b353..8c5387b78 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus -PKG_VERSION:=188 -PKG_RELEASE:=9 +PKG_VERSION:=189 +PKG_RELEASE:=1 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \ diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua index 91579535b..bca8c179f 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua @@ -86,8 +86,11 @@ o:depends("adblock", "1") o.description = translate("Support AdGuardHome and DNSMASQ format list") o = s:option(Button, "reset", translate("Reset to defaults")) -o.rawhtml = true -o.template = "shadowsocksr/reset" +o.inputstyle = "reload" +o.write = function() + luci.sys.call("/etc/init.d/shadowsocksr reset") + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers")) +end -- [[ SOCKS5 Proxy ]]-- s = m:section(TypedSection, "socks5_proxy", translate("Global SOCKS5 Proxy Server")) diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 9af87f1ec..f6e299ec0 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -1084,53 +1084,6 @@ reset() { set_lock rm -rf /etc/config/shadowsocksr $LOG_FILE touch /etc/config/shadowsocksr $LOG_FILE - uci -q batch <<-EOF >/dev/null - add shadowsocksr global - set shadowsocksr.@global[0].global_server='nil' - set shadowsocksr.@global[0].netflix_server='nil' - set shadowsocksr.@global[0].netflix_proxy='0' - set shadowsocksr.@global[0].threads='0' - set shadowsocksr.@global[0].run_mode='router' - set shadowsocksr.@global[0].dports='2' - set shadowsocksr.@global[0].custom_ports='80,443' - set shadowsocksr.@global[0].pdnsd_enable='1' - set shadowsocksr.@global[0].tunnel_forward='8.8.4.4:53' - set shadowsocksr.@global[0].monitor_enable='1' - set shadowsocksr.@global[0].enable_switch='1' - set shadowsocksr.@global[0].switch_time='667' - set shadowsocksr.@global[0].switch_timeout='5' - set shadowsocksr.@global[0].switch_try_count='3' -# set shadowsocksr.@global[0].default_packet_encoding='xudp' - set shadowsocksr.@global[0].gfwlist_url='https://fastly.jsdelivr.net/gh/YW5vbnltb3Vz/domain-list-community@release/gfwlist.txt' - set shadowsocksr.@global[0].chnroute_url='https://ispip.clang.cn/all_cn.txt' - set shadowsocksr.@global[0].nfip_url='https://fastly.jsdelivr.net/gh/QiuSimons/Netflix_IP/NF_only.txt' - set shadowsocksr.@global[0].adblock_url='https://anti-ad.net/anti-ad-for-dnsmasq.conf' - add shadowsocksr server_subscribe - set shadowsocksr.@server_subscribe[0].proxy='0' - set shadowsocksr.@server_subscribe[0].auto_update_time='2' - set shadowsocksr.@server_subscribe[0].auto_update='1' - set shadowsocksr.@server_subscribe[0].filter_words='过期时间/剩余流量/QQ群/官网/防失联地址/回国' - set shadowsocksr.@server_subscribe[0].save_words='' - add shadowsocksr access_control - set shadowsocksr.@access_control[0].lan_ac_mode='0' - set shadowsocksr.@access_control[0].router_proxy='1' - add_list shadowsocksr.@access_control[0].wan_fw_ips=149.154.160.0/20 - add_list shadowsocksr.@access_control[0].wan_fw_ips=67.198.55.0/24 - add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.4.0/22 - add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.56.0/22 - add_list shadowsocksr.@access_control[0].wan_fw_ips=109.239.140.0/24 - add_list shadowsocksr.@access_control[0].wan_fw_ips=8.8.8.8 - add_list shadowsocksr.@access_control[0].wan_fw_ips=1.1.1.1 - add_list shadowsocksr.@access_control[0].Interface='lan' - add shadowsocksr socks5_proxy - set shadowsocksr.@socks5_proxy[0].server='nil' - set shadowsocksr.@socks5_proxy[0].local_port='1080' - add shadowsocksr server_global - set shadowsocksr.@server_global[0].enable_server='0' - add shadowsocksr global_xray_fragment - set shadowsocksr.@global_xray_fragment[0].fragment='0' - set shadowsocksr.@global_xray_fragment[0].noise='0' - commit shadowsocksr - EOF + cp /usr/share/shadowsocksr/shadowsocksr.config /etc/config/shadowsocksr unset_lock } diff --git a/luci-app-ssr-plus/root/usr/bin/ssr-rules b/luci-app-ssr-plus/root/usr/bin/ssr-rules index e0e0e8f5e..547d910ae 100755 --- a/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -103,7 +103,6 @@ ipset_r() { $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN $IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW - $IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW ;; oversea) ipset -N oversea hash:net 2>/dev/null diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/shadowsocksr.config b/luci-app-ssr-plus/root/usr/share/shadowsocksr/shadowsocksr.config new file mode 100644 index 000000000..6d9f28749 --- /dev/null +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/shadowsocksr.config @@ -0,0 +1,51 @@ + +config global + option global_server 'nil' + option netflix_server 'nil' + option netflix_proxy '0' + option threads '0' + option run_mode 'router' + option dports '2' + option custom_ports '80,443' + option pdnsd_enable '1' + option tunnel_forward '8.8.4.4:53' + option monitor_enable '1' + option enable_switch '1' + option switch_time '667' + option switch_timeout '5' + option switch_try_count '3' + option shunt_dns '1' + option gfwlist_url 'https://fastly.jsdelivr.net/gh/YW5vbnltb3Vz/domain-list-community@release/gfwlist.txt' + option chnroute_url 'https://ispip.clang.cn/all_cn.txt' + option nfip_url 'https://fastly.jsdelivr.net/gh/QiuSimons/Netflix_IP/NF_only.txt' + option adblock_url 'https://anti-ad.net/anti-ad-for-dnsmasq.conf' + +config server_subscribe + option proxy '0' + option auto_update_time '2' + option auto_update '1' + option filter_words '过期时间/剩余流量/QQ群/官网/防失联地址/回国' + +config access_control + option lan_ac_mode '0' + option router_proxy '1' + list wan_fw_ips '149.154.160.0/20' + list wan_fw_ips '67.198.55.0/24' + list wan_fw_ips '91.108.4.0/22' + list wan_fw_ips '91.108.56.0/22' + list wan_fw_ips '109.239.140.0/24' + list wan_fw_ips '8.8.8.8' + list wan_fw_ips '1.1.1.1' + list Interface 'lan' + +config socks5_proxy + option server 'nil' + option local_port '1080' + +config server_global + option enable_server '0' + +config global_xray_fragment + option fragment '0' + option noise '0' + diff --git a/patch-luci-app-ssr-plus.patch b/patch-luci-app-ssr-plus.patch index 6985cf538..b90ad14ec 100644 --- a/patch-luci-app-ssr-plus.patch +++ b/patch-luci-app-ssr-plus.patch @@ -1,5 +1,5 @@ diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile -index 644ac0a..9d8a0b3 100644 +index 735b377..8c5387b 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -9,10 +9,9 @@ PKG_CONFIG_DEPENDS:= \ @@ -134,7 +134,7 @@ index 8ceaba7..f381a54 100644 page.acl_depends = { "luci-app-ssr-plus" } entry({"admin", "services", "shadowsocksr", "client"}, cbi("shadowsocksr/client"), _("SSR Client"), 10).leaf = true diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua -index 2f56e90..9157953 100644 +index 5fc774f..bca8c17 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua @@ -70,45 +70,6 @@ o.default = "https://fastly.jsdelivr.net/gh/QiuSimons/Netflix_IP/NF_only.txt" @@ -462,7 +462,7 @@ index da30ffc..f97309b 100644 msgstr "DNS 服务器 IP:Port" diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr -index 00e0448..9af87f1 100755 +index 231dccc..f6e299e 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -185,23 +185,17 @@ ln_start_bin() { @@ -724,14 +724,6 @@ index 00e0448..9af87f1 100755 del_cron unset_lock } -@@ -1171,7 +1101,6 @@ reset() { - set shadowsocksr.@global[0].switch_timeout='5' - set shadowsocksr.@global[0].switch_try_count='3' - # set shadowsocksr.@global[0].default_packet_encoding='xudp' -- set shadowsocksr.@global[0].shunt_dns='1' - set shadowsocksr.@global[0].gfwlist_url='https://fastly.jsdelivr.net/gh/YW5vbnltb3Vz/domain-list-community@release/gfwlist.txt' - set shadowsocksr.@global[0].chnroute_url='https://ispip.clang.cn/all_cn.txt' - set shadowsocksr.@global[0].nfip_url='https://fastly.jsdelivr.net/gh/QiuSimons/Netflix_IP/NF_only.txt' diff --git a/luci-app-ssr-plus/root/etc/ssrplus/mosdns-config.yaml b/luci-app-ssr-plus/root/etc/ssrplus/mosdns-config.yaml deleted file mode 100644 index a0b9f5c..0000000 @@ -850,3 +842,15 @@ index f637d50..fb9ed57 100755 fi #chinadns-ng if [ "$(uci -q get "dhcp.@dnsmasq[0]._unused_ssrp_changed")" = "1" ]; then +diff --git a/luci-app-ssr-plus/root/usr/bin/ssr-rules b/luci-app-ssr-plus/root/usr/bin/ssr-rules +index e0e0e8f..547d910 100755 +--- a/luci-app-ssr-plus/root/usr/bin/ssr-rules ++++ b/luci-app-ssr-plus/root/usr/bin/ssr-rules +@@ -103,7 +103,6 @@ ipset_r() { + $IPT -A SS_SPEC_WAN_AC -m set --match-set china dst -j RETURN + $IPT -A SS_SPEC_WAN_AC -m set --match-set gfwlist dst -j SS_SPEC_WAN_FW + $IPT -A SS_SPEC_WAN_AC -m set --match-set gmlan src -m set ! --match-set china dst -j SS_SPEC_WAN_FW +- $IPT -A SS_SPEC_WAN_AC -j SS_SPEC_WAN_FW + ;; + oversea) + ipset -N oversea hash:net 2>/dev/null