kkkgo / PaoPaoDNS

泡泡DNS是一个能一键部署递归DNS的docker镜像
https://blog.03k.org/post/paopaodns.html
GNU General Public License v3.0
847 stars 67 forks source link

[Help] 欲添加ADG为前端入口,根据文档描述,环境参数里的CNAUTO和DNSPROT是否冲突? #209

Closed asipirin1120 closed 1 month ago

asipirin1120 commented 1 month ago

在提交之前,请确认

test.sh脚本自检日志

*********************************************************************************

images build time : 2024-08-28 16:12:23 UTC
check for the latest version ,
go to https://github.com/kkkgo/PaoPaoDNS/discussions 
-> test start `1726732151`

[INFO] ALL TEST PASS.✅

-> test end `1726732155`

*********************************************************************************

debug.sh脚本自检日志

### == debug.sh : docker exec -it paopaodns sh ==
-> debug start `1726732175`

[INFO] images build time : 2024-08-28 16:12:23 UTC
[OK]DATA_writeable
[OK]DATA_readable
[INFO] NETWORK
*********************************************************************************

1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN qlen 1000
    inet 127.0.0.1/8 scope host lo
    inet6 ::1/128 scope host 
17: eth0@if18: <BROADCAST,MULTICAST,UP,LOWER_UP,M-DOWN> mtu 1500 qdisc noqueue state UP 
    inet 172.17.0.2/16 brd 172.17.255.255 scope global eth0
default via 172.17.0.1 dev eth0 
172.17.0.0/16 dev eth0 scope link  src 172.17.0.2 
traceroute to 120.53.53.53 (120.53.53.53), 4 hops max, 46 byte packets
 1  172.17.0.1 (172.17.0.1)  0.009 ms  0.017 ms  0.004 ms
 2  172.16.2.1 (172.16.2.1)  0.362 ms  0.327 ms  0.218 ms
 3  10.11.64.1 (10.11.64.1)  2.488 ms  2.572 ms  2.624 ms
 4  120.80.123.253 (120.80.123.253)  2.789 ms  2.440 ms  2.392 ms
PING 223.5.5.5 (223.5.5.5): 56 data bytes
64 bytes from 223.5.5.5: seq=0 ttl=115 time=34.561 ms

--- 223.5.5.5 ping statistics ---
1 packets transmitted, 1 packets received, 0% packet loss
round-trip min/avg/max = 34.561/34.561/34.561 ms
PING 119.29.29.29 (119.29.29.29): 56 data bytes
64 bytes from 119.29.29.29: seq=0 ttl=53 time=27.323 ms

--- 119.29.29.29 ping statistics ---
1 packets transmitted, 1 packets received, 0% packet loss
round-trip min/avg/max = 27.323/27.323/27.323 ms
Server:     223.5.5.5
Address:    223.5.5.5#53

Non-authoritative answer:
www.taobao.com  canonical name = www.taobao.com.danuoyi.tbcache.com.
Name:   www.taobao.com.danuoyi.tbcache.com
Address: 163.177.180.94
Name:   www.taobao.com.danuoyi.tbcache.com
Address: 163.177.180.95
Name:   www.taobao.com.danuoyi.tbcache.com
Address: 2408:8756:92fc:f001:3::7e1
Name:   www.taobao.com.danuoyi.tbcache.com
Address: 2408:8756:92fc:f001:3::7e2

Server:     119.29.29.29
Address:    119.29.29.29#53

Non-authoritative answer:
www.qq.com  canonical name = ins-r23tsuuf.ias.tencent-cloud.net.
Name:   ins-r23tsuuf.ias.tencent-cloud.net
Address: 61.241.54.211
Name:   ins-r23tsuuf.ias.tencent-cloud.net
Address: 61.241.54.232
Name:   ins-r23tsuuf.ias.tencent-cloud.net
Address: 2408:8756:f50:1::7a
Name:   ins-r23tsuuf.ias.tencent-cloud.net
Address: 2408:8756:f50:1002::32
Name:   ins-r23tsuuf.ias.tencent-cloud.net
Address: 2408:8756:f50:2::65

*********************************************************************************

[INFO] ENV
*********************************************************************************

