🎄 Sync 2026-09-26 02:25:56

luci-app-passwall/luasrc/passwall/util_xray.lua

@@ -177,7 +177,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 				tlsSettings = (node.stream_security == "tls") and {
 					serverName = node.tls_serverName,
 					fingerprint = (node.type == "Xray" and node.utls == "1" and node.fingerprint and node.fingerprint ~= "") and node.fingerprint or nil,
-					pinnedPeerCertSha256 = node.tls_pinSHA256 or "",
+					pinnedPeerCertSha256 = (node.tls_pinSHA256 and node.tls_pinSHA256 ~= "") and api.sha256_sb_xray(node.tls_pinSHA256) or "",
 					verifyPeerCertByName = node.tls_CertByName or "",
 					echConfigList = (node.ech == "1") and node.ech_config or nil,
 					certificates = (node.tls_certificate == "1" and node.tls_certificate_pem ~= "") and {
@@ -1058,6 +1058,9 @@ function gen_config(var)
 		function gen_loopback(outbound_tag, loopback_dst)
 			if not outbound_tag or outbound_tag == "" then return nil end
 			local inbound_tag = loopback_dst and "lo-to-" .. loopback_dst or outbound_tag .. "-lo"
+			for _, o in ipairs(outbounds) do
+				if o.tag == outbound_tag and o.protocol == "loopback" and o.settings.inboundTag == inbound_tag then return o end
+			end
 			local loopback_outbound = {
 				protocol = "loopback",
 				tag = outbound_tag,
@@ -1465,8 +1468,8 @@ function gen_config(var)
 						inbound_tag = {}
 						if e["inbound"]:find("tproxy") then
 							if redir_port then
-								table.insert(inboundTag, "tcp_redir")
-								table.insert(inboundTag, "udp_redir")
+								table.insert(inbound_tag, "tcp_redir")
+								table.insert(inbound_tag, "udp_redir")
 							end
 						end
 						if e["inbound"]:find("socks") then