From febcbf6287c340ded1fcecab6090aed705a817e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 20:14:51 +0800 Subject: [PATCH] update 2024-02-27 20:14:51 --- luci-app-passwall/Makefile | 5 ++--- .../luasrc/view/passwall/global/status.htm | 12 ++++++------ .../root/usr/share/passwall/iptables.sh | 10 ++++------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 4ff6e386..7f8da639 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=4.75-1 +PKG_VERSION:=4.75-2 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ @@ -38,6 +38,7 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ define Package/$(PKG_NAME)/config menu "Configuration" + depends on PACKAGE_$(PKG_NAME) config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy bool "Iptables Transparent Proxy" @@ -51,7 +52,6 @@ config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy select PACKAGE_iptables-mod-socket select PACKAGE_iptables-mod-tproxy select PACKAGE_kmod-ipt-nat - depends on PACKAGE_$(PKG_NAME) default y if ! PACKAGE_firewall4 config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy @@ -62,7 +62,6 @@ config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy select PACKAGE_kmod-nft-socket select PACKAGE_kmod-nft-tproxy select PACKAGE_kmod-nft-nat - depends on PACKAGE_$(PKG_NAME) default y if PACKAGE_firewall4 config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy diff --git a/luci-app-passwall/luasrc/view/passwall/global/status.htm b/luci-app-passwall/luasrc/view/passwall/global/status.htm index a9413121..e6b804c1 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/status.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/status.htm @@ -117,7 +117,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- +
@@ -129,7 +129,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- +
@@ -165,8 +165,8 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- -
+ +

<%:GitHub Connection%>
<%:Touch Check%>

@@ -177,8 +177,8 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
- -
+ +

<%:Instagram Connection%>
<%:Touch Check%>

diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh index f11269f0..5da28405 100755 --- a/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -255,9 +255,8 @@ load_acl() { [ "${use_direct_list}" = "1" ] && $ipt_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST) -j RETURN [ "${use_block_list}" = "1" ] && $ipt_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_BLOCKLIST) -j DROP [ "$PROXY_IPV6" == "1" ] && { - [ "${use_direct_list}" = "1" ] && $ipt6_n -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST6) -j RETURN - [ "${use_direct_list}" = "1" ] && $ipt6_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST6) -j RETURN - [ "${use_block_list}" = "1" ] && $ipt6_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_BLOCKLIST6) -j DROP + [ "${use_direct_list}" = "1" ] && $ip6t_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_WHITELIST6) -j RETURN 2>/dev/null + [ "${use_block_list}" = "1" ] && $ip6t_m -A PSW $(comment "$remarks") ${_ipt_source} $(dst $IPSET_BLOCKLIST6) -j DROP 2>/dev/null } [ -n "$tcp_port" ] && { @@ -408,9 +407,8 @@ load_acl() { [ "${USE_DIRECT_LIST}" = "1" ] && $ipt_m -A PSW $(comment "默认") $(dst $IPSET_WHITELIST) -j RETURN [ "${USE_BLOCK_LIST}" = "1" ] && $ipt_m -A PSW $(comment "默认") $(dst $IPSET_BLOCKLIST) -j DROP [ "$PROXY_IPV6" == "1" ] && { - [ "${USE_DIRECT_LIST}" = "1" ] && $ipt6_n -A PSW $(comment "默认") $(dst $IPSET_WHITELIST6) -j RETURN - [ "${USE_DIRECT_LIST}" = "1" ] && $ipt6_m -A PSW $(comment "默认") $(dst $IPSET_WHITELIST6) -j RETURN - [ "${USE_BLOCK_LIST}" = "1" ] && $ipt6_m -A PSW $(comment "默认") $(dst $IPSET_BLOCKLIST6) -j DROP + [ "${USE_DIRECT_LIST}" = "1" ] && $ip6t_m -A PSW $(comment "默认") $(dst $IPSET_WHITELIST6) -j RETURN 2>/dev/null + [ "${USE_BLOCK_LIST}" = "1" ] && $ip6t_m -A PSW $(comment "默认") $(dst $IPSET_BLOCKLIST6) -j DROP 2>/dev/null } # 加载TCP默认代理模式 [ "$TCP_PROXY_DROP_PORTS" != "disable" ] && {