====ENV TEST====
[OK]DATA_writeable-
[OK]DATA_readable-
MEM:1000m 2000m 1000000 3000mb
prefPC:100
CORES:-4-
POWCORES:-4-
ulimit :-524288-
FDLIM :-4096-
TZ:-Asia/Shanghai-
UPDATE:-weekly-
DNS_SERVERNAME:-PaoPaoDNS,blog.03k.org-
SERVER_IP:-none-
ETHIP:-172.17.0.2-
DNSPORT:-53-
SOCKS5:-IP:PORT-
CNAUTO:-yes-
IPV6:-yes_only6-
CNFALL:-yes-
CUSTOM_FORWARD:-172.16.2.8:7874-
AUTO_FORWARD:-yes-
AUTO_FORWARD_CHECK:-yes-
USE_MARK_DATA:-yes-
RULES_TTL:-0-
CUSTOM_FORWARD_TTL:-0-
SHUFFLE:-no-
EXPIRED_FLUSH:-yes-
CN_TRACKER:-yes-
USE_HOSTS:-no-
HTTP_FILE:-no-
SAFEMODE:--
QUERY_TIME:-2000ms-
ADDINFO:-no-
PLATFORM:-Linux ef0e7d1c9169 6.8.4-2-pve #1 SMP PREEMPT_DYNAMIC PMX 6.8.4-2 (2024-04-10T17:36Z) x86_64 Linux-
====ENV TEST====
mosdns kkkgo/mosdns:240822.1
total 3M     
   4.0K drwxrwxrwx    3 0        0           4.0K Sep 19 15:31 .
   4.0K drwxr-xr-x    1 0        0           4.0K Sep 19 00:28 ..
 248.0K -rwxrwxrwx    1 0        0         247.1K Sep 19 15:46 Country-only-cn-private.mmdb
      0 -rwxrwxrwx    1 0        0              0 Sep 19 00:27 custom_cn_mark.txt
   4.0K -rwxrwxrwx    1 0        0            414 Sep 19 15:46 custom_env.ini
   4.0K -rwxrwxrwx    1 0        0            416 Sep 19 15:45 custom_mod.yaml
   4.0K drwxrwxrwx    2 0        0           4.0K Sep 19 15:45 dnscrypt-resolvers
   4.0K -rwxrwxrwx    1 0        0           3.0K Sep 19 00:28 dnscrypt.toml
   4.0K -rwxrwxrwx    1 0        0            670 Sep 19 00:27 force_dnscrypt_list.txt
   4.0K -rwxrwxrwx    1 0        0            325 Sep 19 01:19 force_forward_list.txt
   4.0K -rwxrwxrwx    1 0        0            387 Sep 19 00:27 force_recurse_list.txt
   1.2M -rwxrwxrwx    1 0        0           1.2M Sep 19 15:46 global_mark.dat
  12.0K -rwxrwxrwx    1 0        0          10.0K Sep 19 00:28 mosdns.yaml
   8.0K -rwxrwxrwx    1 0        0           5.7K Sep 19 00:28 redis.conf
 976.0K -rwxrwxrwx    1 0        0         974.5K Sep 19 15:31 redis_dns_v2.rdb
  16.0K -rwxrwxrwx    1 0        0          13.8K Sep 19 00:29 trackerslist.txt
  52.0K -rwxrwxrwx    1 0        0          50.9K Sep 19 00:28 unbound.conf
   4.0K -rwxrwxrwx    1 0        0            289 Sep 19 00:27 unbound_custom.conf
*********************************************************************************

[INFO] PS
*********************************************************************************

PID   USER     TIME  COMMAND
    1 root      0:00 {init.sh} /bin/sh /usr/sbin/init.sh
   49 root      0:00 crond
   82 root      0:00 redis-server unixsocket:/tmp/redis.sock
  230 root      0:00 dnscrypt-proxy -config /data/dnscrypt-resolvers/dnscrypt.toml
  246 root      0:00 unbound -c /tmp/unbound_forward.conf -p
  266 root      0:00 {watch_list.sh} /bin/sh /usr/sbin/watch_list.sh
  269 root      0:00 unbound -c /tmp/unbound_raw.conf -p
  271 root      0:00 tail -f /dev/null
  522 root      0:00 /usr/sbin/mosdns start -d /data -c /tmp/mosdns.yaml
  571 root      0:00 inotifywait -e modify,delete /etc/unbound/named.cache /data/Country-only-cn-private.mmdb /data/fo
  578 root      0:00 /bin/sh
  684 root      0:00 {debug.sh} /bin/sh /usr/sbin/debug.sh
  701 root      0:00 ps -ef
  269 root      0:00 unbound -c /tmp/unbound_raw.conf -p
unbound OK.
  246 root      0:00 unbound -c /tmp/unbound_forward.conf -p
unbound_forward OK.
*********************************************************************************

[INFO] TOP
*********************************************************************************

