Xray: Add uTLS support

ipt2socks-alt/Makefile

@@ -1,46 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ipt2socks-alt
-PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/zfl9/ipt2socks.git
-PKG_SOURCE_VERSION:=e6c9b60444bfe2f30830619aacbc67d26ee1015e
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=libuv
-PKG_USE_MIPS16:=0
-
-PKG_LICENSE:=GPLv3
-PKG_LICENSE_FILES:=LICENSE
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ipt2socks-alt
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5
-	URL:=https://github.com/zfl9/ipt2socks.git
-endef
-
-define Package/ipt2socks-alt/description
-Utility for converting iptables (REDIRECT/TPROXY) to SOCKS5.
-endef
-
-define Package/ipt2socks-alt/conffiles
-/etc/config/ipt2socks
-endef
-
-MAKE_FLAGS += LIBS="-l:libuv_a.a"
-
-define Package/ipt2socks-alt/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ipt2socks $(1)/usr/bin/ipt2socks-alt
-endef
-
-$(eval $(call BuildPackage,ipt2socks-alt))

luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=183
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 define Package/$(PKG_NAME)/conffiles
 /etc/config/shadowsocksr
@@ -47,7 +47,7 @@ endef
 LUCI_TITLE:=SS/SSR/V2Ray/Trojan/NaiveProxy/Socks5/Tun LuCI interface
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget-ssl +lua +libuci-lua \
-	+microsocks +dns2socks +shadowsocksr-libev-ssr-local +tcping +resolveip +ipt2socks-alt \
+	+microsocks +dns2socks +shadowsocksr-libev-ssr-local +tcping +resolveip \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-local \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:simple-obfs \

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

@@ -143,15 +143,15 @@ o.template = "shadowsocksr/ssrurl"
 o.value = sid
 
 o = s:option(ListValue, "type", translate("Server Node Type"))
+if is_finded("xray") or is_finded("v2ray") then
+	o:value("v2ray", translate("V2Ray/XRay"))
+end
 if is_finded("ssr-redir") then
 	o:value("ssr", translate("ShadowsocksR"))
 end
 if is_finded("ss-redir") then
 	o:value("ss", translate("Shadowsocks New Version"))
 end
-if is_finded("xray") or is_finded("v2ray") then
-	o:value("v2ray", translate("V2Ray/XRay"))
-end
 if is_finded("trojan") then
 	o:value("trojan", translate("Trojan"))
 end
@@ -162,7 +162,7 @@ end
 if is_finded("naive") then
 	o:value("naiveproxy", translate("NaiveProxy"))
 end
-if is_finded("ipt2socks-alt") or is_finded("ipt2socks") then
+if is_finded("ipt2socks") then
 	o:value("socks5", translate("Socks5"))
 end
 if is_finded("redsocks2") then
@@ -183,8 +183,8 @@ o:depends("type", "tun")
 o.description = translate("Redirect traffic to this network interface")
 
 o = s:option(ListValue, "v2ray_protocol", translate("V2Ray/XRay protocol"))
-o:value("vmess", translate("VMess"))
 o:value("vless", translate("VLESS"))
+o:value("vmess", translate("VMess"))
 o:value("trojan", translate("Trojan"))
 o:value("shadowsocks", translate("Shadowsocks"))
 o:value("socks", translate("Socks"))
@@ -546,8 +546,15 @@ o = s:option(ListValue, "fingerprint", translate("Finger Print"))
 o:value("disable", translate("disable"))
 o:value("firefox", translate("firefox"))
 o:value("chrome", translate("chrome"))
-o:value("ios", translate("ios"))
+if is_finded("Trojan-go") then
+	o:value("ios", translate("ios"))
+end
+if is_finded("xray") then
+	o:value("safari", translate("safari"))
+	o:value("randomized", translate("random"))
+end
 o:depends({type = "trojan-go", tls = true})
+o:depends({type = "v2ray", tls = true})
 o.default = "firefox"
 
 o = s:option(Value, "tls_host", translate("TLS Host"))

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

@@ -87,8 +87,8 @@ function s.create(...)
 end
 
 o = s:option(DummyValue, "type", translate("Type"))
-function o.cfgvalue(...)
-	return Value.cfgvalue(...)
+function o.cfgvalue(self, section)
+	return m:get(section, "v2ray_protocol") or Value.cfgvalue(self, section) or translate("None")
 end
 
 o = s:option(DummyValue, "alias", translate("Alias"))

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

@@ -363,13 +363,13 @@ start_udp() {
 	trojan) #client
 		gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_local_port
 		ln_start_bin $(first_type trojan-go trojan) $type --config $udp_config_file
