Merge pull request #461 from Mattraks/patch

Update uTLS fingerprints

luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua

@@ -48,19 +48,19 @@ o = s:option(Flag, "adblock", translate("Enable adblock"))
 o.rmempty = false
 
 o = s:option(Value, "adblock_url", translate("adblock_url"))
-o:value("https://raw.sevencdn.com/neodevpro/neodevhost/master/lite_host_dnsmasq.conf", translate("NEO DEV HOST Lite"))
-o:value("https://raw.sevencdn.com/neodevpro/neodevhost/master/host_dnsmasq.conf", translate("NEO DEV HOST Full"))
-o:value("https://raw.sevencdn.com/privacy-protection-tools/anti-AD/master/adblock-for-dnsmasq.conf", translate("anti-AD"))
-o.default = "https://raw.sevencdn.com/neodevpro/neodevhost/master/lite_host_dnsmasq.conf"
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/neodevpro/neodevhost/master/lite_host_dnsmasq.conf", translate("NEO DEV HOST Lite"))
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/neodevpro/neodevhost/master/host_dnsmasq.conf", translate("NEO DEV HOST Full"))
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/adblock-for-dnsmasq.conf", translate("anti-AD"))
+o.default = "https://ghproxy.com/https://raw.githubusercontent.com/neodevpro/neodevhost/master/lite_host_dnsmasq.conf"
 o:depends("adblock", "1")
 o.description = translate("Support AdGuardHome and DNSMASQ format list")
 
 o = s:option(Value, "gfwlist_url", translate("gfwlist Update url"))
-o:value("https://raw.sevencdn.com/YW5vbnltb3Vz/domain-list-community/release/gfwlist.txt", translate("v2fly/domain-list-community"))
-o:value("https://raw.sevencdn.com/Loyalsoldier/v2ray-rules-dat/release/gfw.txt", translate("Loyalsoldier/v2ray-rules-dat"))
-o:value("https://raw.sevencdn.com/Loukky/gfwlist-by-loukky/master/gfwlist.txt", translate("Loukky/gfwlist-by-loukky"))
-o:value("https://raw.sevencdn.com/gfwlist/gfwlist/master/gfwlist.txt", translate("gfwlist/gfwlist"))
-o.default = "https://raw.sevencdn.com/YW5vbnltb3Vz/domain-list-community/release/gfwlist.txt"
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/YW5vbnltb3Vz/domain-list-community/release/gfwlist.txt", translate("v2fly/domain-list-community"))
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/gfw.txt", translate("Loyalsoldier/v2ray-rules-dat"))
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/Loukky/gfwlist-by-loukky/master/gfwlist.txt", translate("Loukky/gfwlist-by-loukky"))
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt", translate("gfwlist/gfwlist"))
+o.default = "https://ghproxy.com/https://raw.githubusercontent.com/YW5vbnltb3Vz/domain-list-community/release/gfwlist.txt"
 
 o = s:option(Value, "chnroute_url", translate("Chnroute Update url"))
 o:value("https://ispip.clang.cn/all_cn.txt", translate("Clang.CN"))
@@ -68,9 +68,9 @@ o:value("https://ispip.clang.cn/all_cn_cidr.txt", translate("Clang.CN.CIDR"))
 o.default = "https://ispip.clang.cn/all_cn.txt"
 
 o = s:option(Value, "nfip_url", translate("nfip_url"))
-o:value("https://raw.sevencdn.com/QiuSimons/Netflix_IP/master/NF_only.txt", translate("Netflix IP Only"))
-o:value("https://raw.sevencdn.com/QiuSimons/Netflix_IP/master/getflix.txt", translate("Netflix and AWS"))
-o.default = "https://raw.sevencdn.com/QiuSimons/Netflix_IP/master/NF_only.txt"
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt", translate("Netflix IP Only"))
+o:value("https://ghproxy.com/https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/getflix.txt", translate("Netflix and AWS"))
+o.default = "https://ghproxy.com/https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"
 o.description = translate("Customize Netflix IP Url")
 
 o = s:option(Button, "reset", translate("Reset to defaults"))

luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua

@@ -512,17 +512,15 @@ o = s:option(Flag, "tls_sessionTicket", translate("Session Ticket"))
 o:depends({type = "trojan", tls = true})
 o.default = "0"
 
--- [[ Trojan TLS ]]--
+-- [[ uTLS ]]--
 o = s:option(ListValue, "fingerprint", translate("Finger Print"))
 o:value("disable", translate("disable"))
 o:value("firefox", translate("firefox"))
 o:value("chrome", translate("chrome"))
-if is_finded("xray") then
-	o:value("safari", translate("safari"))
-	o:value("randomized", translate("random"))
-end
+o:value("safari", translate("safari"))
+o:value("randomized", translate("randomized"))
 o:depends({type = "v2ray", tls = true})
-o.default = "firefox"
+o.default = "disable"
 
 o = s:option(Value, "tls_host", translate("TLS Host"))
 o.datatype = "hostname"

luci-app-ssr-plus/root/etc/init.d/shadowsocksr

@@ -885,9 +885,9 @@ reset() {
 		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].gfwlist_url='https://raw.sevencdn.com/YW5vbnltb3Vz/domain-list-community/release/gfwlist.txt'
+		set shadowsocksr.@global[0].gfwlist_url='https://ghproxy.com/https://raw.githubusercontent.com/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://raw.sevencdn.com/QiuSimons/Netflix_IP/master/NF_only.txt'
+		set shadowsocksr.@global[0].nfip_url='https://ghproxy.com/https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/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'

luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt

@@ -1725,7 +1725,6 @@
 59.172.0.0/15
 59.174.0.0/15
 59.191.0.0/17
-59.191.240.0/20
 59.192.0.0/10
 60.0.0.0/13
 60.8.0.0/15
@@ -3977,7 +3976,6 @@
 103.146.124.0/23
 103.146.126.0/23
 103.146.138.0/23
-103.146.147.0/24
 103.146.230.0/23
 103.146.236.0/23
 103.146.252.0/23
@@ -4132,6 +4130,15 @@
 103.163.46.0/23
 103.163.74.0/23
 103.163.180.0/23
+103.164.4.0/23
+103.164.32.0/23
+103.164.40.0/23
+103.164.42.0/23
+103.164.64.0/23
+103.164.76.0/23
+103.164.178.0/23
+103.164.226.0/23
+103.165.44.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -4411,7 +4418,6 @@
 103.205.252.0/22
 103.206.0.0/22
 103.206.44.0/22
-103.206.108.0/22
 103.206.148.0/22
 103.207.48.0/22
 103.207.104.0/22
@@ -6201,6 +6207,7 @@
 157.156.0.0/16
 157.255.0.0/16
 158.79.0.0/16
+159.27.0.0/16
 159.75.0.0/16
 159.226.0.0/16
 160.19.208.0/22
@@ -6267,6 +6274,7 @@
 163.177.0.0/16
 163.179.0.0/16
 163.204.0.0/16
+163.228.0.0/16
 164.52.0.0/17
 166.111.0.0/16
 167.139.0.0/16

luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua

@@ -124,7 +124,7 @@ local Xray = {
 				allowInsecure = (server.insecure == "1") and true or nil,
 				serverName = server.tls_host
 			} or nil,
-			xtlsSettings = (server.xtls == '1' and (server.insecure == "1" or server.tls_host or server.fingerprint)) and {
+			xtlsSettings = (server.xtls == '1' and (server.insecure == "1" or server.tls_host)) and {
 				-- xtls
 				allowInsecure = (server.insecure == "1") and true or nil,
 				serverName = server.tls_host