CPU:   0% usr   0% sys   0% nic 100% idle   0% io   0% irq   0% sirq
  PID  PPID USER     STAT   VSZ %VSZ CPU %CPU COMMAND
  269     1 root     S    2431m  14%   1   0% unbound -c /tmp/unbound_raw.conf -
  522   266 root     S    1211m   7%   0   0% /usr/sbin/mosdns start -d /data -c
  230     1 root     S    1210m   7%   1   0% dnscrypt-proxy -config /data/dnscr
  246     1 root     S     613m   4%   1   0% unbound -c /tmp/unbound_forward.co
   82     1 root     S    24132   0%   0   0% redis-server unixsocket:/tmp/redis
  578     0 root     S     1708   0%   1   0% /bin/sh
  266     1 root     S     1700   0%   0   0% {watch_list.sh} /bin/sh /usr/sbin/
    1     0 root     S     1648   0%   0   0% {init.sh} /bin/sh /usr/sbin/init.s
  684   578 root     S     1640   0%   0   0% {debug.sh} /bin/sh /usr/sbin/debug
  708   684 root     R     1636   0%   0   0% top -n1
  271     1 root     S     1628   0%   0   0% tail -f /dev/null
  709   684 root     S     1624   0%   1   0% grep %
  571   266 root     S     1084   0%   1   0% inotifywait -e modify,delete /etc/
   49     1 root     S      872   0%   1   0% crond
*********************************************************************************

[INFO] REDIS
*********************************************************************************

used_memory_human:2.12M
used_memory_rss_human:5.11M
used_memory_peak_human:2.14M
total_system_memory_human:15.50G
used_memory_lua_human:31.00K
used_memory_vm_total_human:63.00K
used_memory_scripts_human:181B
maxmemory_human:2.93G
(integer) 2659
*********************************************************************************

[TEST] IP ROUTE
*********************************************************************************

CN IP URL:
27.47.231.200
-
27.47.231.200
--
27.47.231.200
CN RAW-IP URL:
27.47.231.200
------------------
Non-CN IP URL:
-
185.81.28.250
--
185.81.28.250
Non-CN RAW-IP URL:
185.81.28.250
-
185.81.28.250
--
185.81.28.250
---
185.81.28.250
------------------
IP INFO:
2a0e:97c0:7d4:e265:81de:87d1:c4df:1479
SG,Singapore,undefined
ASN61112/Akile
HTTP/1.1 
Mozilla/5.0 Gecko/20100101 Firefox/120.0 https://github.com/kkkgo/PaoPaoDNS
Asia/Singapore Time: 9/19/2024, 3:49:41 PM
[INFO] force_recurse_list
domain:whoami.ds.akahelp.net
domain:whoami.03k.org
MOSDNS WHOAMI :
MOSDNS akahelp: "ns" "27.47.231.200"
MOSDNS 03k: 27.47.231.200
UNBOUND WHOAMI:
UNBOUND akahelp: "ns" "27.47.231.200"
UNBOUND 03k: 27.47.231.200
*********************************************************************************

[TEST] HIJACK
*********************************************************************************

;; communications error to 9.8.7.5#53: timed out
;; no servers could be reached

;; communications error to 9.8.7.6#53: timed out
;; no servers could be reached

HIJACK 127.0.0.1 = 58.217.249.139
*********************************************************************************

[TEST] DIG-CN [taobao]
*********************************************************************************

MOSDNS CN:
www.taobao.com.danuoyi.tbcache.com.
163.177.180.94
163.177.180.95
UNBOUND CN:
www.taobao.com.danuoyi.tbcache.com.
163.177.180.95
163.177.180.94
[TEST] DIG-NOCN [youtube]
MOSDNS NOCN:
youtube-ui.l.google.com.
142.250.76.142
142.250.206.206
DNSCRYPT-UNBOUND NOCN:
youtube-ui.l.google.com.
142.250.68.46
142.251.40.46
DNSCRYPT NOCN:
youtube-ui.l.google.com.
142.250.179.174
142.250.179.206
DNSCRYPT-SOCKS5 NOCN:
;; communications error to 127.0.0.1#5303: connection refused
;; no servers could be reached

*********************************************************************************

[TEST] DUAL CN [IPv6=YES will have aaaa,taobao]
*********************************************************************************

www.taobao.com.danuoyi.tbcache.com.
2408:8756:92fc:f001:3::7e1
2408:8756:92fc:f001:3::7e2
[TEST] DUAL NOCN [IPv6=YES will block aaaa,youtube]
[TEST] ONLY6 [IPv6=only6 will block aaaa if a ok]
checkipv6.synology.com : ddns-checkipv6.quickconnect.to.
checkipv6.digitalocean.synology.com.
2604:a880:2:d0::4c0:2001
2604:a880:2:d0::17e8:4001
ip6.03k.org : 2606:4700:3037::ac43:c96c
2606:4700:3034::6815:15ef
6.ipw.cn : 2400:8905::f03c:94ff:fe1c:a95e

*********************************************************************************

[info] ALL TEST FINISH.

-> debug end `1726732185`

问题描述和复现步骤

如题。文档中描述【DNSPORT:设置DNS服务器端口,仅在CNAUTO=no时生效】,如果要添加ADG,宿主53端口会冲突,此时只能修改PaoDNS的端口,在使用CNAUTO的前提下,设置DNSPORT是否会生效?以及对应的其他端口在DNSPORT另行设置后会如何对应变更?谢谢。

asipirin1120 commented 1 month ago

噢,宿主改就行,容器不用管。一时间没反应过来。没事了。