update 2026-08-21 00:27:45

luci-app-passwall2/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=26.8.17
+PKG_VERSION:=26.8.20
 PKG_RELEASE:=1
 PKG_PO_VERSION:=$(PKG_VERSION)
 

luci-app-passwall2/luasrc/passwall2/util_sing-box.lua

@@ -800,7 +800,7 @@ function gen_config_server(node)
 					u.username = user.username
 					u.password = user.password
 				end
-				if node.protocol == "shadowsocks" or node.protocol == "trojan" then
+				if node.protocol == "shadowsocks" or node.protocol == "trojan" or node.protocol == "hysteria2" or node.protocol == "anytls" then
 					u.name = user.username
 					u.password = user.password
 				end
@@ -823,10 +823,6 @@ function gen_config_server(node)
 					u.password = user.password
 					u.uuid = user.uuid
 				end
-				if node.protocol == "hysteria2" then
-					u.name = user.username
-					u.password = user.password
-				end
 				if node.protocol == "wireguard" then
 					u.public_key = user.wireguard_public_key
 					u.pre_shared_key = user.wireguard_pre_shared_key

luci-app-passwall2/root/etc/hotplug.d/ntp/30-passwall2-resync

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Devices without a hardware RTC boot with a wrong system clock: sysfixtime can
+# only restore the mtime of the newest file under /etc, so the clock is usually
+# hours behind after a cold boot. passwall2 is then started by
+# /etc/hotplug.d/iface/98-passwall2 on ifup, which typically happens before NTP
+# has corrected the time, and time-sensitive handshakes (VMess AEAD, TLS) fail.
+#
+# Nothing restarts passwall2 once the clock is corrected, so it stays broken
+# until the user restarts it manually. Restart once when ntpd reports that the
+# time is valid -- the same approach dnsmasq uses for DNSSEC in
+# /etc/hotplug.d/ntp/25-dnsmasqsec.
+
+[ "$ACTION" = "stratum" ] || exit 0
+
+. /usr/share/passwall2/utils.sh
+
+NTP_LOCK_FILE="${LOCK_PATH}/${CONFIG}_ntp.lock"
+[ -f "${NTP_LOCK_FILE}" ] && exit 0
+
+([ "$(get_cache_var "ENABLED_DEFAULT_ACL")" = "1" ] || [ "$(get_cache_var "ENABLED_ACLS")" = "1" ]) && [ -f ${LOCK_PATH}/${CONFIG}_ready.lock ] && {
+
+	echo $$ > ${NTP_LOCK_FILE}
+
+	/etc/init.d/${CONFIG} restart >/dev/null 2>&1 &
+	logger -p notice -t network -s "${CONFIG}: restart after NTP time became valid"
+}

luci-app-passwall2/root/usr/share/passwall2/subscribe.lua

@@ -2011,7 +2011,7 @@ local function curl(url, file, ua, mode, hwid)
 end
 
 function get_headers()
-	local cache_file = CACHE_PATH .. "/sub_curl_headers"
+	local cache_file = api.CACHE_PATH .. "/sub_curl_headers"
 	if fs.access(cache_file) then
 		return luci.sys.exec("cat " .. cache_file)
 	end