From 345da5313ba6e87c615a0447a275cb2ef65936ff Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 10 May 2020 11:26:20 +0800 Subject: [PATCH] openclash: update to 0.38.1 --- package/ctcgfw/luci-app-openclash/Makefile | 20 +- .../files/etc/init.d/openclash | 235 ++++++++---------- ...conf => openclash_custom_fake_filter.list} | 57 ++--- .../files/etc/openclash/openclash_version | 4 +- .../usr/lib/lua/luci/controller/openclash.lua | 8 +- .../lua/luci/model/cbi/openclash/client.lua | 12 +- .../lua/luci/model/cbi/openclash/config.lua | 2 +- .../model/cbi/openclash/groups-config.lua | 1 + .../lib/lua/luci/model/cbi/openclash/log.lua | 11 +- .../cbi/openclash/proxy-provider-config.lua | 2 +- .../model/cbi/openclash/servers-config.lua | 2 +- .../lua/luci/model/cbi/openclash/settings.lua | 18 +- .../lib/lua/luci/view/openclash/update.htm | 6 +- .../cfg_servers_address_fake_block.sh | 13 - .../cfg_servers_address_fake_filter.sh | 18 ++ .../files/usr/share/openclash/openclash.sh | 36 ++- .../usr/share/openclash/openclash_core.sh | 13 +- .../usr/share/openclash/openclash_debug.sh | 6 +- .../share/openclash/openclash_fake_block.sh | 40 --- .../share/openclash/openclash_fake_filter.sh | 46 ++++ .../usr/share/openclash/openclash_watchdog.sh | 28 ++- .../files/usr/share/openclash/yml_change.sh | 29 ++- .../usr/share/openclash/yml_groups_get.sh | 3 +- .../usr/share/openclash/yml_groups_set.sh | 6 +- .../usr/share/openclash/yml_proxys_get.sh | 16 +- .../share/rpcd/acl.d/luci-app-openclash.json | 11 + .../i18n/zh-cn/openclash.zh-cn.po | 2 +- 27 files changed, 341 insertions(+), 304 deletions(-) rename package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/{openclash_custom_fake_black.conf => openclash_custom_fake_filter.list} (62%) delete mode 100755 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_block.sh create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh delete mode 100755 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index 92d90d724d..92b0cdeb74 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.37.6 +PKG_VERSION:=0.38.1 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong @@ -35,6 +35,12 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR)/files/etc/openclash/proxy_provider >/dev/null 2>&1 mkdir -p $(PKG_BUILD_DIR)/files/etc/openclash/backup >/dev/null 2>&1 mkdir -p $(PKG_BUILD_DIR)/files/etc/openclash/core >/dev/null 2>&1 + mkdir -p $(PKG_BUILD_DIR)/files/usr/share/openclash/backup >/dev/null 2>&1 + cp "$(PKG_BUILD_DIR)/files/etc/config/openclash" "$(PKG_BUILD_DIR)/files/usr/share/openclash/backup/openclash" >/dev/null 2>&1 + cp "$(PKG_BUILD_DIR)/files/etc/openclash/custom/openclash_custom_rules.list" "$(PKG_BUILD_DIR)/files/usr/share/openclash/backup/openclash_custom_rules.list" >/dev/null 2>&1 + cp "$(PKG_BUILD_DIR)/files/etc/openclash/custom/openclash_custom_rules_2.list" "$(PKG_BUILD_DIR)/files/usr/share/openclash/backup/openclash_custom_rules_2.list" >/dev/null 2>&1 + cp "$(PKG_BUILD_DIR)/files/etc/openclash/custom/openclash_custom_hosts.list" "$(PKG_BUILD_DIR)/files/usr/share/openclash/backup/openclash_custom_hosts.list" >/dev/null 2>&1 + cp "$(PKG_BUILD_DIR)/files/etc/openclash/custom/openclash_custom_fake_filter.list" "$(PKG_BUILD_DIR)/files/usr/share/openclash/backup/openclash_custom_fake_filter.list" >/dev/null 2>&1 endef define Build/Configure @@ -50,14 +56,14 @@ if [ -f "/etc/config/openclash" ]; then cp "/etc/config/openclash_custom_rules.list" "/tmp/openclash_custom_rules.list.bak" >/dev/null 2>&1 cp "/etc/config/openclash_custom_rules_2.list" "/tmp/openclash_custom_rules_2.list.bak" >/dev/null 2>&1 cp "/etc/config/openclash_custom_hosts.list" "/tmp/openclash_custom_hosts.list.bak" >/dev/null 2>&1 - cp "/etc/config/openclash_custom_fake_black.conf" "/tmp/openclash_custom_fake_black.conf.bak" >/dev/null 2>&1 + cp "/etc/config/openclash_custom_fake_filter.list" "/tmp/openclash_custom_fake_filter.list.bak" >/dev/null 2>&1 cp "/etc/openclash/history" "/tmp/openclash_history.bak" >/dev/null 2>&1 fi if [ -f "/etc/openclash/custom/openclash_custom_rules.list" ]; then cp "/etc/openclash/custom/openclash_custom_rules.list" "/tmp/openclash_custom_rules.list.bak" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_rules_2.list" "/tmp/openclash_custom_rules_2.list.bak" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_hosts.list" "/tmp/openclash_custom_hosts.list.bak" >/dev/null 2>&1 - cp "/etc/openclash/custom/openclash_custom_fake_black.conf" "/tmp/openclash_custom_fake_black.conf.bak" >/dev/null 2>&1 + cp "/etc/openclash/custom/openclash_custom_fake_filter.list" "/tmp/openclash_custom_fake_filter.list.bak" >/dev/null 2>&1 fi endef @@ -83,14 +89,14 @@ cp "/etc/config/openclash" "/usr/share/openclash/backup/openclash" >/dev/null 2> cp "/etc/openclash/custom/openclash_custom_rules.list" "/usr/share/openclash/backup/openclash_custom_rules.list" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_rules_2.list" "/usr/share/openclash/backup/openclash_custom_rules_2.list" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_hosts.list" "/usr/share/openclash/backup/openclash_custom_hosts.list" >/dev/null 2>&1 -cp "/etc/openclash/custom/openclash_custom_fake_black.conf" "/usr/share/openclash/backup/openclash_custom_fake_black.conf" >/dev/null 2>&1 +cp "/etc/openclash/custom/openclash_custom_fake_filter.list" "/usr/share/openclash/backup/openclash_custom_fake_filter.list" >/dev/null 2>&1 if [ -f "/tmp/openclash.bak" ]; then mv "/tmp/openclash.bak" "/etc/config/openclash" >/dev/null 2>&1 mv "/tmp/openclash_custom_rules.list.bak" "/etc/openclash/custom/openclash_custom_rules.list" >/dev/null 2>&1 mv "/tmp/openclash_custom_rules_2.list.bak" "/etc/openclash/custom/openclash_custom_rules_2.list" >/dev/null 2>&1 mv "/tmp/openclash_custom_hosts.list.bak" "/etc/openclash/custom/openclash_custom_hosts.list" >/dev/null 2>&1 - mv "/tmp/openclash_custom_fake_black.conf.bak" "/etc/openclash/custom/openclash_custom_fake_black.conf" >/dev/null 2>&1 + mv "/tmp/openclash_custom_fake_filter.list.bak" "/etc/openclash/custom/openclash_custom_fake_filter.list" >/dev/null 2>&1 mv "/tmp/openclash_history.bak" "/etc/openclash/history" >/dev/null 2>&1 fi if [ -f "/tmp/config.yaml" ]; then @@ -145,11 +151,11 @@ define Package/$(PKG_NAME)/prerm cp "/etc/config/openclash" "/tmp/openclash.bak" >/dev/null 2>&1 cp "/etc/config/openclash_custom_rules.list" "/tmp/openclash_custom_rules.list.bak" >/dev/null 2>&1 cp "/etc/config/openclash_custom_hosts.list" "/tmp/openclash_custom_hosts.list.bak" >/dev/null 2>&1 - cp "/etc/config/openclash_custom_fake_black.conf" "/tmp/openclash_custom_fake_black.conf.bak" >/dev/null 2>&1 + cp "/etc/config/openclash_custom_fake_filter.list" "/tmp/openclash_custom_fake_filter.list.bak" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_rules.list" "/tmp/openclash_custom_rules.list.bak" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_rules_2.list" "/tmp/openclash_custom_rules_2.list.bak" >/dev/null 2>&1 cp "/etc/openclash/custom/openclash_custom_hosts.list" "/tmp/openclash_custom_hosts.list.bak" >/dev/null 2>&1 - cp "/etc/openclash/custom/openclash_custom_fake_black.conf" "/tmp/openclash_custom_fake_black.conf.bak" >/dev/null 2>&1 + cp "/etc/openclash/custom/openclash_custom_fake_filter.list" "/tmp/openclash_custom_fake_filter.list.bak" >/dev/null 2>&1 endef define Package/$(PKG_NAME)/postrm diff --git a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash index 3c09572f72..99509c1761 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -29,9 +29,6 @@ add_cron() [ -z "$(grep "openclash.sh" "$CRON_FILE" 2>/dev/null)" ] && { [ "$(uci get openclash.config.auto_update 2>/dev/null)" -eq 1 ] && [ "$(uci get openclash.config.config_auto_update_mode 2>/dev/null)" -ne 1 ] && echo "0 $(uci get openclash.config.auto_update_time 2>/dev/null) * * $(uci get openclash.config.config_update_week_time 2>/dev/null) /usr/share/openclash/openclash.sh" >> $CRON_FILE } - [ -z "$(grep "openclash.sh" "$CRON_FILE" 2>/dev/null)" ] && { - [ "$(uci get openclash.config.auto_update 2>/dev/null)" -eq 1 ] && [ "$(uci get openclash.config.config_auto_update_mode 2>/dev/null)" -eq 1 ] && echo "*/$(uci get openclash.config.config_update_interval 2>/dev/null) * * * * /usr/share/openclash/openclash.sh" >> $CRON_FILE - } [ -z "$(grep "openclash_rule.sh" "$CRON_FILE" 2>/dev/null)" ] && { [ "$(uci get openclash.config.other_rule_auto_update 2>/dev/null)" -eq 1 ] && echo "0 $(uci get openclash.config.other_rule_update_day_time 2>/dev/null) * * $(uci get openclash.config.other_rule_update_week_time 2>/dev/null) /usr/share/openclash/openclash_rule.sh" >> $CRON_FILE } @@ -73,12 +70,11 @@ change_dns() { revert_dns() { uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 [ "$1" = "1" ] && { - [ -s "/tmp/resolv.conf.d/resolv.conf.auto" ] && { - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto >/dev/null 2>&1 - } - [ -s "/tmp/resolv.conf.auto" ] && { - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 - } + if [ -s "/tmp/resolv.conf.d/resolv.conf.auto" ]; then + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto >/dev/null 2>&1 + elif [ -s "/tmp/resolv.conf.auto" ]; then + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 + fi uci set dhcp.@dnsmasq[0].noresolv=0 >/dev/null 2>&1 } [ "$2" = "1" ] && { @@ -88,22 +84,6 @@ revert_dns() { rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 } -fake_block() { - if [ "$1" = "fake-ip" ]; then - if [ ! -f /etc/openclash/dnsmasq_fake_block.conf ]; then - /usr/share/openclash/openclash_fake_block.sh - elif [ "$(awk -F '/' '{print $3}' /etc/openclash/dnsmasq_fake_block.conf |head -1)" != "114.114.114.114" ] && [ -z "$2" ]; then - /usr/share/openclash/openclash_fake_block.sh - elif [ "$(awk -F '/' '{print $3}' /etc/openclash/dnsmasq_fake_block.conf |head -1)" != "$2" ] && [ ! -z "$2" ]; then - /usr/share/openclash/openclash_fake_block.sh - elif [ ! -z "$(grep "config servers" /etc/config/openclash)" ] && [ -z "$(grep -F '#Server Nodes' /etc/openclash/dnsmasq_fake_block.conf)" ]; then - /usr/share/openclash/openclash_fake_block.sh - fi - mkdir -p /tmp/dnsmasq.d - ln -s /etc/openclash/dnsmasq_fake_block.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf - fi -} - yml_check() { #格式替换 @@ -762,87 +742,10 @@ if [ "$operation_mode" = "redir-host" ] && [ "$en_mode" = "redir-host" ]; then config_list_foreach "config" "lan_ac_white_ips" lan_ac "lan_ac_white_ips" fi fi - -if [ -z "$en_mode_tun" ]; then - #tcp - iptables -t nat -N openclash - iptables -t nat -A openclash -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 - iptables -t nat -A openclash -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 - iptables -t nat -A openclash -d 0.0.0.0/8 -j RETURN - iptables -t nat -A openclash -d 10.0.0.0/8 -j RETURN - iptables -t nat -A openclash -d 127.0.0.0/8 -j RETURN - iptables -t nat -A openclash -d 169.254.0.0/16 -j RETURN - iptables -t nat -A openclash -d 172.16.0.0/12 -j RETURN - iptables -t nat -A openclash -d 192.168.0.0/16 -j RETURN - iptables -t nat -A openclash -d 224.0.0.0/4 -j RETURN - iptables -t nat -A openclash -d 240.0.0.0/4 -j RETURN - if [ ! -z "$wan_ip4" ]; then - for wan_ip4s in $wan_ip4; do - iptables -t nat -A openclash -d "$wan_ip4s" -j RETURN 2>/dev/null - done - fi - iptables -t nat -A openclash -p tcp -j REDIRECT --to-ports "$proxy_port" - #iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 -j REDIRECT --to-ports "$proxy_port" - #iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 -j REDIRECT --to-ports "$proxy_port" - iptables -t nat -A PREROUTING -p tcp -j openclash - - #udp - if [ "$enable_udp_proxy" -eq 1 ]; then - ip rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" - ip route add local 0.0.0.0/0 dev lo table "$PROXY_ROUTE_TABLE" - iptables -t mangle -N openclash - iptables -t mangle -A openclash -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 - iptables -t mangle -A openclash -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 - iptables -t mangle -A openclash -d 0.0.0.0/8 -j RETURN - iptables -t mangle -A openclash -d 10.0.0.0/8 -j RETURN - iptables -t mangle -A openclash -d 127.0.0.0/8 -j RETURN - iptables -t mangle -A openclash -d 169.254.0.0/16 -j RETURN - iptables -t mangle -A openclash -d 172.16.0.0/12 -j RETURN - iptables -t mangle -A openclash -d 192.168.0.0/16 -j RETURN - iptables -t mangle -A openclash -d 224.0.0.0/4 -j RETURN - iptables -t mangle -A openclash -d 240.0.0.0/4 -j RETURN - if [ ! -z "$wan_ip4" ]; then - for wan_ip4s in $wan_ip4; do - iptables -t mangle -A openclash -d "$wan_ip4s" -j RETURN 2>/dev/null - done - fi - - iptables -t mangle -A openclash -p udp -j TPROXY --on-port "$proxy_port" --on-ip 0.0.0.0 --tproxy-mark "$PROXY_FWMARK" - iptables -t mangle -A PREROUTING -p udp -j openclash - fi - - if [ "$en_mode" = "fake-ip" ]; then - iptables -t nat -A OUTPUT -p tcp -d 198.18.0.0/16 -j REDIRECT --to-ports "$proxy_port" - fi - - if [ "$ipv6_enable" -eq 1 ]; then - #tcp - ip6tables -t nat -N openclash - if [ ! -z "$lan_ip6" ]; then - for lan_ip6s in $lan_ip6; do - ip6tables -t nat -A openclash -d "$lan_ip6s" -j RETURN 2>/dev/null - done - fi - ip6tables -t nat -A openclash -p tcp -j REDIRECT --to-ports "$proxy_port" - ip6tables -t nat -A PREROUTING -p tcp -j openclash - - #udp - if [ "$enable_udp_proxy" -eq 1 ]; then - ip6tables -t mangle -N openclash - if [ ! -z "$lan_ip6" ]; then - for lan_ip6s in $lan_ip6; do - if [ "$enable_udp_proxy" -eq 1 ]; then - ip6tables -t mangle -A openclash -d "$lan_ip6s" -j RETURN 2>/dev/null - fi - done - fi - ip6tables -t mangle -A openclash -p udp -j TPROXY --on-port "$proxy_port" --on-ip 0.0.0.0 --tproxy-mark "$PROXY_FWMARK" - ip6tables -t mangle -A PREROUTING -p udp -j openclash - fi - fi -else - #TUN模式 + +#local ipset create localnetwork hash:net + ipset add localnetwork 0.0.0.0/8 ipset add localnetwork 127.0.0.0/8 ipset add localnetwork 10.0.0.0/8 ipset add localnetwork 169.254.0.0/16 @@ -856,6 +759,66 @@ else ipset add localnetwork "$wan_ip4s" 2>/dev/null done fi + +if [ -z "$en_mode_tun" ]; then + #tcp + iptables -t nat -N openclash + iptables -t nat -F openclash + iptables -t nat -A openclash -m set --match-set localnetwork dst -j RETURN + iptables -t nat -A openclash -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 + iptables -t nat -A openclash -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 + iptables -t nat -A openclash -p tcp -j REDIRECT --to-ports "$proxy_port" + iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 -j REDIRECT --to-ports "$proxy_port" + iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 -j REDIRECT --to-ports "$proxy_port" + iptables -t nat -A PREROUTING -p tcp -j openclash + + #udp + if [ "$enable_udp_proxy" -eq 1 ]; then + ip rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" + ip route add local 0.0.0.0/0 dev lo table "$PROXY_ROUTE_TABLE" + iptables -t mangle -N openclash + iptables -t mangle -A openclash -m set --match-set localnetwork dst -j RETURN + iptables -t mangle -A openclash -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 + iptables -t mangle -A openclash -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 + iptables -t mangle -A openclash -p udp -j TPROXY --on-port "$proxy_port" --on-ip 0.0.0.0 --tproxy-mark "$PROXY_FWMARK" + iptables -t mangle -A PREROUTING -p udp -j openclash + fi + + if [ "$en_mode" = "fake-ip" ]; then + iptables -t nat -N openclash_output + iptables -t nat -F openclash_output + iptables -t nat -A openclash_output -m set --match-set localnetwork dst -j RETURN + iptables -t nat -A openclash_output -p tcp -d 198.18.0.0/16 -j REDIRECT --to-ports "$proxy_port" + iptables -t nat -A OUTPUT -p tcp -j openclash_output + fi + + if [ "$ipv6_enable" -eq 1 ]; then + #tcp + ip6tables -t nat -N openclash + if [ ! -z "$lan_ip6" ]; then + for lan_ip6s in $lan_ip6; do + ip6tables -t nat -A openclash -d "$lan_ip6s" -j RETURN 2>/dev/null + done + fi + ip6tables -t nat -A openclash -p tcp -j REDIRECT --to-ports "$proxy_port" + ip6tables -t nat -A PREROUTING -p tcp -j openclash + + #udp + #if [ "$enable_udp_proxy" -eq 1 ]; then + # ip6tables -t mangle -N openclash + # if [ ! -z "$lan_ip6" ]; then + # for lan_ip6s in $lan_ip6; do + # if [ "$enable_udp_proxy" -eq 1 ]; then + # ip6tables -t mangle -A openclash -d "$lan_ip6s" -j RETURN 2>/dev/null + # fi + # done + # fi + # ip6tables -t mangle -A openclash -p udp -j TPROXY --on-port "$proxy_port" --tproxy-mark "$PROXY_FWMARK" + # ip6tables -t mangle -A PREROUTING -p udp -j openclash + #fi + fi +else + #TUN模式 #启动TUN if [ "$en_mode_tun" = "2" ]; then ip tuntap add user root mode tun clash0 @@ -879,9 +842,9 @@ else iptables -t mangle -A openclash -d 198.18.0.0/16 -j MARK --set-mark "$PROXY_FWMARK" fi iptables -t mangle -I OUTPUT -j openclash + iptables -t mangle -I PREROUTING -m set ! --match-set localnetwork dst -j MARK --set-mark "$PROXY_FWMARK" iptables -t mangle -I PREROUTING -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 iptables -t mangle -I PREROUTING -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 - iptables -t mangle -I PREROUTING -m set ! --match-set localnetwork dst -j MARK --set-mark "$PROXY_FWMARK" iptables -t nat -I PREROUTING -p tcp --dport 53 -j ACCEPT #ipv6 # if [ "$ipv6_enable" -eq 1 ]; then @@ -893,61 +856,67 @@ fi revert_firewall() { rm -rf /var/etc/openclash.include 2>/dev/null - + #ipv4 ip rule del fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 ip route del local 0.0.0.0/0 dev lo table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 - + iptables -t nat -D PREROUTING -p tcp --dport 53 -j ACCEPT >/dev/null 2>&1 iptables -t mangle -F openclash >/dev/null 2>&1 - iptables -t mangle -D PREROUTING -p udp -j openclash >/dev/null 2>&1 iptables -t mangle -X openclash >/dev/null 2>&1 - + iptables -t nat -F openclash >/dev/null 2>&1 - iptables -t nat -D PREROUTING -p tcp -j openclash >/dev/null 2>&1 iptables -t nat -X openclash >/dev/null 2>&1 - - out_lines=$(iptables -nvL OUTPUT -t mangle |sed 1,2d |sed -n '/198.18.0.0\/16/=' 2>/dev/null |sort -rn) - for out_line in $out_lines; do - iptables -t mangle -D OUTPUT "$out_line" >/dev/null 2>&1 - done - - out_lines=$(iptables -nvL OUTPUT -t nat |sed 1,2d |sed -n '/198.18.0.0\/16/=' 2>/dev/null |sort -rn) + + iptables -t nat -F openclash_output >/dev/null 2>&1 + iptables -t nat -X openclash_output >/dev/null 2>&1 + + out_lines=$(iptables -nvL OUTPUT -t nat |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) for out_line in $out_lines; do iptables -t nat -D OUTPUT "$out_line" >/dev/null 2>&1 done - - #pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/8\.8\./=' 2>/dev/null |sort -rn) - #for pre_line in $pre_lines; do - # iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 - #done - + + pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/8\.8\./=' 2>/dev/null |sort -rn) + for pre_line in $pre_lines; do + iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 + done + + pre_lines=$(iptables -nvL PREROUTING -t mangle |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) + for pre_line in $pre_lines; do + iptables -t mangle -D PREROUTING "$pre_line" >/dev/null 2>&1 + done + + pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) + for pre_line in $pre_lines; do + iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 + done + #ipv6 - ip6tables -t mangle -F openclash >/dev/null 2>&1 - ip6tables -t mangle -D PREROUTING -p udp -j openclash >/dev/null 2>&1 - ip6tables -t mangle -X openclash >/dev/null 2>&1 - + #ip6tables -t mangle -F openclash >/dev/null 2>&1 + #ip6tables -t mangle -D PREROUTING -p udp -j openclash >/dev/null 2>&1 + #ip6tables -t mangle -X openclash >/dev/null 2>&1 + ip6tables -t nat -F openclash >/dev/null 2>&1 ip6tables -t nat -D PREROUTING -p tcp -j openclash >/dev/null 2>&1 ip6tables -t nat -X openclash >/dev/null 2>&1 - + #TUN ip route del default dev clash0 table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 ip route del default dev utun table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 ip rule del fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 ip link set dev clash0 down >/dev/null 2>&1 ip tuntap del clash0 mode tun >/dev/null 2>&1 - + iptables -t mangle -D OUTPUT -j openclash >/dev/null 2>&1 iptables -t mangle -D PREROUTING -m set --match-set lan_ac_black_ips src -j RETURN >/dev/null 2>&1 iptables -t mangle -D PREROUTING -m set ! --match-set lan_ac_white_ips src -j RETURN >/dev/null 2>&1 iptables -t mangle -D PREROUTING -m set ! --match-set localnetwork dst -j MARK --set-mark "$PROXY_FWMARK" >/dev/null 2>&1 - ip6tables -t mangle -D PREROUTING -j MARK --set-mark "$PROXY_FWMARK" >/dev/null 2>&1 iptables -t mangle -F openclash >/dev/null 2>&1 iptables -t mangle -X openclash >/dev/null 2>&1 - + #ip6tables -t mangle -D PREROUTING -j MARK --set-mark "$PROXY_FWMARK" >/dev/null 2>&1 + ipset destroy localnetwork >/dev/null 2>&1 ipset destroy lan_ac_white_ips >/dev/null 2>&1 ipset destroy lan_ac_black_ips >/dev/null 2>&1 @@ -968,7 +937,6 @@ get_config() lan_ip=$(uci get network.lan.ipaddr 2>/dev/null |awk -F '/' '{print $1}' 2>/dev/null) wan_ip4=$(ifconfig | grep 'inet addr' | awk '{print $2}' | cut -d: -f2 2>/dev/null) lan_ip6=$(ifconfig | grep 'inet6 addr' | awk '{print $3}' 2>/dev/null) - direct_dns=$(uci get openclash.config.direct_dns 2>/dev/null) disable_masq_cache=$(uci get openclash.config.disable_masq_cache 2>/dev/null) log_level=$(uci get openclash.config.log_level 2>/dev/null) proxy_mode=$(uci get openclash.config.proxy_mode 2>/dev/null) @@ -1056,7 +1024,6 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then echo "第九步: 重启 Dnsmasq 程序..." >$START_LOG change_dns "$enable_redirect_dns" "$disable_masq_cache" - fake_block "$en_mode" "$direct_dns" /etc/init.d/dnsmasq restart >/dev/null 2>&1 if pidof clash >/dev/null; then echo "第十步: 还原策略组节点状态..." >$START_LOG diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_black.conf b/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list similarity index 62% rename from package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_black.conf rename to package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list index e013577039..3e3eb30ef6 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_black.conf +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list @@ -1,22 +1,11 @@ +*.lan #放行NTP服务 time.windows.com time.nist.gov time.apple.com time.asia.apple.com -cn.ntp.org.cn -edu.ntp.org.cn -hk.ntp.org.cn -tw.ntp.org.cn -us.ntp.org.cn -sgp.ntp.org.cn -kr.ntp.org.cn -jp.ntp.org.cn -de.ntp.org.cn -ina.ntp.org.cn -0.openwrt.pool.ntp.org -1.openwrt.pool.ntp.org -2.openwrt.pool.ntp.org -3.openwrt.pool.ntp.org +*.ntp.org.cn +*.openwrt.pool.ntp.org time1.cloud.tencent.com time.ustc.edu.cn pool.ntp.org @@ -36,12 +25,7 @@ time4.aliyun.com time5.aliyun.com time6.aliyun.com time7.aliyun.com -s1c.time.edu.cn -s2m.time.edu.cn -s1b.time.edu.cn -s1e.time.edu.cn -s2a.time.edu.cn -s2b.time.edu.cn +*.time.edu.cn time1.apple.com time2.apple.com time3.apple.com @@ -55,28 +39,23 @@ time3.google.com time4.google.com #放行网易云音乐 music.163.com -interface.music.163.com -interface3.music.163.com -apm.music.163.com -apm3.music.163.com -clientlog.music.163.com -clientlog3.music.163.com -music.126.net -vod.126.net +*.music.163.com +*.126.net #百度音乐 -sug.qianqian.com +musicapi.taihe.com music.taihe.com #酷狗音乐 songsearch.kugou.com trackercdn.kugou.com #酷我音乐 -kuwo.cn +*.kuwo.cn #JOOX音乐 api-jooxtt.sanook.com api.joox.com joox.com #QQ音乐 y.qq.com +*.y.qq.com streamoc.music.tc.qq.com mobileoc.music.tc.qq.com isure.stream.qqmusic.qq.com @@ -84,19 +63,19 @@ dl.stream.qqmusic.qq.com aqqmusic.tc.qq.com amobile.music.tc.qq.com #虾米音乐 -xiami.com +*.xiami.com #咪咕音乐 +*.music.migu.cn music.migu.cn -migu.cn #win10本地连接检测 -msftconnecttest.com -msftncsi.com +*.msftconnecttest.com +*.msftncsi.com #QQ快捷登录 -ptlogin2.qq.com +localhost.ptlogin2.qq.com #Nintendo Switch -srv.nintendo.net +*.*.*.srv.nintendo.net #Sony PlayStation -stun.playstation.net +*.*.stun.playstation.net #Microsoft Xbox -microsoft.com -xboxlive.com \ No newline at end of file +xbox.*.*.microsoft.com +*.*.xboxlive.com \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version index 5463807d17..f87d62094c 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.37.6-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkRBM0M0OUEzOEFGMDExRUE4NTQ5ODMzNEM2QkRFQjZDIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkRBM0M0OUE0OEFGMDExRUE4NTQ5ODMzNEM2QkRFQjZDIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6REEzQzQ5QTE4QUYwMTFFQTg1NDk4MzM0QzZCREVCNkMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6REEzQzQ5QTI4QUYwMTFFQTg1NDk4MzM0QzZCREVCNkMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5tUHQcAAADAFBMVEU5lcqFhYVjlbHR4uxXpdIHZ526urqizOUig7oGVYIHVoQHX5GTvdVFmsoJeLiCgoKStcmGv9+enp4GcKza2tqlpaVTiqp4eHgHW4zf39/n5+c/Pz/GxsahoaHOzs5paWkkapJlnr3R5vIJca0EYJUEXI6RkZF3t9txcXG/v79FRUWDs86srKy1tbUGbamy1urKyspiYmJkq9JFgKIJdbQ0dJoJZJkEU4BlrNVLS0tDQ0Pg4OCTxeGLi4sEWIh2dnYHdLIXgL3AwMCcnJyiwNEKa6HDw8NBQUGx0OIrjsZGirEFZZtCQkImcZwJYZRsbGy2trZKn8+jxdiXl5dFkb0micIFcrDB1ODS0tLQ0NBHnM1lZWWNjY02kcZzobuxzdwJWIUFaaKDrcU0fKUYYo3w9fdzsdQWaJevr69hYWGiyN5vb28ZdapJns4IbKVyn7iUlJQlhLrB2ecFYph0dHSjzuayytgdh8OJweIwk8tDfqAahMFFiK01h7VnrtYRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL0FdrdWVlYHeLkKe7wEdrYDdLUOf8ADdLQOgMAEdbYDdbUSg8NXV1cSg8QShMQThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJeroJe7sJers6OjqqqqrU1NTV1dWrq6tISEg9PT2pqak7OzuAgIB+fn48PDzw9/tJSUmBgYHq6urC3u7z8/NMTEz19fWEvN3h7/f09PSEvd1/f3+DvNyhv9DB3e2ErMLv9PeCqcCFvt7B1eHg6vDg6u/B3u6JiYnA1N/B3e7o6OgIaJ8UXong7vaDq8LD3+9Hm8zW1taDqsELerkFZ5+Fvd4Fa6aEtNBInc1Vos8LdK/C3+8Lb6h0tNiAudmSuc8IWYjR4Ojg7/cKeLeDr8jv9vpInc4IcKwGdbQZg8AvkstkmLXP5PEFdLMIV4QnhrxTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////+bop14AAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADDFJREFUeNrsWA1UFNcVHoh/QAiwgKusIkEgugIK/mwWxKBVUYliYrQ2VqOJJhqD2iCaxNa2IriQtklLf0yaGORvwcAiAoIRweC/xhhjNBpNNH82tTbbWhsQw0fvezM7O7OA4TQ5nrN7/M5x3r333fvdN997OzMotLfXLB103RXwZyfA889Z2tuF9vjV110Df3IKPB/aLtQMaXER/NE58LxFWOoqkrf8wUnwnDDkW1fBL50Efxe+vaP57YYLaf5vZ4Hwjcvgjua3H/9yFgj/dRnc0fz24yVngfAfl8FvnQWdau4TGRn50+U/vCrzfHzmyc5yH5/u1Gh9tN1kf6UrvCTc53ef0CG8toefn99Doj31ITsc86au9/O7b6065ge/V/5vCNccETOzBhzxs2KufU/4RPqo/BrMku0JGNEdivfwXjebvdoF1r7Lb+fdtaroVDGK2h7M84Md6mpBzEtVR0nzrtq9muqX+uot0UFzbSUQUKzRBFMjn++reSQila5pKOLlrQUifljN/9oFPsJd90679y58pIqmApcaGiYuITnJi22ScAlQpa0HlkxsaLiUquZ8G2931e6WcxzCTTVi4lG1XMdg1FT53PyeIM1V/hAgRTJnoSqzOxR6nb6bzV7rHOuxb/HChQsXL8F6ZTh1YshCFt6HdPImLZTQgH2qLKCBx8+pSUnX17rCreY4hA4qVcXo4iqMRr1OZxrUXW21Pqrt8fFJ6VxzcxAGSmYRZrZJydrOGWMcNE9RN4mxZdjweucYjgVe58+d92rAcGX43MKFXpMmjbnYgI/IOz9DxFNLcEWZVUuSXxwzaZLXOTUp6fr661NTBUUo1ebxOTmoyhHhqHkNNLoN3DIZmVGE7dzbjiLpOiseKL5ZjOKYYnoMsdli9gKoKeZ5QAx3i2K4I0Jm36BBpSQgsNxEwk1g85UJN1XkNwdW8jCjLIZInMBDE2KkzBReOFO59CwJPVArWbXokZVlwc/fJ/v9kbBkKXBuzGdseP8TPK2IpmNf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 \ No newline at end of file +v0.38.1-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkQyOEI1NTQxOTBDQTExRUE4NTMxQUU4REFCQUJGNTM0IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkQyOEI1NTQyOTBDQTExRUE4NTMxQUU4REFCQUJGNTM0Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RDI4QjU1M0Y5MENBMTFFQTg1MzFBRThEQUJBQkY1MzQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RDI4QjU1NDA5MENBMTFFQTg1MzFBRThEQUJBQkY1MzQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz43qi8EAAADAFBMVEU9PT1jlbGEvN2EhISCss66urokhbzR5vLh7/d1tdkGVYIJdbTB1eCz1uoGZp1XpdIJeLgHX5EGcKyGv9+CgoKenp45lcra2tqlpaXR4uxTiqp4eHjf39+UxeHn5+c/Pz+izOXGxsahoaHOzs5paWkHW4wFYJRlnbwkapKTvNORkZFxcXEJca2/v79GRkasrKy1tbUrjsYEXI4FbalFmsrKysp1stZiYmJHi7JFgKJkpMlmrNVLS0tDQ0Pg4ODw9feiwNKLi4sEU4Bkq9OixdgGdLJ2dnYXgL3AwMCcnJyyzd0EWorCwsJBQUGx0OIJZJmStchCQkImcp1sbGxVl722trYYYo1HnM2Xl5cnicEKaqBJns7S0tLQ0NA2kcYFcrBlZWWNjY2yytgFaaKTuM4Zdak2dptzor1yn7gFZZtFkbyDrcWvr69gYGCiyN5vb2+UlJQIaJ4HbKXB2eeEtNAchsOjzuZGhKgJWIVKns90dHQnf7AIbKUEYpiJweIwk8sahME1h7VDfqERgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYHeLkKe7wFdrcEdrYOf8AOgMADdLUDdbUEdbYDdLQSg8NXV1cSg8QShMQAcrIThMUOf78Gd7gNfr8Nfr4Mfb4Mfb0IebkJe7sJeroJers6OjqqqqrU1NTV1dWrq6tISEipqak7OzuAgIB+fn4HVoTw9/tJSUmBgYHq6ur19fVMTEzz8/PC3u709PTv9PeFvt5/f3+DvNzB3e2CqcDg6u+JiYno6OhGm8vA1N/B3e7g6vCErMJHm8wUXokzc5mhv9ALdK/B3u7D3+/W1taDq8JInc0EVYMKebgFZ58IWYiEvd0IV4QLerlVos/C3+8Fa6YEWIiDqsGCutsZg8DR4OiDr8gLb6gGdbRor9c2eJ4VaJfv9voJcKxEmMgKa6MmbpUHY5ZGibDP5PFTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////89qYHGAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADDBJREFUeNrsVwtYVGUaPjgoJCACDpCjjIqioQ4oKFoDCka6rahJ3sBVV0qltdRSQ8u0dleEgXbbG7tttC0kd4NBLgIJal4yrYzULlppueV2m13XDcR42e//zznDOTOAPFuPzzPz+D6P5/+u7/ef9x/OOQodHdVrR151BvzVAbD9KXNHh9ARs/Wqc+AvDoHtbh1C9dhWJ8GfHQPbzcJaZ5G89U8OgqeEsd87C37pINgufH9L85sNJ9L8344C4TunwS3Nbz7+5SgQ/us0uKX5zcdzjgLhP06D3zoKutRcExYW9vN1P74qKzSaFVZnnUbTmx6dRtdL9he6w3P+tz11m79ddJO3n5/fFqs/4ZKf36UJXbRP2LLJLuYHvxf+bwhXbBG1oBocMYujrvxAaMI0Kr8ai632LEzqDcXbeLuXw17sBpve4rfz1iZVdIIYhbu36A8V3c2b7Prfwha7GGne3bgXt/htebFH2GmuqwICSrTaYNqA5odqHoYwpWsajxjr0QKhP67mf+sGH+L20VNG344PVdFk4MKxY9OnAcnM9YJ59ZQpD0yDm013spdUoUIDGrob12OOQ7iuRlQMatcJDEZt7aDrPxCkucofCyRK5mLUZvSGwiAYejnspa5xCUcXpqWlLZyGS8pw8vSv0lj4KDYzD1h15kxa2irAW1nVwH/8yXakpOtL3aGnHIdgp1JtlBBdaTQaBME0srfa6gapjmfQoMSuNS8NwgjJLMaCdqlY1zVjlI3mieohUXKFjL93DS+s9vn05Kc+x+ClDJ9MS/NJ+nLumWP4kLwGeJ558uTJDWc80aCsSm7YeIw0tyNtYGUTkv2VpbLXoKBITlbViLDVvBpa/U5umYzMKMZe7u1FsXRdHAOUXC9BSVQJPYZYtoS9AKpLeB0Qxd3iKO6IsLLv1KJKEhBYZyLhZrF8Vex1Ffn1EVU8zChLIBLH8tCsKKkykTcuUG49U4I33CXLHd6ZmWY8/j7Z7z8Oc6YCJ+cOZMv7D+ARWibjqAdz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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua index 25b1e53923..56f6835863 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/controller/openclash.lua @@ -5,10 +5,12 @@ function index() return end - local page = entry({"admin", "services", "openclash"}, alias("admin", "services", "openclash", "client"), _("OpenClash"), 50) + local page + + page = entry({"admin", "services", "openclash"}, alias("admin", "services", "openclash", "client"), _("OpenClash"), 50) page.dependent = true page.acl_depends = { "luci-app-openclash" } - entry({"admin", "services", "openclash", "client"},form("openclash/client"),_("Overviews"), 20).leaf = true + entry({"admin", "services", "openclash", "client"},cbi("openclash/client"),_("Overviews"), 20).leaf = true entry({"admin", "services", "openclash", "status"},call("action_status")).leaf=true entry({"admin", "services", "openclash", "state"},call("action_state")).leaf=true entry({"admin", "services", "openclash", "startlog"},call("action_start")).leaf=true @@ -32,7 +34,7 @@ function index() entry({"admin", "services", "openclash", "groups-config"},cbi("openclash/groups-config"), nil).leaf = true entry({"admin", "services", "openclash", "proxy-provider-config"},cbi("openclash/proxy-provider-config"), nil).leaf = true entry({"admin", "services", "openclash", "config"},form("openclash/config"),_("Config Manage"), 70).leaf = true - entry({"admin", "services", "openclash", "log"},form("openclash/log"),_("Server Logs"), 80).leaf = true + entry({"admin", "services", "openclash", "log"},cbi("openclash/log"),_("Server Logs"), 80).leaf = true end local fs = require "luci.openclash" diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/client.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/client.lua index baf92a1e3b..23c276a450 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/client.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/client.lua @@ -99,9 +99,9 @@ end e[t].check=translate(config_check(CONFIG_FILE)) end end -form=SimpleForm("filelist") -form.reset=false -form.submit=false + +form = Map("openclash") +form.pageaction = false tb=form:section(Table,e) st=tb:option(DummyValue,"state",translate("State")) st.template="openclash/cfg_check" @@ -139,9 +139,9 @@ local t = { {enable, disable} } -ap = SimpleForm("apply") -ap.reset = false -ap.submit = false +ap = Map("openclash") +ap.pageaction = false + ss = ap:section(Table, t) o = ss:option(Button, "enable") diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/config.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/config.lua index 93ef521285..f84fb9c030 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/config.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/config.lua @@ -334,7 +334,7 @@ s = m:section(Table, tab) local conf = string.sub(luci.sys.exec("uci get openclash.config.config_path 2>/dev/null"), 1, -2) local dconf = "/etc/openclash/default.yaml" local conf_name = fs.basename(conf) -if not conf_name then conf_name = "config.yaml" end +if not conf_name or conf == "" then conf_name = "config.yaml" end sev = s:option(Value, "user") sev.template = "cbi/tvalue" diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/groups-config.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/groups-config.lua index 642fa091a5..416950b571 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/groups-config.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/groups-config.lua @@ -86,6 +86,7 @@ uci:foreach("openclash", "groups", o:value("DIRECT") o:value("REJECT") o:depends("type", "select") +o:depends("type", "relay") o.rmempty = true local t = { diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/log.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/log.lua index bbcaea1d0a..35f8c5bc7c 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/log.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/log.lua @@ -25,23 +25,20 @@ local t = { {refresh, clean} } -a = SimpleForm("apply") -a.reset = false -a.submit = false -s = a:section(Table, t) +a = m:section(Table, t) -o = s:option(Button, "refresh") +o = a:option(Button, "refresh") o.inputtitle = translate("Refresh Log") o.inputstyle = "apply" o.write = function() HTTP.redirect(luci.dispatcher.build_url("admin", "services", "openclash", "log")) end -o = s:option(Button, "clean") +o = a:option(Button, "clean") o.inputtitle = translate("Clean Log") o.inputstyle = "apply" o.write = function() SYS.call("echo '' >/tmp/openclash.log") end -return m, a \ No newline at end of file +return m \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/proxy-provider-config.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/proxy-provider-config.lua index a48b7f5153..99d4f252dd 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/proxy-provider-config.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/proxy-provider-config.lua @@ -101,7 +101,7 @@ o.description = font_red..bold_on..translate("No Need Set when Config Create, Th o.rmempty = true m.uci:foreach("openclash", "groups", function(s) - if s.name ~= "" and s.name ~= nil and s.type ~= "relay" then + if s.name ~= "" and s.name ~= nil then o:value(s.name) end end) diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers-config.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers-config.lua index 27af4fef39..6d2522863f 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers-config.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/servers-config.lua @@ -279,7 +279,7 @@ o.inputtitle = translate("Commit Configurations") o.inputstyle = "apply" o.write = function() m.uci:commit(openclash) - sys.call("sh /usr/share/openclash/cfg_servers_address_fake_block.sh &") + sys.call("/usr/share/openclash/cfg_servers_address_fake_filter.sh &") luci.http.redirect(m.redirect) end diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index 91da6acfdf..da3c16c647 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -175,25 +175,19 @@ o:value("0", translate("Disable")) o:value("1", translate("Enable")) o.default=0 -o = s:taboption("dns", Value, "direct_dns", translate("Specify DNS Server")) -o.description = translate("Specify DNS Server For List, Only One IP Server Address Support") -o.default="114.114.114.114" -o.placeholder = translate("114.114.114.114 or 127.0.0.1#5300") -o:depends("dns_advanced_setting", "1") - -o = s:taboption("dns", Button, translate("Fake-IP Block List Update")) -o.title = translate("Fake-IP Block List Update") +o = s:taboption("dns", Button, translate("Fake-IP-Filter List Update")) +o.title = translate("Fake-IP-Filter List Update") o:depends("dns_advanced_setting", "1") o.inputtitle = translate("Check And Update") o.inputstyle = "reload" o.write = function() m.uci:set("openclash", "config", "enable", 1) m.uci:commit("openclash") - SYS.call("/usr/share/openclash/openclash_fake_block.sh >/dev/null 2>&1 && /etc/init.d/openclash restart >/dev/null 2>&1 &") + SYS.call("/usr/share/openclash/openclash_fake_filter.sh >/dev/null 2>&1 && /etc/init.d/openclash restart >/dev/null 2>&1 &") HTTP.redirect(DISP.build_url("admin", "services", "openclash")) end -custom_fake_black = s:taboption("dns", Value, "custom_fake_black") +custom_fake_black = s:taboption("dns", Value, "custom_fake_filter") custom_fake_black.template = "cbi/tvalue" custom_fake_black.description = translate("Domain Names In The List Do Not Return Fake-IP, One rule per line") custom_fake_black.rows = 20 @@ -201,13 +195,13 @@ custom_fake_black.wrap = "off" custom_fake_black:depends("dns_advanced_setting", "1") function custom_fake_black.cfgvalue(self, section) - return NXFS.readfile("/etc/openclash/custom/openclash_custom_fake_black.conf") or "" + return NXFS.readfile("/etc/openclash/custom/openclash_custom_fake_filter.list") or "" end function custom_fake_black.write(self, section, value) if value then value = value:gsub("\r\n?", "\n") - NXFS.writefile("/etc/openclash/custom/openclash_custom_fake_black.conf", value) + NXFS.writefile("/etc/openclash/custom/openclash_custom_fake_filter.list", value) end end end diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm index 5a7420b0ca..9c847b427d 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm @@ -44,7 +44,11 @@
- +
<%:Collecting data...%>
+

+ <%:Collecting data...%> +

+
diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_block.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_block.sh deleted file mode 100755 index b256537802..0000000000 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_block.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -status=$(ps|grep -c /usr/share/openclash/cfg_servers_address_fake_block.sh) -[ "$status" -gt "3" ] && exit 0 - -en_mode=$(uci get openclash.config.en_mode 2>/dev/null) -if pidof clash >/dev/null && [ "$en_mode" != "redir-host" ]; then - rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 - /usr/share/openclash/openclash_fake_block.sh - mkdir -p /tmp/dnsmasq.d - ln -s /etc/openclash/dnsmasq_fake_block.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 - /etc/init.d/dnsmasq restart >/dev/null 2>&1 -fi diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh new file mode 100644 index 0000000000..8dd977b26f --- /dev/null +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +status=$(ps|grep -c /usr/share/openclash/cfg_servers_address_fake_filter.sh) +[ "$status" -gt "3" ] && exit 0 + +START_LOG="/tmp/openclash_start.log" +en_mode=$(uci get openclash.config.en_mode 2>/dev/null) + +if pidof clash >/dev/null && [ -z "$(echo "$en_mode" |grep "redir-host")" ]; then + rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 + /usr/share/openclash/openclash_fake_filter.sh + if [ -s "/etc/openclash/servers_fake_filter.conf" ]; then + mkdir -p /tmp/dnsmasq.d + ln -s /etc/openclash/servers_fake_filter.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 + /etc/init.d/dnsmasq restart >/dev/null 2>&1 + fi + echo "" >$START_LOG +fi diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash.sh index c0fe201c3e..ae3868b968 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash.sh @@ -6,6 +6,7 @@ START_LOG="/tmp/openclash_start.log" LOGTIME=$(date "+%Y-%m-%d %H:%M:%S") LOG_FILE="/tmp/openclash.log" CFG_FILE="/tmp/config.yaml" +CRON_FILE="/etc/crontabs/root" CONFIG_PATH=$(uci get openclash.config.config_path 2>/dev/null) servers_update=$(uci get openclash.config.servers_update 2>/dev/null) dns_port=$(uci get openclash.config.dns_port 2>/dev/null) @@ -15,7 +16,7 @@ if_restart=0 urlencode() { local data - if [ "$#" -eq "1" ]; then + if [ "$#" -eq 1 ]; then data=$(curl -s -o /dev/null -w %{url_effective} --get --data-urlencode "$1" "") if [ ! -z "$data" ]; then echo "${data##/?}" @@ -23,6 +24,13 @@ urlencode() { fi } +kill_watchdog() { + watchdog_pids=$(ps |grep openclash_watchdog.sh |grep -v grep |awk '{print $1}' 2>/dev/null) + for watchdog_pid in $watchdog_pids; do + kill -9 "$watchdog_pid" >/dev/null 2>&1 + done +} + config_download() { if [ "$URL_TYPE" == "v2rayn" ]; then @@ -78,7 +86,7 @@ config_su_check() echo "配置文件下载成功，检查是否有更新..." >$START_LOG if [ -f "$CONFIG_FILE" ]; then cmp -s "$BACKPACK_FILE" "$CFG_FILE" - if [ "$?" -ne "0" ]; then + if [ "$?" -ne 0 ]; then echo "配置文件【$name】有更新，开始替换..." >$START_LOG mv "$CFG_FILE" "$CONFIG_FILE" 2>/dev/null cp "$CONFIG_FILE" "$BACKPACK_FILE" @@ -115,12 +123,12 @@ config_error() change_dns() { if pidof clash >/dev/null; then - if [ "$enable_redirect_dns" -ne "0" ]; then + if [ "$enable_redirect_dns" -ne 0 ]; then uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1 uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" >/dev/null 2>&1 uci delete dhcp.@dnsmasq[0].resolvfile >/dev/null 2>&1 uci set dhcp.@dnsmasq[0].noresolv=1 >/dev/null 2>&1 - [ "$disable_masq_cache" -eq "1" ] && { + [ "$disable_masq_cache" -eq 1 ] && { uci set dhcp.@dnsmasq[0].cachesize=0 >/dev/null 2>&1 } uci commit dhcp @@ -135,10 +143,7 @@ config_download_direct() if pidof clash >/dev/null; then echo "配置文件【$name】下载失败，尝试不使用代理下载配置文件..." >$START_LOG - watchdog_pids=$(ps |grep openclash_watchdog.sh |grep -v grep |awk '{print $1}' 2>/dev/null) - for watchdog_pid in $watchdog_pids; do - kill -9 "$watchdog_pid" >/dev/null 2>&1 - done + kill_watchdog uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" >/dev/null 2>&1 uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 @@ -150,7 +155,7 @@ config_download_direct() config_download - if [ "$?" -eq "0" ] && [ -s "$CFG_FILE" ]; then + if [ "$?" -eq 0 ] && [ -s "$CFG_FILE" ]; then change_dns config_su_check else @@ -171,7 +176,7 @@ sub_info_get() config_get "address" "$section" "address" "" config_get "keyword" "$section" "keyword" "" - if [ "$enabled" = "0" ]; then + if [ "$enabled" -eq 0 ]; then return fi @@ -196,7 +201,7 @@ sub_info_get() config_download - if [ "$?" -eq "0" ] && [ -s "$CFG_FILE" ]; then + if [ "$?" -eq 0 ] && [ -s "$CFG_FILE" ]; then config_encode grep "^ \{0,\}Proxy Group:" "$CFG_FILE" >/dev/null 2>&1 && grep "^ \{0,\}Rule:" "$CFG_FILE" >/dev/null 2>&1 if [ "$?" -eq 0 ]; then @@ -219,4 +224,11 @@ config_load "openclash" config_foreach sub_info_get "config_subscribe" uci delete openclash.config.config_update_path >/dev/null 2>&1 uci commit openclash -[ "$if_restart" == "1" ] && /etc/init.d/openclash restart >/dev/null 2>&1 + +if [ "$if_restart" -eq 1 ]; then + /etc/init.d/openclash restart >/dev/null 2>&1 +else + sed -i '/openclash.sh/d' $CRON_FILE 2>/dev/null + [ "$(uci get openclash.config.auto_update 2>/dev/null)" -eq 1 ] && [ "$(uci get openclash.config.config_auto_update_mode 2>/dev/null)" -ne 1 ] && echo "0 $(uci get openclash.config.auto_update_time 2>/dev/null) * * $(uci get openclash.config.config_update_week_time 2>/dev/null) /usr/share/openclash/openclash.sh" >> $CRON_FILE + /etc/init.d/cron restart +fi diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh index 5660deed0f..7160429322 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh @@ -23,25 +23,27 @@ case $CORE_TYPE in "Tun") CORE_CV=$(/etc/openclash/core/clash_tun -v 2>/dev/null |awk -F ' ' '{print $2}') CORE_LV=$(sed -n 2p /tmp/clash_last_version 2>/dev/null) - if [ "$en_mode" = "fake-ip-tun" ] || [ "$en_mode" = "redir-host-tun" ] || [ -z "$(pidof clash)" ]; then + if [ "$en_mode" = "fake-ip-tun" ] || [ "$en_mode" = "redir-host-tun" ]; then if_restart=1 fi ;; "Game") CORE_CV=$(/etc/openclash/core/clash_game -v 2>/dev/null |awk -F ' ' '{print $2}') CORE_LV=$(sed -n 3p /tmp/clash_last_version 2>/dev/null) - if [ "$en_mode" = "fake-ip-vpn" ] || [ "$en_mode" = "redir-host-vpn" ] || [ -z "$(pidof clash)" ]; then + if [ "$en_mode" = "fake-ip-vpn" ] || [ "$en_mode" = "redir-host-vpn" ]; then if_restart=1 fi ;; *) CORE_CV=$(/etc/openclash/core/clash -v 2>/dev/null |awk -F ' ' '{print $2}') CORE_LV=$(sed -n 1p /tmp/clash_last_version 2>/dev/null) - if [ "$en_mode" = "fake-ip" ] || [ "$en_mode" = "redir-host" ] || [ -z "$(pidof clash)" ]; then + if [ "$en_mode" = "fake-ip" ] || [ "$en_mode" = "redir-host" ]; then if_restart=1 fi esac +[ -z "$(pidof clash)" ] && if_restart=0 + if [ "$CORE_CV" != "$CORE_LV" ] || [ -z "$CORE_CV" ]; then if [ "$CPU_MODEL" != 0 ]; then if pidof clash >/dev/null; then @@ -98,7 +100,10 @@ if [ "$CORE_CV" != "$CORE_LV" ] || [ -z "$CORE_CV" ]; then rm -rf /tmp/clash.tar.gz >/dev/null 2>&1 rm -rf /tmp/clash.gz >/dev/null 2>&1 mkdir -p /etc/openclash/core - [ "$if_restart" -eq 1 ] && kill -9 "$(pidof clash|sed 's/$//g')" 2>/dev/null && /etc/init.d/openclash stop + if [ "$if_restart" -eq 1 ]; then + kill -9 "$(pidof clash|sed 's/$//g')" 2>/dev/null + /etc/init.d/openclash stop + fi echo "【"$CORE_TYPE"】版本内核下载成功，开始更新..." >$START_LOG case $CORE_TYPE in "Tun") diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_debug.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_debug.sh index 69dee9593f..74fc6ece97 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_debug.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_debug.sh @@ -6,13 +6,13 @@ status=$(ps|grep -c /usr/share/openclash/openclash_debug.sh) DEBUG_LOG="/tmp/openclash_debug.log" LOGTIME=$(date "+%Y-%m-%d %H:%M:%S") +uci commit openclash enable_custom_dns=$(uci get openclash.config.enable_custom_dns 2>/dev/null) rule_source=$(uci get openclash.config.rule_source 2>/dev/null) enable_custom_clash_rules=$(uci get openclash.config.enable_custom_clash_rules 2>/dev/null) ipv6_enable=$(uci get openclash.config.ipv6_enable 2>/dev/null) enable_redirect_dns=$(uci get openclash.config.enable_redirect_dns 2>/dev/null) -direct_dns=$(uci get openclash.config.direct_dns 2>/dev/null) disable_masq_cache=$(uci get openclash.config.disable_masq_cache 2>/dev/null) proxy_mode=$(uci get openclash.config.proxy_mode 2>/dev/null) intranet_allowed=$(uci get openclash.config.intranet_allowed 2>/dev/null) @@ -110,6 +110,9 @@ cat >> "$DEBUG_LOG" <<-EOF 运行状态: 未运行 EOF fi +if [ "$core_type" = "0" ]; then + core_type="未选择架构" +fi cat >> "$DEBUG_LOG" <<-EOF 已选择的架构: $core_type @@ -195,7 +198,6 @@ UDP流量转发: $(ts_cf "$enable_udp_proxy") DNS劫持: $(ts_cf "$enable_redirect_dns") 自定义DNS: $(ts_cf "$enable_custom_dns") IPV6-DNS解析: $(ts_cf "$ipv6_enable") -Real-IP-DNS地址: $direct_dns 禁用Dnsmasq缓存: $(ts_cf "$disable_masq_cache") 自定义规则: $(ts_cf "$enable_custom_clash_rules") 仅允许内网: $(ts_cf "$intranet_allowed") diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh deleted file mode 100755 index 7a9e55fa70..0000000000 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_block.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash /etc/rc.common - -START_LOG="/tmp/openclash_start.log" -echo "正在设置Fake-IP黑名单..." >$START_LOG - -direct_dns=$(uci get openclash.config.direct_dns 2>/dev/null) -[ -z "$direct_dns" ] && { - direct_dns="114.114.114.114" - } -rm -rf /etc/openclash/dnsmasq_fake_block.conf 2>/dev/null -for i in `cat /etc/openclash/custom/openclash_custom_fake_black.conf` -do - if [ -z "$(echo $i |grep '^ \{0,\}#' 2>/dev/null)" ]; then - echo "server=/$i/$direct_dns" >>/etc/openclash/dnsmasq_fake_block.conf - fi -done - -cfg_server_address() -{ - local section="$1" - config_get "server" "$section" "server" "" - - IFIP=$(echo $server |grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$") - if [ -z "$IFIP" ] && [ ! -z "$server" ]; then - echo "server=/$server/$direct_dns" >>/etc/openclash/dnsmasq_fake_block.conf - noip="false" - else - return - fi -} - -#Fake下正确检测节点延迟 -noip="true" -echo "#Server Nodes" >>/etc/openclash/dnsmasq_fake_block.conf -config_load "openclash" -config_foreach cfg_server_address "servers" -[ "$noip" = "true" ] && { - sed -i '/#Server Nodes/d' /etc/openclash/dnsmasq_fake_block.conf 2>/dev/null -} -echo "" >$START_LOG diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh new file mode 100644 index 0000000000..5389ac3e98 --- /dev/null +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh @@ -0,0 +1,46 @@ +#!/bin/bash +. /lib/functions.sh + +START_LOG="/tmp/openclash_start.log" +CUSTOM_FILE="/etc/openclash/custom/openclash_custom_fake_filter.list" +FAKE_FILTER_FILE="/etc/openclash/fake_filter.list" +SER_FAKE_FILTER_FILE="/etc/openclash/servers_fake_filter.conf" + +echo "正在设置Fake-IP黑名单..." >$START_LOG + +rm -rf "$FAKE_FILTER_FILE" 2>/dev/null +if [ -s "$CUSTOM_FILE" ]; then + cat "$CUSTOM_FILE" |while read -r line + do + if [ -z "$(echo $line |grep '^ \{0,\}#' 2>/dev/null)" ]; then + echo " - '$line'" >> "$FAKE_FILTER_FILE" + else + continue + fi + done + if [ -s "$FAKE_FILTER_FILE" ]; then + sed -i '1i\##Custom fake-ip-filter##' "$FAKE_FILTER_FILE" + echo "##Custom fake-ip-filter END##" >> "$FAKE_FILTER_FILE" + else + rm -rf "$FAKE_FILTER_FILE" 2>/dev/null + fi +fi + +cfg_server_address() +{ + local section="$1" + config_get "server" "$section" "server" "" + + IFIP=$(echo $server |grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$") + if [ -z "$IFIP" ] && [ ! -z "$server" ]; then + echo "server=/$server/114.114.114.114" >> "$SER_FAKE_FILTER_FILE" + else + return + fi +} + +#Fake下正确检测节点延迟 + +rm -rf "$SER_FAKE_FILTER_FILE" 2>/dev/null +config_load "openclash" +config_foreach cfg_server_address "servers" diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh index 41070cbeb3..7239367823 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_watchdog.sh @@ -8,8 +8,10 @@ PROXY_ROUTE_TABLE="0x162" enable_redirect_dns=$(uci get openclash.config.enable_redirect_dns 2>/dev/null) dns_port=$(uci get openclash.config.dns_port 2>/dev/null) disable_masq_cache=$(uci get openclash.config.disable_masq_cache 2>/dev/null) -CRASH_NUM=0 en_mode=$(uci get openclash.config.en_mode 2>/dev/null) +cfg_update_interval=$(uci get openclash.config.config_update_interval 2>/dev/null) +CRASH_NUM=0 +CFG_UPDATE_INT=0 if [ "$en_mode" = "fake-ip-tun" ] || [ "$en_mode" = "redir-host-tun" ]; then core_type="Tun" @@ -22,8 +24,11 @@ fi while :; do LOGTIME=$(date "+%Y-%m-%d %H:%M:%S") + cfg_update=$(uci get openclash.config.auto_update 2>/dev/null) + cfg_update_mode=$(uci get openclash.config.config_auto_update_mode 2>/dev/null) + cfg_update_interval_now=$(uci get openclash.config.config_update_interval 2>/dev/null) enable=$(uci get openclash.config.enable) - + if [ "$enable" -eq 1 ]; then if ! pidof clash >/dev/null; then CRASH_NUM=$(expr "$CRASH_NUM" + 1) @@ -71,14 +76,14 @@ fi fi ## DNS转发劫持 - if [ "$enable_redirect_dns" != "0" ]; then + if [ "$enable_redirect_dns" -ne 0 ]; then if [ -z "$(uci get dhcp.@dnsmasq[0].server 2>/dev/null |grep "$dns_port")" ] || [ ! -z "$(uci get dhcp.@dnsmasq[0].server 2>/dev/null |awk -F ' ' '{print $2}')" ]; then echo "$LOGTIME Watchdog: Force Reset DNS Hijack." >> $LOG_FILE uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1 uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" uci delete dhcp.@dnsmasq[0].resolvfile uci set dhcp.@dnsmasq[0].noresolv=1 - [ "$disable_masq_cache" -eq "1" ] && { + [ "$disable_masq_cache" -eq 1 ] && { uci set dhcp.@dnsmasq[0].cachesize=0 } uci commit dhcp @@ -86,5 +91,20 @@ fi fi fi +## 配置文件循环更新 + if [ "$cfg_update" -eq 1 ] && [ "$cfg_update_mode" -eq 1 ]; then + if [ -z "$cfg_update_interval_now" ]; then + cfg_update_interval_now=60 + fi + if [ -z "$cfg_update_interval" ]; then + cfg_update_interval=60 + fi + [ "$cfg_update_interval" -ne "$cfg_update_interval_now" ] && CFG_UPDATE_INT=0 && cfg_update_interval="$cfg_update_interval_now" + if [ "$CFG_UPDATE_INT" -ne 0 ]; then + [ "$(expr "$CFG_UPDATE_INT" % "$cfg_update_interval_now")" -eq 0 ] && /usr/share/openclash/openclash.sh + fi + CFG_UPDATE_INT=$(expr "$CFG_UPDATE_INT" + 1) + fi + sleep 60 done 2>/dev/null diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_change.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_change.sh index e5bc5340e4..d32e1fac4a 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_change.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_change.sh @@ -1,4 +1,5 @@ #!/bin/sh + #删除旧hosts配置 hostlen=$(sed -n '/hosts:/=' "$7" 2>/dev/null) dnslen=$(sed -n '/dns:/=' "$7" 2>/dev/null) @@ -186,4 +187,30 @@ sed -i '/^hosts:/a\##Custom HOSTS##' "$7" 2>/dev/null sed -i '/##Custom HOSTS##/r/etc/openclash/custom/openclash_custom_hosts.list' "$7" 2>/dev/null sed -i "/^hosts:/,/^dns:/ {s/^ \{0,\}'/ '/}" "$7" 2>/dev/null #修改参数空格 - fi \ No newline at end of file + fi + + sed -i "s/^ \{0,\}- / - /" "$7" 2>/dev/null + if [ ! -z "$(grep "^ \{0,\}default-nameserver:" "$7")" ]; then + sed -i "/^ \{0,\}default-nameserver:/c\ default-nameserver:" "$7" + fi + +#fake-ip-filter + sed -i '/##Custom fake-ip-filter##/,/##Custom fake-ip-filter END##/d' "$7" 2>/dev/null + if [ "$2" = "fake-ip" ]; then + if [ ! -f "/etc/openclash/fake_filter.list" ] || [ ! -z "$(grep "config servers" /etc/config/openclash)" ]; then + /usr/share/openclash/openclash_fake_filter.sh + fi + if [ -s "/etc/openclash/servers_fake_filter.conf" ]; then + mkdir -p /tmp/dnsmasq.d + ln -s /etc/openclash/servers_fake_filter.conf /tmp/dnsmasq.d/dnsmasq_openclash.conf + fi + if [ -s "/etc/openclash/fake_filter.list" ]; then + if [ ! -z "$(grep "^ \{0,\}fake-ip-filter:" "$7")" ]; then + sed -i "/^ \{0,\}fake-ip-filter:/c\ fake-ip-filter:" "$7" + sed -i '/fake-ip-filter:/r/etc/openclash/fake_filter.list' "$7" 2>/dev/null + else + echo " fake-ip-filter:" >> "$7" + sed -i '/fake-ip-filter:/r/etc/openclash/fake_filter.list' "$7" 2>/dev/null + fi + fi + fi \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_get.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_get.sh index 9ab6fb7803..78aeab8dc3 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_get.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_get.sh @@ -5,6 +5,7 @@ status=$(ps|grep -c /usr/share/openclash/yml_groups_get.sh) START_LOG="/tmp/openclash_start.log" CFG_FILE="/etc/config/openclash" +servers_update=$(uci get openclash.config.servers_update 2>/dev/null) servers_if_update=$(uci get openclash.config.servers_if_update 2>/dev/null) CONFIG_FILE=$(uci get openclash.config.config_path 2>/dev/null) CONFIG_NAME=$(echo "$CONFIG_FILE" |awk -F '/' '{print $5}' 2>/dev/null) @@ -109,7 +110,7 @@ cfg_delete() config_load "openclash" config_foreach cfg_group_name "groups" -if [ "$servers_if_update" -eq 1 ] && [ "$config_group_exist" -eq 1 ]; then +if [ "$servers_if_update" -eq 1 ] && [ "$servers_update" -eq 1 ] && [ "$config_group_exist" -eq 1 ]; then /usr/share/openclash/yml_proxys_get.sh exit 0 else diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_set.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_set.sh index af4f2e7490..5a22d3537b 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_set.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_groups_set.sh @@ -195,7 +195,7 @@ yml_groups_set() set_group=0 set_proxy_provider=0 - if [ "$type" = "select" ]; then + if [ "$type" = "select" ] || [ "$type" = "relay" ]; then config_list_foreach "$section" "other_group" set_other_groups #加入其他策略组 fi @@ -209,9 +209,7 @@ yml_groups_set() echo " use: $group_name" >>$GROUP_FILE - if [ "$type" != "relay" ]; then - config_foreach set_proxy_provider "proxy-provider" "$group_name" #加入代理集 - fi + config_foreach set_proxy_provider "proxy-provider" "$group_name" #加入代理集 if [ "$set_group" -eq 1 ]; then sed -i "/^ \{0,\}proxies: ${group_name}/c\ proxies:" $GROUP_FILE diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh index 3d8ea33579..49e0ba9a1e 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_proxys_get.sh @@ -159,7 +159,7 @@ cfg_new_provider_groups_get() ${uci_add}groups="${1}" } -[ "$servers_update" -eq "1" ] && { +[ "$servers_update" -eq 1 ] && { echo "" >"$match_provider" provider_nums=0 config_load "openclash" @@ -214,7 +214,7 @@ do #代理集存在时获取代理集编号 provider_nums=$(grep -Fw "$provider_name" "$match_provider" |awk -F '.' '{print $1}') - if [ "$servers_update" -eq "1" ] && [ ! -z "$provider_nums" ]; then + if [ "$servers_update" -eq 1 ] && [ ! -z "$provider_nums" ]; then sed -i "/^${provider_nums}\./c\#match#" "$match_provider" 2>/dev/null uci_set="uci -q set openclash.@proxy-provider["$provider_nums"]." ${uci_set}manual="0" @@ -237,7 +237,7 @@ do uci_set="uci -q set $name.$uci_name_tmp." uci_add="uci -q add_list $name.$uci_name_tmp." - if [ -z "$new_servers_group" ] && [ "$servers_if_update" = "1" ] && [ "$servers_update" -eq "1" ]; then + if [ -z "$new_servers_group" ] && [ "$servers_if_update" = "1" ] && [ "$servers_update" -eq 1 ]; then ${uci_set}enabled="0" else ${uci_set}enabled="1" @@ -429,7 +429,7 @@ cfg_new_servers_groups_get() echo "开始更新【$CONFIG_NAME】的服务器节点配置..." >$START_LOG -[ "$servers_update" -eq "1" ] && { +[ "$servers_update" -eq 1 ] && { echo "" >"$match_servers" server_num=0 config_load "openclash" @@ -483,7 +483,7 @@ do #节点存在时获取节点编号 server_num=$(grep -Fw "$server_name" "$match_servers" |awk -F '.' '{print $1}') - if [ "$servers_update" -eq "1" ] && [ ! -z "$server_num" ]; then + if [ "$servers_update" -eq 1 ] && [ ! -z "$server_num" ]; then sed -i "/^${server_num}\./c\#match#" "$match_servers" 2>/dev/null fi @@ -568,7 +568,7 @@ do echo "正在读取【$CONFIG_NAME】-【$server_type】-【$server_name】服务器节点配置..." >$START_LOG - if [ "$servers_update" -eq "1" ] && [ ! -z "$server_num" ]; then + if [ "$servers_update" -eq 1 ] && [ ! -z "$server_num" ]; then #更新已有节点 uci_set="uci -q set openclash.@servers["$server_num"]." uci_add="uci -q add_list $name.$uci_name_tmp." @@ -646,7 +646,7 @@ do uci_set="uci -q set $name.$uci_name_tmp." uci_add="uci -q add_list $name.$uci_name_tmp." - if [ -z "$new_servers_group" ] && [ "$servers_if_update" = "1" ] && [ "$servers_update" -eq "1" ]; then + if [ -z "$new_servers_group" ] && [ "$servers_if_update" = "1" ] && [ "$servers_update" -eq 1 ]; then ${uci_set}enabled="0" else ${uci_set}enabled="1" @@ -772,7 +772,7 @@ fi uci set openclash.config.servers_if_update=0 uci commit openclash -/usr/share/openclash/cfg_servers_address_fake_block.sh +/usr/share/openclash/cfg_servers_address_fake_filter.sh echo "配置文件【$CONFIG_NAME】读取完成！" >$START_LOG sleep 3 echo "" >$START_LOG diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json b/package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json new file mode 100644 index 0000000000..8214de2101 --- /dev/null +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/rpcd/acl.d/luci-app-openclash.json @@ -0,0 +1,11 @@ +{ + "luci-app-openclash": { + "description": "Grant UCI access for luci-app-openclash", + "read": { + "uci": [ "openclash" ] + }, + "write": { + "uci": [ "openclash" ] + } + } +} \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po b/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po index 2fc1cd155d..1aab9dca16 100644 --- a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po +++ b/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po @@ -203,7 +203,7 @@ msgstr "指定下方列表中域名的DNS服务器，只支持填写一个IP地 msgid "Domain Names In The List Do Not Return Fake-IP, One rule per line" msgstr "每行请只填写一个域名，列表中的域名在（Fake-IP模式）下查询DNS时将返回真实IP地址，更改后点击上方按钮生效" -msgid "Fake-IP Block List Update" +msgid "Fake-IP-Filter List Update" msgstr "更新Fake-IP域名黑名单" msgid "Set OpenClash Upstream DNS Resolve Server"