diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log index 28842cf99..73f6bb11a 100644 --- a/luci-app-godproxy/rulesupdate.log +++ b/luci-app-godproxy/rulesupdate.log @@ -1,42 +1,40 @@ -2022-01-01 01:15:55: ------------------- 规则更新 ----------------------- -2022-01-01 01:15:55: ==================================================== -2022-01-01 01:15:55: 开始更新koolproxy的规则，请等待... -2022-01-01 01:15:56: --------------------------------------------------------------------------------------- -2022-01-01 01:15:56: Yhosts规则本地版本号： 202111082343 -2022-01-01 01:15:56: Yhosts规则在线版本号： 202111082343 -2022-01-01 01:15:56: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! -2022-01-01 01:15:56: --------------------------------------------------------------------------------------- -2022-01-01 01:15:57: Antiad规则本地版本号： 20211229024243 -2022-01-01 01:15:57: Antiad规则在线版本号： 20220101024240 -2022-01-01 01:15:57: 检测到新版本 Antiad规则 列表，开始更新... -2022-01-01 01:15:57: 将临时文件覆盖到原始 Antiad规则 文件 -2022-01-01 01:15:57: --------------------------------------------------------------------------------------- -2022-01-01 01:15:57: StevenBlack规则本地版本号： 25 December 2021 18:27:57 -2022-01-01 01:15:57: StevenBlack规则在线版本号： 30 December 2021 19:03:10 -2022-01-01 01:15:57: 检测到新版本 StevenBlack规则 列表，开始更新... -2022-01-01 01:15:57: 将临时文件覆盖到原始 StevenBlack规则 文件 -2022-01-01 01:15:57: --------------------------------------------------------------------------------------- -2022-01-01 01:15:57: AdGuard DNS规则本地版本号： 2021-12-29T00:20:20.667Z -2022-01-01 01:15:57: AdGuard DNS规则在线版本号： 2022-01-01T00:21:41.562Z -2022-01-01 01:15:57: 检测到新版本 AdGuard DNS规则 列表，开始更新... -2022-01-01 01:15:57: 将临时文件覆盖到原始 AdGuard DNS规则 文件 -2022-01-01 01:15:57: --------------------------------------------------------------------------------------- -2022-01-01 01:15:57: ADgk规则本地版本号： 20211220225935 -2022-01-01 01:15:57: ADgk规则在线版本号： 20220101005349 -2022-01-01 01:15:57: 检测到新版本 ADgk规则 列表，开始更新... -2022-01-01 01:15:57: 将临时文件覆盖到原始 ADgk规则 文件 -2022-01-01 01:15:57: 跳过优化 补充规则Yhosts。。。。。 -2022-01-01 01:15:57: 正在优化 补充规则antiad。。。。。 -2022-01-01 01:15:58: 正在优化 补充规则steven。。。。。 -2022-01-01 01:15:58: 正在优化 补充规则AdGuard DNS。。。。。 -2022-01-01 01:16:05: 正在优化 ADgk规则。。。。。 -2022-01-01 01:16:16: 所有规则更新并优化完毕！ -2022-01-01 01:16:16: ==================================================== -2022-01-01 01:16:18: -------------------AdGuard规则 version 2022-01-01T00:21:41.562Z -2022-01-01 01:16:18: -------------------Antiad规则 version 20220101024240 -2022-01-01 01:16:18: -------------------Banben规则 version 20220101005349 -2022-01-01 01:16:18: -------------------Yhosts规则 version 202111082343 -2022-01-01 01:16:18: -------------------Steven规则 version 30 December 2021 19:03:10 -2022-01-01 01:16:18: -------------------静态规则 version 2021-12-25 10:30 -2022-01-01 01:16:18: ------------------- 内置规则更新成功！ ------------------- -2022-01-01 01:16:18: ------------------- 规则更新成功！ ------------------- +2022-01-02 02:41:12: ------------------- 规则更新 ----------------------- +2022-01-02 02:41:12: ==================================================== +2022-01-02 02:41:12: 开始更新koolproxy的规则，请等待... +2022-01-02 02:41:12: --------------------------------------------------------------------------------------- +2022-01-02 02:41:12: Yhosts规则本地版本号： 202111082343 +2022-01-02 02:41:12: Yhosts规则在线版本号： 202111082343 +2022-01-02 02:41:12: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2022-01-02 02:41:12: --------------------------------------------------------------------------------------- +2022-01-02 02:41:12: Antiad规则本地版本号： 20220101024240 +2022-01-02 02:41:12: Antiad规则在线版本号： 20220102024207 +2022-01-02 02:41:12: 检测到新版本 Antiad规则 列表，开始更新... +2022-01-02 02:41:12: 将临时文件覆盖到原始 Antiad规则 文件 +2022-01-02 02:41:12: --------------------------------------------------------------------------------------- +2022-01-02 02:41:12: StevenBlack规则本地版本号： 30 December 2021 19:03:10 +2022-01-02 02:41:12: StevenBlack规则在线版本号： 30 December 2021 19:03:10 +2022-01-02 02:41:12: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! +2022-01-02 02:41:12: --------------------------------------------------------------------------------------- +2022-01-02 02:41:12: AdGuard DNS规则本地版本号： 2022-01-01T00:21:41.562Z +2022-01-02 02:41:12: AdGuard DNS规则在线版本号： 2022-01-02T00:21:59.015Z +2022-01-02 02:41:12: 检测到新版本 AdGuard DNS规则 列表，开始更新... +2022-01-02 02:41:12: 将临时文件覆盖到原始 AdGuard DNS规则 文件 +2022-01-02 02:41:12: --------------------------------------------------------------------------------------- +2022-01-02 02:41:13: ADgk规则本地版本号： 20220101005349 +2022-01-02 02:41:13: ADgk规则在线版本号： 20220101005349 +2022-01-02 02:41:13: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊! +2022-01-02 02:41:13: 跳过优化 补充规则Yhosts。。。。。 +2022-01-02 02:41:13: 正在优化 补充规则antiad。。。。。 +2022-01-02 02:41:13: 跳过优化 补充规则StevenBlack。。。。。 +2022-01-02 02:41:13: 正在优化 补充规则AdGuard DNS。。。。。 +2022-01-02 02:41:21: 跳过优化 ADgk规则。。。。。 +2022-01-02 02:41:21: 所有规则更新并优化完毕！ +2022-01-02 02:41:21: ==================================================== +2022-01-02 02:41:22: -------------------AdGuard规则 version 2022-01-02T00:21:59.015Z +2022-01-02 02:41:22: -------------------Antiad规则 version 20220102024207 +2022-01-02 02:41:22: -------------------Banben规则 version 20220101005349 +2022-01-02 02:41:22: -------------------Yhosts规则 version 202111082343 +2022-01-02 02:41:22: -------------------Steven规则 version 30 December 2021 19:03:10 +2022-01-02 02:41:22: -------------------静态规则 version 2021-12-25 10:30 +2022-01-02 02:41:22: ------------------- 内置规则更新成功！ ------------------- +2022-01-02 02:41:22: ------------------- 规则更新成功！ ------------------- diff --git a/luci-app-openclash/root/usr/share/openclash/openclash.sh b/luci-app-openclash/root/usr/share/openclash/openclash.sh index 2f828e1fa..e23285947 100644 --- a/luci-app-openclash/root/usr/share/openclash/openclash.sh +++ b/luci-app-openclash/root/usr/share/openclash/openclash.sh @@ -49,15 +49,15 @@ config_download() { if [ -n "$subscribe_url_param" ]; then if [ -n "$c_address" ]; then - curl -sL --connect-timeout 10 --retry 2 "$c_address""$subscribe_url_param" -o "$CFG_FILE" >/dev/null 2>&1 + curl -sL --connect-timeout 10 --retry 2 -H 'User-Agent: Clash' "$c_address""$subscribe_url_param" -o "$CFG_FILE" >/dev/null 2>&1 else - curl -sL --connect-timeout 10 --retry 2 https://api.dler.io/sub"$subscribe_url_param" -o "$CFG_FILE" >/dev/null 2>&1 + curl -sL --connect-timeout 10 --retry 2 -H 'User-Agent: Clash' https://api.dler.io/sub"$subscribe_url_param" -o "$CFG_FILE" >/dev/null 2>&1 if [ "$?" -ne 0 ]; then - curl -sL --connect-timeout 10 --retry 2 https://subconverter.herokuapp.com/sub"$subscribe_url_param" -o "$CFG_FILE" >/dev/null 2>&1 + curl -sL --connect-timeout 10 --retry 2 -H 'User-Agent: Clash' https://subconverter.herokuapp.com/sub"$subscribe_url_param" -o "$CFG_FILE" >/dev/null 2>&1 fi fi else - curl -sL --connect-timeout 10 --retry 2 --user-agent "clash" "$subscribe_url" -o "$CFG_FILE" >/dev/null 2>&1 + curl -sL --connect-timeout 10 --retry 2 -H 'User-Agent: Clash' "$subscribe_url" -o "$CFG_FILE" >/dev/null 2>&1 fi } @@ -418,6 +418,12 @@ sub_info_get() return fi + if [ "$udp" == "true" ]; then + udp="udp=true" + else + udp="" + fi + if [ -z "$name" ]; then name="config" CONFIG_FILE="/etc/openclash/config/config.yaml" @@ -456,7 +462,7 @@ sub_info_get() template_path_encode=$(urlencode "$template_path") [ -n "$key_match_param" ] && key_match_param="(?i)$(urlencode "$key_match_param")" [ -n "$key_ex_match_param" ] && key_ex_match_param="(?i)$(urlencode "$key_ex_match_param")" - subscribe_url_param="?target=clash&new_name=true&url=$subscribe_url&config=$template_path_encode&include=$key_match_param&exclude=$key_ex_match_param&emoji=$emoji&list=false&sort=$sort&udp=$udp&scv=$skip_cert_verify&append_type=$node_type&fdn=true" + subscribe_url_param="?target=clash&new_name=true&url=$subscribe_url&config=$template_path_encode&include=$key_match_param&exclude=$key_ex_match_param&emoji=$emoji&list=false&sort=$sort&$udp&scv=$skip_cert_verify&append_type=$node_type&fdn=true" c_address="$convert_address" else subscribe_url=$address diff --git a/luci-app-softethervpn/Makefile b/luci-app-softethervpn/Makefile index c198be7a9..541d4520c 100644 --- a/luci-app-softethervpn/Makefile +++ b/luci-app-softethervpn/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2021 Lienol +# Copyright (C) 2018-2022 Lienol # # This is free software, licensed under the Apache License, Version 2.0 . # @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for SoftEtherVPN -LUCI_DEPENDS:=+zlib +libpthread +librt +libreadline +libncurses +libiconv-full +kmod-tun +libopenssl +softethervpn5-bridge +softethervpn5-client +softethervpn5-server +LUCI_DEPENDS:=+zlib +libpthread +librt +libreadline +libncurses +libiconv-full +kmod-tun +libopenssl +softethervpn-server LUCI_PKGARCH:=all -PKG_VERSION:=1 -PKG_RELEASE:=13-20210628 +PKG_VERSION:=20220102 +PKG_RELEASE:=1 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-softethervpn/luasrc/controller/softethervpn.lua b/luci-app-softethervpn/luasrc/controller/softethervpn.lua index d4ec9bc88..4eed51f63 100644 --- a/luci-app-softethervpn/luasrc/controller/softethervpn.lua +++ b/luci-app-softethervpn/luasrc/controller/softethervpn.lua @@ -1,18 +1,17 @@ -module("luci.controller.softethervpn",package.seeall) +module("luci.controller.softethervpn", package.seeall) function index() - if not nixio.fs.access("/etc/config/softethervpn")then - return - end - - entry({"admin","vpn"}, firstchild(), "VPN", 45).dependent = false - entry({"admin","vpn","softethervpn"},cbi("softethervpn"),_("SoftEther VPN"),50).dependent=true - entry({"admin","vpn","softethervpn","status"},call("status")).leaf=true + if not nixio.fs.access("/etc/config/softethervpn") then return end + + e = entry({"admin", "vpn", "softethervpn"}, cbi("softethervpn"), _("SoftEther VPN"), 80) + e.dependent = true + e.acl_depends = { "luci-app-softethervpn" } + entry({"admin", "vpn", "softethervpn", "status"}, call("status")).leaf = true end function status() - local e={} - e.status=luci.sys.call("pidof %s >/dev/null"%"vpnserver")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e = {} + e.status = luci.sys.call("pidof %s >/dev/null" % "vpnserver") == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/luci-app-softethervpn/luasrc/model/cbi/softethervpn.lua b/luci-app-softethervpn/luasrc/model/cbi/softethervpn.lua index 04f20f8e8..0e78003bf 100644 --- a/luci-app-softethervpn/luasrc/model/cbi/softethervpn.lua +++ b/luci-app-softethervpn/luasrc/model/cbi/softethervpn.lua @@ -1,16 +1,37 @@ -local s = require "luci.sys" -local m, s, o m = Map("softethervpn", translate("SoftEther VPN")) -m.description = translate( - "SoftEther VPN is an open source, cross-platform, multi-protocol virtual private network solution developed by university of tsukuba graduate student Daiyuu Nobori for master's thesis.
can easily set up OpenVPN, IPsec, L2TP, ms-sstp, L2TPv3 and EtherIP servers on the router using the console.") +m.description = translate("SoftEther VPN is an open source, cross-platform, multi-protocol virtual private network solution developed by university of tsukuba graduate student Daiyuu Nobori for master's thesis.
can easily set up OpenVPN, IPsec, L2TP, ms-sstp, L2TPv3 and EtherIP servers on the router using the console.") m.template = "softethervpn/index" + s = m:section(TypedSection, "softether") s.anonymous = true + o = s:option(DummyValue, "softethervpn_status", translate("Current Condition")) o.template = "softethervpn/status" o.value = translate("Collecting data...") -o = s:option(Flag, "enable", translate("Enabled")) + +o = s:option(Flag, "enabled", translate("Enabled")) o.rmempty = false -o = s:option(DummyValue, "moreinfo", translate( - "控制台下载：
Windows-x86_x64-intel.exe
macos-x86-32bit.pkg")) + +o = s:option(DummyValue, "moreinfo", translate("Console download")) +o.rawhtml = true +o.cfgvalue = function(self, section) + local obj = { + { + title = "Windows-x86_x64-intel.exe", + url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v4.38-9760-rtm/softether-vpnserver_vpnbridge-v4.38-9760-rtm-2021.08.17-windows-x86_x64-intel.exe" + }, + { + title = "macos-x86-32bit.pkg", + url = "https://www.softether-download.com/files/softether/v4.21-9613-beta-2016.04.24-tree/Mac_OS_X/Admin_Tools/VPN_Server_Manager_Package/softether-vpnserver_manager-v4.21-9613-beta-2016.04.24-macos-x86-32bit.pkg" + } + } + + local html = "" + + for i, o in ipairs(obj) do + html = html .. string.format("%s   ", o.url, o.title) + end + + return html +end return m diff --git a/luci-app-softethervpn/po/zh-cn/softethervpn.po b/luci-app-softethervpn/po/zh-cn/softethervpn.po index 8d17b1507..b32ae6d60 100644 --- a/luci-app-softethervpn/po/zh-cn/softethervpn.po +++ b/luci-app-softethervpn/po/zh-cn/softethervpn.po @@ -4,20 +4,14 @@ msgstr "SoftEther VPN 服务器" msgid "SoftEther VPN is an open source, cross-platform, multi-protocol virtual private network solution developed by university of tsukuba graduate student Daiyuu Nobori for master's thesis.
can easily set up OpenVPN, IPsec, L2TP, ms-sstp, L2TPv3 and EtherIP servers on the router using the console." msgstr "SoftEther VPN是由筑波大学研究生Daiyuu Nobori因硕士论文开发的开源，跨平台，多重协定的虚拟私人网路方案。
使用控制台可以轻松在路由器上搭建OpenVPN, IPsec, L2TP, MS-SSTP, L2TPv3 和 EtherIP服务器。" -msgid "PPTP VPN Server status" -msgstr "PPTP VPN 服务器运行状态" - msgid "Current Condition" msgstr "当前状态" +msgid "Collecting data..." +msgstr "收集数据..." + msgid "Enabled" msgstr "启用" -msgid "Open L2TP/IPSec firewall" -msgstr "开启L2TP/IPSec防火墙" - -msgid "Open the MS-SSTP firewall" -msgstr "开启MS-SSTP防火墙" - -msgid "Open the OpenVPN firewall" -msgstr "开启OpenVPN防火墙" \ No newline at end of file +msgid "Console download" +msgstr "控制台下载" diff --git a/luci-app-softethervpn/root/etc/config/softethervpn b/luci-app-softethervpn/root/etc/config/softethervpn index 90732c533..8d3a7fab3 100644 --- a/luci-app-softethervpn/root/etc/config/softethervpn +++ b/luci-app-softethervpn/root/etc/config/softethervpn @@ -1,4 +1,3 @@ config softether - option enable '0' - + option enabled '0' diff --git a/luci-app-softethervpn/root/etc/init.d/softethervpn b/luci-app-softethervpn/root/etc/init.d/softethervpn index d64cf36bd..131054b18 100755 --- a/luci-app-softethervpn/root/etc/init.d/softethervpn +++ b/luci-app-softethervpn/root/etc/init.d/softethervpn @@ -4,6 +4,8 @@ START=99 STOP=10 +USE_PROCD=1 + CONFIG=softethervpn add_rule() { @@ -56,18 +58,30 @@ gen_include() { return 0 } -start() -{ - enable=$(uci -q get $CONFIG.@softether[0].enable) - [ $enable -ne 1 ] && exit 0 - /usr/bin/env LANG=en_US.UTF-8 /usr/libexec/softethervpn/vpnserver start > /dev/null 2>&1 +start_service() { + enabled=$(uci -q get $CONFIG.@softether[0].enabled || echo "0") + [ $enabled -ne 1 ] && return 0 + + procd_open_instance $CONFIG + procd_set_param env LANG=en_US.UTF-8 + procd_set_param command /usr/libexec/softethervpn/vpnserver start --foreground + procd_set_param respawn + procd_close_instance + add_rule gen_include } -stop() -{ - /usr/bin/env LANG=en_US.UTF-8 /usr/libexec/softethervpn/vpnserver stop > /dev/null 2>&1 +stop_service() { + top -bn1 | grep "/usr/libexec/softethervpn" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 del_rule rm -rf /var/etc/$CONFIG.include } + +reload_service() { + restart +} + +service_triggers() { + procd_add_reload_trigger $CONFIG +} diff --git a/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn b/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn index 51d06f569..ea1a42b1a 100755 --- a/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn +++ b/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn @@ -15,9 +15,8 @@ uci -q batch <<-EOF >/dev/null commit ucitrack EOF -/etc/init.d/softethervpnbridge disable && /etc/init.d/softethervpnbridge stop -/etc/init.d/softethervpnclient disable && /etc/init.d/softethervpnclient stop -/etc/init.d/softethervpnserver disable && /etc/init.d/softethervpnserver stop +/etc/init.d/softethervpnserver stop +/etc/init.d/softethervpnserver disable rm -rf /tmp/luci-*cache exit 0 diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index fb8efc3a8..68a6ee9d7 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -302,13 +302,6 @@ o:depends("type", "ssr") o = s:option(Value, "obfs_param", translate("Obfs param(optional)")) o:depends("type", "ssr") --- AlterId -o = s:option(Value, "alter_id", translate("AlterId")) -o.datatype = "port" -o.default = 16 -o.rmempty = true -o:depends({type = "v2ray", v2ray_protocol = "vmess"}) - -- VmessId o = s:option(Value, "vmess_id", translate("Vmess/VLESS ID (UUID)")) o.rmempty = true diff --git a/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm index b3b49a4fa..b9711180c 100644 --- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm +++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm @@ -242,7 +242,6 @@ function import_ssr_url(btn, urlname, sid) { document.getElementsByName('cbid.shadowsocksr.' + sid + '.alias')[0].value = ssm.ps; document.getElementsByName('cbid.shadowsocksr.' + sid + '.server')[0].value = ssm.add; document.getElementsByName('cbid.shadowsocksr.' + sid + '.server_port')[0].value = ssm.port; - document.getElementsByName('cbid.shadowsocksr.' + sid + '.alter_id')[0].value = ssm.aid; document.getElementsByName('cbid.shadowsocksr.' + sid + '.vmess_id')[0].value = ssm.id; document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = ssm.net; document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].dispatchEvent(event); diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index eec009bf5..dce590e0f 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -15,7 +15,6 @@ function vmess_vless() users = { { id = server.vmess_id, - alterId = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and tonumber(server.alter_id) or nil, security = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and server.security or nil, encryption = (server.v2ray_protocol == "vless") and server.vless_encryption or nil, flow = (server.xtls == '1') and (server.vless_flow and server.vless_flow or "xtls-rprx-splice") or nil diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 8a9bb0188..0fd7c5f1c 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -163,7 +163,6 @@ local function processData(szType, content) result.server = info.add result.server_port = info.port result.transport = info.net - result.alter_id = info.aid result.vmess_id = info.id result.alias = info.ps -- result.mux = 1