fix certificate issue AdguardTeam/AdGuardHome#7002

Author: twoone-3

README.md

@@ -1,18 +1,31 @@
 # AdGuardHome for Magisk
-一个通过过滤DNS请求来屏蔽广告的 Magisk 模块，也能防止DNS污染，
+一个通过重定向并过滤 DNS 请求来屏蔽广告的 Magisk/KernelSU 模块
 
 ![Static Badge](https://img.shields.io/badge/arm--64-support-blue)
 ![GitHub all releases](https://img.shields.io/github/downloads/twoone-3/AdguardHome/total)
 
 加入我们的 [Telegram](https://t.me/adguardhome_for_magisk_release) 频道获取最新信息以及FAQ
 
-本模块基于[AdguardHome_magisk](https://github.com/410154425/AdGuardHome_magisk)二改而成，感谢原作者的付出
-
 # 用法
 - 使用前需在设置里关闭 `私人/专用dns`，在 Magisk/KernelSU 刷入后重启即可使用，AdGuardHome 后台管理地址为 http://127.0.0.1:3000，用户名/密码root
+- 注意！本模块与可能与代理类模块冲突，同时使用两种模块会导致潜在问题！
 
 # 特性
-- 修改DNS筛选规则为[秋风广告规则](https://github.com/TG-Twilight/AWAvenue-Ads-Rule)，省电，少误杀
-- 添加了 KernelSU 的 web 管理页面支持
-- 移除了强制自动更新
-- 移除了赞助页面
+- DNS 上游为腾讯阿里 DoT，备用 DNS 为 Google 和 CloudFlare
+- 仅内置[秋风广告规则](https://github.com/TG-Twilight/AWAvenue-Ads-Rule)，省电，少误杀
+- 可配合第三方软件进行启动停止，通过执行位于 /data/adb/modules/AdGuardHome/bin/ 的 apply_iptables.sh 和 flush_iptables.sh，这里给出Anywhere的快捷导入链接（复制到剪贴板即可导入）
+- 在 KernelSU 里可以通过打开按钮来打开管理页面
+
+Anywhere启动链接
+```
+anywhere://share/J2VP8X5qVhbI2sRvhZ6JXLZdx7Y6JLmsCgw9Wd7k7qce3ERvOaJlWHt61Y8oalvceraVdBkTbIymWLyhgxRQLeICFi3/GKuZYkqPJ3A6WQ8+xW4nTvmC9SwzER2X/9PFEtjgZsphvy2R8suN6BOE3Pm10gwmsdoLwCuLxs0uIA2VmP25Ur1GHTCogIgJoWBpJpz0QT1/LvBtNXXdFwkilQNF8VvcKAO3cgKns+I3hUk0T2rbsjVfj4UwxgYxi5Yg9yiV53hOzIzVZ9uZki3uy6TNTnThFXM+Hg88m8dron/cJM9Qg5Y979j0YTVrA9XakpnXKlF7UvaDM85FSjXZpkXCzbn00lWcvQ==
+```
+Anywhere停止链接
+```
+anywhere://share/J2VP8X5qVhbI2sRvhZ2hdp4467QzpcHDlkAQil7Mg6oDOLdzYgAJO+9fKKenP2M28XWZ71jveGDq1E/sCmMAhBqd5N04LZkJp0EYtrFp7Vw9xPsYBhlmwlaKWljr9iIAMGWOulpW7Zzhm/tpfaDIKjweOGfIsONgcoWq89Idmb215WTrhfju+OeoNqDicBqrOLI5iyI8fTCQifRm7m7hq53WMgN/BoYbWnyE34AeVO2hq5btVggCTBGunrftXnlweSY4ngaN8CmhTlDWQeyjMJRZMooTPHwcQm3fisvBY6McMaVV5lSLHBe+MNaK1EwnzQ0RjNJh/3eoVGQJgUUyN8swAmtakrwaNA==
+```
+
+# 鸣谢
+- [AdguardHome_magisk](https://github.com/410154425/AdGuardHome_magisk)
+- [akashaProxy](https://github.com/ModuleList/akashaProxy)
+- [box_for_magisk](https://github.com/taamarin/box_for_magisk)

apply_iptables.sh

@@ -0,0 +1,8 @@
+iptables -t nat -N ADGUARD
+# return requests from AdGuardHome
+iptables -t nat -A ADGUARD -m owner --uid-owner root --gid-owner net_raw -j RETURN
+# redirect DNS requests to AdGuardHome
+iptables -t nat -A ADGUARD -p udp --dport 53 -j REDIRECT --to-ports 5591
+iptables -t nat -A ADGUARD -p tcp --dport 53 -j REDIRECT --to-ports 5591
+# apply iptables rules
+iptables -t nat -A OUTPUT -j ADGUARD

linux_arm64/AdGuardHome bin/AdGuardHomelinux_arm64/AdGuardHome renamed to bin/AdGuardHome

@@ -23,18 +23,17 @@ dns:
   ratelimit_whitelist: []
   refuse_any: true
   upstream_dns:
-    - 10.35.53.10:3553
-    - '#上面一行用于内网解析,若不用可删'
-    - https://223.5.5.5/dns-query
     - https://1.12.12.12/dns-query
-    - '#一般情况上面两行不可删!禁止填写53端口常规DNS上游'
-    - '#强制使用并行请求，其它禁选'
+    - https://120.53.53.53/dns-query
+    - https://223.5.5.5/dns-query
+    - https://223.6.6.6/dns-query
   upstream_dns_file: ""
   bootstrap_dns:
-    - 10.35.53.10:3553
+    - 1.1.1.1
+    - 8.8.8.8
   fallback_dns:
-    - '#此处留空不要填'
-  upstream_mode: parallel
+    - https://1.1.1.1/dns-query
+  upstream_mode: load_balance
   fastest_timeout: 1s
   allowed_clients: []
   disallowed_clients: []
@@ -45,10 +44,10 @@ dns:
   trusted_proxies:
     - 127.0.0.0/8
     - ::1/128
-  cache_size: 4194304
+  cache_size: 33554432
   cache_ttl_min: 0
-  cache_ttl_max: 300
-  cache_optimistic: false
+  cache_ttl_max: 0
+  cache_optimistic: true
   bogus_nxdomain: []
   aaaa_disabled: false
   enable_dnssec: false
@@ -63,7 +62,7 @@ dns:
   bootstrap_prefer_ipv6: false
   upstream_timeout: 10s
   private_networks: []
-  use_private_ptr_resolvers: false
+  use_private_ptr_resolvers: true
   local_ptr_upstreams: []
   use_dns64: false
   dns64_prefixes: []
@@ -77,7 +76,7 @@ tls:
   force_https: false
   port_https: 443
   port_dns_over_tls: 853
-  port_dns_over_quic: 853
+  port_dns_over_quic: 784
   port_dnscrypt: 0
   dnscrypt_config_file: ""
   allow_unencrypted_doh: false
@@ -89,7 +88,7 @@ tls:
 querylog:
   dir_path: ""
   ignored: []
-  interval: 6h
+  interval: 24h
   size_memory: 1000
   enabled: true
   file_enabled: true
@@ -102,7 +101,7 @@ filters:
   - enabled: true
     url: https://adguardteam.github.io/HostlistsRegistry/assets/filter_53.txt
     name: AWAvenue Ads Rule
-    id: 1721028739
+    id: 1721483069
 whitelist_filters: []
 user_rules: []
 dhcp:
@@ -138,16 +137,16 @@ filtering:
     pixabay: true
     yandex: true
     youtube: true
-  blocking_mode: null_ip
+  blocking_mode: default
   parental_block_host: family-block.dns.adguard.com
   safebrowsing_block_host: standard-block.dns.adguard.com
   rewrites: []
   safebrowsing_cache_size: 1048576
   safesearch_cache_size: 1048576
   parental_cache_size: 1048576
   cache_time: 30
-  filters_update_interval: 24
-  blocked_response_ttl: 10
+  filters_update_interval: 168
+  blocked_response_ttl: 30
   filtering_enabled: true
   parental_enabled: false
   safebrowsing_enabled: false
@@ -156,17 +155,18 @@ clients:
   runtime_sources:
     whois: true
     arp: true
-    rdns: false
+    rdns: true
     dhcp: true
     hosts: true
   persistent: []
 log:
+  enabled: true
   file: ""
   max_backups: 0
   max_size: 100
   max_age: 3
   compress: false
-  local_time: false
+  local_time: true
   verbose: false
 os:
   group: ""

AdGuardHome.yaml bin/AdGuardHome.yamlAdGuardHome.yaml renamed to bin/AdGuardHome.yaml

@@ -231,6 +231,7 @@
 ||googleadservices.com^
 ||googletagservices-cn.com^
 ||googletagservices.com^
+||gorgon.youdao.com^
 ||gromore.pangolin-sdk-toutiao.com^
 ||grs.dbankcloud.com^
 ||grs.hicloud.com^
@@ -268,7 +269,6 @@
 ||img.adnyg.com.w.kunlungr.com^
 ||imtmp.net^
 ||irc.qubiankeji.com^
-||is.snssdk.com^
 ||itv2-up.openspeech.cn^
 ||ixav-cse.avlyun.com^
 ||iyfbodn.com^
@@ -409,6 +409,7 @@
 ||scs.openspeech.cn^
 ||sdk-ab-config.qquanquan.com^
 ||sdk-cache.video.ptqy.gitv.tv^
+||sdk.1rtb.net^
 ||sdk.cferw.com^
 ||sdk.e.qq.com^
 ||sdk.hzsanjiaomao.com^

data/filters/1721028739.txt bin/data/filters/1721483069.txtdata/filters/1721028739.txt renamed to bin/data/filters/1721483069.txt

@@ -1,16 +1,11 @@
-ui_print " -------------------------- "
-ui_print " ------ 安装中，请稍等 ------ "
-sleep 1
-cp "$MODPATH/module.prop" "$MODPATH/t_module"
-if [ "$IS64BIT" = 'true' ]; then
-	cp "$MODPATH/linux_arm64/AdGuardHome" "$MODPATH/AdGuardHome" > /dev/null 2>&1
-ui_print " -------------------------- "
-else
-	cp "$MODPATH/linux_armv7/AdGuardHome" "$MODPATH/AdGuardHome" > /dev/null 2>&1
-ui_print " -------------------------- "
+if [ "$ARCH" != "arm64" ]; then
+  abort "- only support arm64"
 fi
-sleep 1
-rm -rf "$MODPATH/linux_arm64"
-rm -rf "$MODPATH/linux_armv7"
-ui_print " ----- 安装已完成，请重启 ---- "
-ui_print " -------------------------- "
+
+ui_print "- Installing AdGuardHome"
+
+ADG_DIR="$MODPATH/bin"
+chmod 0775 "$ADG_DIR/AdGuardHome" "$MODPATH/apply_iptables.sh" "$MODPATH/flush_iptables.sh"
+chown root:net_raw "$ADG_DIR/AdGuardHome"
+
+ui_print "- Installing success, please reboot your device"

customize.sh

@@ -0,0 +1,3 @@
+iptables -t nat -D OUTPUT -j ADGUARD
+iptables -t nat -F ADGUARD
+iptables -t nat -X ADGUARD

flush_iptables.sh

@@ -1,6 +1,6 @@
 id=AdGuardHome
-name=AdGuardHome模块
-version=20240715
-versionCode=1
-author=top大佬(酷安) & twoone3 魔改
-description=[ - ] 通过DNS层面过滤广告，使用前请先详读mode.conf文件，支持订阅过滤规则，后台地址127.0.0.1:3000，用户名/密码root，配置文件：/data/adb/modules/AdGuardHome/mode.conf
+name=AdGuardHome for Magisk
+version=20240721
+versionCode=13
+author=twoone3
+description=Filter ads at the DNS level