From ebff22dfcc241dd652382089670ebecdf2d544ef Mon Sep 17 00:00:00 2001
From: xiaorouji <60100640+xiaorouji@users.noreply.github.com>
Date: Fri, 19 Mar 2021 15:16:45 +0800
Subject: [PATCH] luci-app-passwall: initial support import vless link

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 .../view/passwall/node_list/link_add_node.htm | 16 ++--
 .../luci-app-passwall/po/zh_Hans/passwall.po  | 14 ++-
 .../root/usr/share/passwall/app.sh            |  3 +-
 .../root/usr/share/passwall/subscribe.lua     | 90 ++++++++++++++++++-
 4 files changed, 107 insertions(+), 16 deletions(-)

diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
index ec47ae025a..69f9688df0 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
@@ -5,16 +5,16 @@ local api = require "luci.model.cbi.passwall.api.api"
 <style>
 #add_link_div{
 	display: none;
-	width: 30rem;
+	width: auto;
 	position: absolute;
 	left:50%;
 	top:50%;
 	transform: translate(-50%, -50%);
-	padding-top: 30px;
 	z-index: 99;
 	text-align: center;
 	background: white;
     box-shadow: darkgrey 10px 10px 30px 5px;
+	padding: 30px 15px;
 }
 </style>
 