-		ln_start_bin $(first_type ipt2socks-alt ipt2socks) ipt2socks -U -b 0.0.0.0 -4 -s 127.0.0.1 -p $tmp_udp_local_port -l $tmp_udp_port
+		ln_start_bin $(first_type ipt2socks) ipt2socks -U -b 0.0.0.0 -4 -s 127.0.0.1 -p $tmp_udp_local_port -l $tmp_udp_port
 		echolog "UDP TPROXY Relay:$($(first_type trojan-go trojan) --version 2>&1 | head -1) Started!"
 		;;
 	trojan-go)
 		gen_config_file $UDP_RELAY_SERVER $type 2 $udp_config_file
-		ln_start_bin $(first_type trojan-go trojan) $type --config $udp_config_file
-		echolog "UDP TPROXY Relay:$($(first_type trojan-go trojan) --version 2>&1 | head -1) Started!"
+		ln_start_bin $(first_type trojan-go) $type --config $udp_config_file
+		echolog "UDP TPROXY Relay:$($(first_type trojan-go) --version 2>&1 | head -1) Started!"
 		;;
 	naiveproxy)
 		echolog "NaïveProxy UDP TPROXY Relay not supported!"
@@ -380,7 +380,7 @@ start_udp() {
 		if [ "$(uci_get_by_name $UDP_RELAY_SERVER auth_enable 0)" == "1" ]; then
 			local auth="-a $(uci_get_by_name $UDP_RELAY_SERVER username) -k $(uci_get_by_name $UDP_RELAY_SERVER password)"
 		fi
-		ln_start_bin $(first_type ipt2socks-alt ipt2socks) ipt2socks $udp_config_file -U -4 -s $(uci_get_by_name $UDP_RELAY_SERVER server) -p $(uci_get_by_name $UDP_RELAY_SERVER server_port) -l $tmp_udp_port $auth
+		ln_start_bin $(first_type ipt2socks) ipt2socks $udp_config_file -U -4 -s $(uci_get_by_name $UDP_RELAY_SERVER server) -p $(uci_get_by_name $UDP_RELAY_SERVER server_port) -l $tmp_udp_port $auth
 		#gen_config_file $UDP_RELAY_SERVER $type 2 $tmp_udp_port
 		#ln_start_bin $(first_type redsocks2) redsocks2 -c $udp_config_file
 		echolog "UDP TPROXY Relay:Socks5 REDIRECT/TPROXY Started!"
@@ -448,7 +448,7 @@ start_shunt() {
 		if [ "$(uci_get_by_name $SHUNT_SERVER auth_enable 0)" == "1" ]; then
 			local auth="-a $(uci_get_by_name $SHUNT_SERVER username) -k $(uci_get_by_name $SHUNT_SERVER password)"
 		fi
-		ln_start_bin $(first_type ipt2socks-alt ipt2socks) ipt2socks $shunt_config_file -R -4 -s $(uci_get_by_name $SHUNT_SERVER server) -p $(uci_get_by_name $SHUNT_SERVER server_port) -l $tmp_shunt_port $auth
+		ln_start_bin $(first_type ipt2socks) ipt2socks $shunt_config_file -R -4 -s $(uci_get_by_name $SHUNT_SERVER server) -p $(uci_get_by_name $SHUNT_SERVER server_port) -l $tmp_shunt_port $auth
 		#gen_config_file $SHUNT_SERVER $type 3 $tmp_shunt_port
 		#ln_start_bin $(first_type redsocks2) redsocks2 -c $shunt_config_file
 		if [ -n "$tmp_local_port" ]; then
@@ -567,7 +567,7 @@ Start_Run() {
 		if [ "$(uci_get_by_name $GLOBAL_SERVER auth_enable 0)" == "1" ]; then
 			local auth="-a $(uci_get_by_name $GLOBAL_SERVER username) -k $(uci_get_by_name $GLOBAL_SERVER password)"
 		fi
-		ln_start_bin $(first_type ipt2socks-alt ipt2socks) ipt2socks $tcp_config_file -R -4 -j $threads -s $(uci_get_by_name $GLOBAL_SERVER server) -p $(uci_get_by_name $GLOBAL_SERVER server_port) -l $tcp_port $auth
+		ln_start_bin $(first_type ipt2socks) ipt2socks $tcp_config_file -R -4 -j $threads -s $(uci_get_by_name $GLOBAL_SERVER server) -p $(uci_get_by_name $GLOBAL_SERVER server_port) -l $tcp_port $auth
 		#gen_config_file $GLOBAL_SERVER $type 1 $tcp_port
 		#for i in $(seq 1 $threads); do
 		#	ln_start_bin $(first_type redsocks2) redsocks2 -c $tcp_config_file

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

@@ -426,6 +426,8 @@
 43.228.148.0/22
 43.228.152.0/22
 43.228.188.0/22
+43.228.204.0/22
+43.228.240.0/22
 43.229.40.0/22
 43.229.48.0/22
 43.229.56.0/22
@@ -1950,7 +1952,9 @@
 101.234.96.0/19
 101.236.0.0/14
 101.240.0.0/14
-101.244.0.0/14
+101.244.0.0/16
+101.245.0.0/16
+101.246.0.0/15
 101.248.0.0/15
 101.251.0.0/22
 101.251.8.0/21
@@ -2538,6 +2542,7 @@
 103.41.0.0/22
 103.41.16.0/22
 103.41.52.0/22
+103.41.116.0/22
 103.41.140.0/22
 103.41.148.0/22
 103.41.152.0/22
@@ -2818,6 +2823,8 @@
 103.56.60.0/22
 103.56.72.0/22
 103.56.76.0/22
+103.56.100.0/22
+103.56.104.0/22
 103.56.140.0/22
 103.56.152.0/22
 103.56.184.0/22
@@ -3916,7 +3923,6 @@
 103.142.96.0/23
 103.142.102.0/23
 103.142.122.0/23
-103.142.126.0/24
 103.142.128.0/23
 103.142.140.0/23
 103.142.154.0/23
@@ -4115,6 +4121,13 @@
 103.160.254.0/23
 103.161.14.0/23
 103.161.102.0/23
+103.161.138.0/23
+103.161.208.0/23
+103.161.220.0/23
+103.161.254.0/23
+103.162.10.0/23
+103.162.32.0/23
+103.162.38.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -5541,7 +5554,9 @@
 118.26.96.0/21
 118.26.112.0/21
 118.26.120.0/21
-118.26.128.0/17
+118.26.128.0/20
+118.26.160.0/19
+118.26.192.0/18
 118.28.0.0/15
 118.30.0.0/16
 118.31.0.0/16

luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus

@@ -29,5 +29,6 @@ fi
 sed -i "s/option type 'vmess'"/"option type 'v2ray'\n\toption v2ray_protocol 'vmess'/g" /etc/config/shadowsocksr
 sed -i "s/option type 'vless'"/"option type 'v2ray'\n\toption v2ray_protocol 'vless'/g" /etc/config/shadowsocksr
 sed -i "s/option type 'trojan'"/"option type 'v2ray'\n\toption v2ray_protocol 'trojan'/g" /etc/config/shadowsocksr
+sed -i "s/option type 'socks5'"/"option type 'v2ray'\n\toption v2ray_protocol 'socks'/g" /etc/config/shadowsocksr
 rm -rf /tmp/luci-modulecache /tmp/luci-indexcache
 exit 0

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

@@ -40,15 +40,12 @@ function trojan_shadowsocks()
 end
 function socks_http()
 	outbound_settings = {
-		--
 		servers = {
 			{
-				--
 				address = server.server,
 				port = tonumber(server.server_port),
 				users = (server.auth_enable == "1") and {
 					{
-						--
 						user = server.username,
 						pass = server.password
 					}
@@ -115,18 +112,19 @@ local Xray = {
 	} or nil,
 	-- 传出连接
 	outbound = {
-		protocol = server.v2ray_protocol or "vmess",
+		protocol = server.v2ray_protocol,
 		settings = outbound_settings,
 		-- 底层传输配置
 		streamSettings = {
 			network = server.transport or "tcp",
 			security = (server.xtls == '1') and "xtls" or (server.tls == '1') and "tls" or nil,
-			tlsSettings = (server.tls == '1' and (server.insecure == "1" or server.tls_host)) and {
+			tlsSettings = (server.tls == '1') and {
 				-- tls
+				fingerprint = server.fingerprint,
 				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)) and {
+			xtlsSettings = (server.xtls == '1') and {
 				-- xtls
 				allowInsecure = (server.insecure == "1") and true or nil,
 				serverName = server.tls_host
@@ -180,8 +178,7 @@ local Xray = {
 		} or nil
 	} or nil
 }
-local cipher =
-				"ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA"
+local cipher = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA"
 local cipher13 = "TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384"
 local trojan = {
 	log_level = 3,
@@ -274,7 +271,7 @@ function config:handleIndex(index)
 			trojan.ssl.fingerprint = (server.fingerprint ~= nil and server.fingerprint ~= "disable") and server.fingerprint or ""
 			trojan.ssl.alpn = server.trojan_transport == 'ws' and {} or {"h2", "http/1.1"}
 			if server.tls ~= "1" and server.trojan_transport == "original" then
-				--
+				-- tls
 				trojan.ssl = nil
 				trojan.transport_plugin = server.trojan_transport == "original" and {
 					enabled = server.plugin_type ~= nil,
@@ -286,13 +283,13 @@ function config:handleIndex(index)
 				} or nil
 			end
 			trojan.websocket = server.trojan_transport and server.trojan_transport:find('ws') and {
-				--
+				-- ws
 				enabled = true,
 				path = server.ws_path or "/",
 				host = server.ws_host or (server.tls_host or server.server)
 			} or nil
 			trojan.shadowsocks = (server.ss_aead == "1") and {
-				--
+				-- ss 
 				enabled = true,
 				method = server.ss_aead_method or "aead_aes_128_gcm",
 				password = server.ss_aead_pwd or ""