@@ -83,11 +83,11 @@ local api = require "luci.model.cbi.passwall.api.api"
 	function add_node() {
 		var nodes_link = document.getElementById("nodes_link").value;
 		if (nodes_link.trim() != "") {
-			if (nodes_link.indexOf("ss://") == 0 || nodes_link.indexOf("ssr://") == 0 || nodes_link.indexOf("vmess://") == 0 || nodes_link.indexOf("trojan://") == 0 || nodes_link.indexOf("trojan-go://") == 0) {
+			if (nodes_link.indexOf("ss://") == 0 || nodes_link.indexOf("ssr://") == 0 || nodes_link.indexOf("vmess://") == 0 || nodes_link.indexOf("vless://") == 0 || nodes_link.indexOf("trojan://") == 0 || nodes_link.indexOf("trojan-go://") == 0) {
 				ajax_add_node(nodes_link);
 			}
 			else {
-				alert("<%:Please enter the correct link, ss:// ssr:// vmess:// trojan://%>");
+				alert("<%:Please enter the correct link, ss:// ssr:// vmess:// vless:// trojan://%>");
 			}
 		}
 		else {
@@ -114,16 +114,16 @@ local api = require "luci.model.cbi.passwall.api.api"
 
 <div id="add_link_div">
 	<div class="cbi-value">
-		<label class="cbi-value-title"><%:SS/SSR/Vmess/Trojan Link%></label>
+		<label class="cbi-value-title"><%:SS/SSR/Vmess/VLESS/Trojan Link%></label>
 		<div class="cbi-value-field">
 			<textarea id="nodes_link" rows="5" cols="50"></textarea>
 		</div>
 	</div>
 	<div class="cbi-value">
-		<div class="cbi-value-field">
+		<div class="cbi-value-field" style="display: unset">
 			<input class="cbi-button cbi-button-add" type="button" onclick="add_node()" value="<%:Add%>" />
-			<input class="cbi-button cbi-button-apply" type="button" onclick="link_load_temp()" value="<%:Load %><%:Cached%>" />
-			<input class="cbi-button cbi-button-refresh" type="button" onclick="link_clear_temp()" value="<%:Clear %><%:Cached%>" />
+			<!-- <input class="cbi-button cbi-button-apply" type="button" onclick="link_load_temp()" value="<%:Load Cached%>" /> -->
+			<!-- <input class="cbi-button cbi-button-refresh" type="button" onclick="link_clear_temp()" value="<%:Clear Cached%>" /> -->
 			<input class="cbi-button cbi-button-remove" type="button" onclick="close_add_link_div()" value="<%:Close%>" />
 		</div>
 	</div>
diff --git a/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po b/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po
index 241f3a6756..35007043b0 100644
--- a/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po
+++ b/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po
@@ -331,11 +331,17 @@ msgstr "添加节点"
 msgid "Add the node via the link"
 msgstr "通过链接添加节点"
 
-msgid "SS/SSR/Vmess/Trojan Link"
-msgstr "SS/SSR/Vmess/Trojan链接"
+msgid "SS/SSR/Vmess/VLESS/Trojan Link"
+msgstr "SS/SSR/Vmess/VLESS/Trojan链接"
 
-msgid "Please enter the correct link, ss:// ssr:// vmess:// trojan://"
-msgstr "请输入正确的链接，ss:// ssr:// vmess:// trojan://"
+msgid "Please enter the correct link, ss:// ssr:// vmess:// vless:// trojan://"
+msgstr "请输入正确的链接，ss:// ssr:// vmess:// vless:// trojan://"
+
+msgid "Load Cached"
+msgstr "加载缓存"
+
+msgid "Clear Cached"
+msgstr "清除缓存"
 
 msgid "Clear all nodes"
 msgstr "清空所有节点"
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
index 0bb519df5d..3a61cc8123 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -1113,7 +1113,8 @@ gen_pdnsd_config() {
 				purge_cache = off;
 				proxy_only = on;
 				caching = $_cache;
-				reject=::/0;
+				reject = ::/0;
+				reject_policy = negate;
 			}
 		EOF
 		echolog "  | - [$?]上游DNS：${2}:${3}"
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index b460916b24..51a1641bc1 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -379,6 +379,7 @@ local function processData(szType, content, add_mode)
 			idx_sp = content:find("#")
 			alias = content:sub(idx_sp + 1, -1)
 		end
+		result.remarks = UrlDecode(alias)
 		local info = content:sub(1, idx_sp - 1)
 		local hostInfo = split(base64Decode(info), "@")
 		local hostInfoLen = #hostInfo
@@ -397,7 +398,6 @@ local function processData(szType, content, add_mode)
 		end
 		local method = userinfo:sub(1, userinfo:find(":") - 1)
 		local password = userinfo:sub(userinfo:find(":") + 1, #userinfo)
-		result.remarks = UrlDecode(alias)
 		result.type = "SS"
 		result.address = host[1]
 		if host[2] and host[2]:find("/%?") then
@@ -434,12 +434,12 @@ local function processData(szType, content, add_mode)
 			alias = content:sub(idx_sp + 1, -1)
 			content = content:sub(0, idx_sp - 1)
 		end
+		result.remarks = UrlDecode(alias)
 		result.type = "Trojan-Plus"
 		if has_xray then
 			result.type = 'Xray'
 			result.protocol = 'trojan'
 		end
-		result.remarks = UrlDecode(alias)
 		if content:find("@") then
 			local Info = split(content, "@")
 			result.password = UrlDecode(Info[1])
@@ -502,8 +502,8 @@ local function processData(szType, content, add_mode)
 			alias = content:sub(idx_sp + 1, -1)
 			content = content:sub(0, idx_sp - 1)
 		end
-		result.type = "Trojan-Go"
 		result.remarks = UrlDecode(alias)
+		result.type = "Trojan-Go"
 		if content:find("@") then
 			local Info = split(content, "@")
 			result.password = UrlDecode(Info[1])
@@ -562,6 +562,90 @@ local function processData(szType, content, add_mode)
 		result.plugin_opts = content.plugin_options
 		result.group = content.airport
 		result.remarks = content.remarks
+	elseif szType == "vless" then
+		result.type = "Xray"
+		result.protocol = "vless"
+		local alias = ""
+		if content:find("#") then
+			local idx_sp = content:find("#")
+			alias = content:sub(idx_sp + 1, -1)
+			content = content:sub(0, idx_sp - 1)
+		end
+		result.remarks = UrlDecode(alias)
+		if content:find("@") then
+			local Info = split(content, "@")
+			result.uuid = UrlDecode(Info[1])
+			local port = "443"
+			Info[2] = (Info[2] or ""):gsub("/%?", "?")
+			local hostInfo = nil
+			if Info[2]:find(":") then
+				hostInfo = split(Info[2], ":")
+				result.address = hostInfo[1]
+				local idx_port = 2
+				if hostInfo[2]:find("?") then
+					hostInfo = split(hostInfo[2], "?")
+					idx_port = 1
+				end
+				if hostInfo[idx_port] ~= "" then port = hostInfo[idx_port] end
+			else
+				if Info[2]:find("?") then
+					hostInfo = split(Info[2], "?")
+				end
+				result.address = hostInfo and hostInfo[1] or Info[2]
+			end
+			
+			local query = split(Info[2], "?")
+			local params = {}
+			for _, v in pairs(split(query[2], '&')) do
+				local t = split(v, '=')
+				params[string.lower(t[1])] = UrlDecode(t[2])
+			end
+
+			if params.type == 'ws' then
+				result.ws_host = params.host
+				result.ws_path = params.path
+			end
+			if params.type == 'h2' then
+				result.h2_host = params.host
+				result.h2_path = params.path
+			end
+			if params.type == 'tcp' then
+				result.tcp_guise = params.headerType or "none"
+				result.tcp_guise_http_host = params.host
+				result.tcp_guise_http_path = params.path
+			end
+			if params.type == 'kcp' then
+				result.mkcp_guise = params.headerType or "none"
+				result.mkcp_mtu = 1350
+				result.mkcp_tti = 50
+				result.mkcp_uplinkCapacity = 5
+				result.mkcp_downlinkCapacity = 20
+				result.mkcp_readBufferSize = 2
+				result.mkcp_writeBufferSize = 2
+			end
+			if params.type == 'quic' then
+				result.quic_guise = params.headerType or "none"
+				result.quic_key = params.key
+				result.quic_security = params.quicSecurity or "none"
+			end
+			
+			result.encryption = params.encryption or "none"
+
+			result.tls = "0"
+			if params.security == "tls" or params.security == "xtls" then
+				result.tls = "1"
+				if params.security == "xtls" then
+					result.xtls = "1"
+					result.flow = params.flow or "xtls-rprx-direct"
+				end
+				if params.sni then
+					result.tls_serverName = params.sni
+				end
+			end
+
+			result.port = port
+			result.tls_allowInsecure = allowInsecure_default and "1" or "0"
+		end
 	else
 		log('暂时不支持' .. szType .. "类型的节点订阅，跳过此节点。")
 		return nil