Merge branch 'master' into master

.github/workflows/prcheck.sh

@@ -1,5 +1,48 @@
 #! /bin/sh
 
+DNSLOOKUP_VERSION=1.4.5
+
+case "$(uname -ms)" in
+Darwin\ x86_64) DNSLOOKUP_ARCH=darwin-amd64 ;;
+Linux\ x86_64) DNSLOOKUP_ARCH=linux-amd64 ;;
+*)
+    echo "Unsupported platform" >&2
+    exit 2
+    ;;
+esac
+
+if [ ! -x "${DNSLOOKUP_ARCH}/dnslookup" ]; then
+    curl -sL https://github.com/ameshkov/dnslookup/releases/download/v${DNSLOOKUP_VERSION}/dnslookup-${DNSLOOKUP_ARCH}-v${DNSLOOKUP_VERSION}.tar.gz | tar xzpf - || exit 1
+fi
+PATH="$(pwd)/${DNSLOOKUP_ARCH}:$PATH"
+
+try_resolver() {
+    ERROR_LOG_TMP=".errors"
+    resolver_name="$1"
+    stamp="$2"
+    if dnslookup one.net "$line" >/dev/null 2>&1; then
+        echo "pass: ${resolver_name}"
+    elif dnslookup one.net "$line" >/dev/null 2>&1; then
+        echo "pass: ${resolver_name} (1 retry)"
+    elif dnslookup one.net "$line" >/dev/null 2>&1; then
+        echo "pass: ${resolver_name} (2 retries)"
+    elif dnslookup one.net "$line" >/dev/null 2>"$ERROR_LOG_TMP"; then
+        echo "pass: ${resolver_name} (3 retries)"
+    else
+        if grep -Eq "(no route|unreachable)" "$ERROR_LOG_TMP"; then
+            echo "ipv6: ${resolver_name}"
+        else
+            (
+                echo "* FAILED: ${resolver_name}"
+                echo "$stamp"
+                cat "$ERROR_LOG_TMP"
+                echo
+            ) >&2
+            return 1
+        fi
+    fi
+}
+
 for aux in v3/parental-control.md v3/opennic.md; do
     grep '^## ' "$aux" | while read -r entry; do
         if ! grep -Fq "$entry" v3/public-resolvers.md; then
@@ -44,6 +87,9 @@ while read -r stamp; do
     echo "* Checking resolver with stamp:"
     echo "$stamp"
     echo
+
+    try_resolver "(new entry)" "$stamp"
+
     {
         echo 'listen_addresses = ["127.0.0.1:5300"]'
         echo 'server_names = ["test"]'
@@ -53,9 +99,12 @@ while read -r stamp; do
     ./dnscrypt-proxy -config "$CONFIG" -pidfile "$PIDFILE" -logfile "$LOGFILE" -loglevel 1 &
     sleep 5
     skip_log=false
-    if grep -q 'ERROR.*\[.*:.*]:' "$LOGFILE"; then
+    if grep -q 'DNSCrypt relay' "$LOGFILE"; then
         echo "(skipping due to IPv6 not being supported by GitHub Actions)"
         skip_log=true
+    elif grep -q 'ERROR.*\[.*:.*]:' "$LOGFILE"; then
+        echo "(skipping due to relays not being handled by this test)"
+        skip_log=true
     elif ! ./dnscrypt-proxy -config "$CONFIG" -resolve example.com; then
         echo "** UNABLE TO GET A RESPONSE FROM THE RESOLVER **"
         echo "Bogus stamp: ${stamp}"

v1/dnscrypt-resolvers.csv

@@ -83,8 +83,8 @@ id-gmail-ipv6,id-gmail-ipv6,Non-Logging DNSCrypt (IPv6) server located in Singap
 jitender,jitender,"DNSCrypt resolver in Hyderabad, India, Oracle Cloud",,,,2,yes,yes,no,152.67.165.26,2.dnscrypt-cert.jit.ddns.net,0506:E6CA:3825:E6FC:B334:27BB:B3A5:9725:C93D:6594:78DB:9F8D:CC30:0FEB:75E2:8F90,
 jp.tiar.app,jp.tiar.app,"Non-Logging, Non-Filtering DNSCrypt server in Japan.",,,,2,yes,yes,no,172.104.93.80:1443,2.dnscrypt-cert.jp.tiar.app,32B8:763E:F1BF:6536:A1DE:6A13:C0CD:6F48:A179:E388:B699:A537:8D6D:5B3C:4CDF:5453,
 jp.tiar.app-ipv6,jp.tiar.app-ipv6,"Non-Logging, Non-Filtering DNSCrypt (IPv6) server in Japan.",,,,2,yes,yes,no,[2400:8902::f03c:91ff:feda:c514]:1443,2.dnscrypt-cert.jp.tiar.app,32B8:763E:F1BF:6536:A1DE:6A13:C0CD:6F48:A179:E388:B699:A537:8D6D:5B3C:4CDF:5453,
-meganerd,meganerd,DNSCrypt server by MegaNerd.nl (IPv4) - https://meganerd.nl/encrypted-dns-server,,,,2,yes,yes,no,136.244.97.114,2.dnscrypt-cert.meganerd,FCAA:DC70:4E5E:E360:BBA1:4EE2:953B:D528:BA09:357A:90F0:FCE4:D03A:0138:6BFF:AB62,
+meganerd,meganerd,DNSCrypt server by MegaNerd.nl (IPv4) - https://meganerd.nl/encrypted-dns-server,,,,2,yes,yes,no,136.244.97.114:443,2.dnscrypt-cert.meganerd,FCAA:DC70:4E5E:E360:BBA1:4EE2:953B:D528:BA09:357A:90F0:FCE4:D03A:0138:6BFF:AB62,
-meganerd-ipv6,meganerd-ipv6,DNSCrypt server by MegaNerd.nl (IPv6) - https://meganerd.nl/encrypted-dns-server,,,,2,yes,yes,no,[2001:19f0:5001:cbb:5400:3ff:fe07:f70d],2.dnscrypt-cert.meganerd,FCAA:DC70:4E5E:E360:BBA1:4EE2:953B:D528:BA09:357A:90F0:FCE4:D03A:0138:6BFF:AB62,
+meganerd-ipv6,meganerd-ipv6,DNSCrypt server by MegaNerd.nl (IPv6) - https://meganerd.nl/encrypted-dns-server,,,,2,yes,yes,no,[2001:19f0:5001:cbb:5400:3ff:fe07:f70d]:443,2.dnscrypt-cert.meganerd,FCAA:DC70:4E5E:E360:BBA1:4EE2:953B:D528:BA09:357A:90F0:FCE4:D03A:0138:6BFF:AB62,
 moulticast-ca-ipv4,moulticast-ca-ipv4,Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Canada | Operated by @herver (Github) | https://moulticast.net/dnscrypt/,,,,2,yes,yes,no,149.56.14.159,2.dnscrypt-cert.moulticast-ca,82A5:4D42:BB30:CE80:9CFB:DDE1:767A:2623:4530:9580:B7AB:CD25:47DF:BBF4:C102:DF15,
 moulticast-ca-ipv6,moulticast-ca-ipv6,Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Canada | Operated by @herver (Github) | https://moulticast.net/dnscrypt/,,,,2,yes,yes,no,[2607:5300:201:3100::3dfb],2.dnscrypt-cert.moulticast-ca,82A5:4D42:BB30:CE80:9CFB:DDE1:767A:2623:4530:9580:B7AB:CD25:47DF:BBF4:C102:DF15,
 moulticast-de-ipv4,moulticast-de-ipv4,Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Germany | Operated by @herver (Github) | https://moulticast.net/dnscrypt/,,,,2,yes,yes,no,51.195.117.26,2.dnscrypt-cert.moulticast-de,2343:76CB:DF97:ABFF:B955:B178:DEBC:45EA:ED74:455E:4BA6:1069:45A4:D135:9B80:3A70,

v1/dnscrypt-resolvers.csv.minisig

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i5zQ0JLrwk7Lst3Eb1LtHI40Y3+UgUa0fk6larenBXzrH3o8zkjIf+JFdYlnqDOs0UmOsJSd4Wt6ECLK/rXi1mwM=
+RWQf6LRCGA9i56lovRtWIMhLjRdfFS8AAXlRXsYYiytQO/SW1uudBwiyD4Aev/dNl4VQk/v+enRwq2uLDtdzvk3RU5PrEmLYiQw=
-trusted comment: timestamp:1613921165	file:dnscrypt-resolvers.csv
+trusted comment: timestamp:1614095736	file:dnscrypt-resolvers.csv
-HLePIw1xhLABt+PUXEpx4iXOF4xHS8N4JvQWgI8O1J9EmgsO4Jh02qg8wUi2jnvoVTwUbtLiCL0IkFPJtn2IAw==
+z6/2B8F1GVLVeo4Iay1h1TpsZHqIWRdl2uE5iuN+PXVmNmB7ZZhwNONYYA5pvg7WspFWYFAM78ioOGd7qF/XAQ==

v2/public-resolvers.md

@@ -1496,7 +1496,7 @@ Hosted in Amsterdam (AMS1), The Netherlands.
 
 Non-logging, non-filtering, supports DNSSEC.
 
-sdns://AQcAAAAAAAAADjEzNi4yNDQuOTcuMTE0IPyq3HBOXuNgu6FO4pU71Si6CTV6kPD85NA6AThr_6tiGDIuZG5zY3J5cHQtY2VydC5tZWdhbmVyZA
+sdns://AQcAAAAAAAAAEjEzNi4yNDQuOTcuMTE0OjQ0MyD8qtxwTl7jYLuhTuKVO9Uougk1epDw_OTQOgE4a_-rYhgyLmRuc2NyeXB0LWNlcnQubWVnYW5lcmQ
 
 
 ## meganerd-doh-ipv4
@@ -1526,7 +1526,7 @@ Hosted in Amsterdam (AMS1), The Netherlands.
 
 Non-logging, non-filtering, supports DNSSEC.
 
-sdns://AQcAAAAAAAAAJ1syMDAxOjE5ZjA6NTAwMTpjYmI6NTQwMDozZmY6ZmUwNzpmNzBkXSD8qtxwTl7jYLuhTuKVO9Uougk1epDw_OTQOgE4a_-rYhgyLmRuc2NyeXB0LWNlcnQubWVnYW5lcmQ
+sdns://AQcAAAAAAAAAK1syMDAxOjE5ZjA6NTAwMTpjYmI6NTQwMDozZmY6ZmUwNzpmNzBkXTo0NDMg_KrccE5e42C7oU7ilTvVKLoJNXqQ8Pzk0DoBOGv_q2IYMi5kbnNjcnlwdC1jZXJ0Lm1lZ2FuZXJk
 
 
 ## moulticast-ca-ipv4

v2/public-resolvers.md.minisig

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i56QOLWKMyuu370iOScHByU6wk3L11xGjzXYZK5zr2Sniigf0A8dGeDBHm70cRwX7sq2CHxcdR7qUXpmOP0D1NQo=
+RWQf6LRCGA9i55DnsLfUU4/Th+i/SSh8miXLF1AtHsdiT32Phh7lguOMquRRdf7qLbzEWcEy0Mhj3BVBd/oHCDwJaKYCUi208wI=
-trusted comment: timestamp:1613921165	file:public-resolvers.md
+trusted comment: timestamp:1614095736	file:public-resolvers.md
-HQjLkaAk6F9UBNW1TNKIzVF+UNHEw+bgLuDQHH0yhxHLHR/1/Lh0MnNW+Q/yL5wwZIwTm7x3QmmhF+p2tH4JCA==
+lfpsC1TcJ3hbzBP59gYo/0/OxtRzwzwDQ5W3VyhnW5chtUoNbmORQJVBR3vcNMpc96Q3FN20/A7egO7WQCatBg==

v2/relays.md

@@ -27,13 +27,6 @@ Anonymized DNS relay hosted in AMS on Scaleway
 sdns://gRZbMjAwMTpiYzg6MTgyNDo3Mzg6OjFd
 
 
-## anon-ams-nl
-
-Anonymized DNS relay hosted in Netherlands - NL
-
-sdns://gRI1MS4xNS4xMjQuMjA4OjQzNDM
-
-
 ## anon-ams-nl-ipv6
 
 Anonymized DNS relay hosted in Netherlands - NL
@@ -104,13 +97,6 @@ Anonymized DNS relay hosted in Rotterdam, Netherlands provided by https://crypto
 sdns://gQ4yMTMuMTYzLjY0LjIwOA
 
 
-## anon-cs-pt
-
-Anonymized DNS relay hosted in Lisbon, Portugal provided by https://cryptostorm.is/
-
-sdns://gQ0xMDkuNzEuNDIuMjI4
-
-
 ## anon-cs-se
 
 Anonymized DNS relay hosted in Stockholm, Sweden provided by https://cryptostorm.is/
@@ -207,14 +193,14 @@ sdns://gQ4xMzcuNzQuMjIzLjIzNA
 
 Anonymized DNS relay hosted by MegaNerd.nl (IPv4) (https://www.meganerd.nl/encrypted-dns-server) in Amsterdam, The Netherlands (AMS1)
 
-sdns://gQ4xMzYuMjQ0Ljk3LjExNA
+sdns://gRIxMzYuMjQ0Ljk3LjExNDo0NDM
 
 
 ## anon-meganerd-ipv6
 
 Anonymized DNS relay hosted by MegaNerd.nl (IPv6) (https://www.meganerd.nl/encrypted-dns-server) in Amsterdam, The Netherlands (AMS1)
 
-sdns://gSdbMjAwMToxOWYwOjUwMDE6Y2JiOjU0MDA6M2ZmOmZlMDc6ZjcwZF0
+sdns://gStbMjAwMToxOWYwOjUwMDE6Y2JiOjU0MDA6M2ZmOmZlMDc6ZjcwZF06NDQz
 
 
 ## anon-plan9-dns

v2/relays.md.minisig

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i52XyjnoGBQP2lMTFlBSKYC9UQDrG8pxs0/WtmGVl/WPtSAUVVdAimzGnVr56TGuddTtwdvEVYL5p/GYMlKY6QwQ=
+RWQf6LRCGA9i5xSExl6DQH+ag4tcqxYiuA+dzLnoAMtpavcHigQNenVQUdwsqdJaT9M7Iy/npyEBnRFVztjCZjvjAZTd9LI8tw4=
-trusted comment: timestamp:1612029343	file:relays.md
+trusted comment: timestamp:1614096984	file:relays.md
-eR3thllCyOaJpSko/gqtWWyrDGY42RjquUXCOzqotVi7QTCxuHMsOsdf1HMtFfyD5t0Ts8Bby87GIgHrYR4CDQ==
+pQuTFJ7lfMIKbiPjjPe1b135aUL7xIio9I0MsoEYfpm0Z7mi0oMEmr/XM6AbrGXFg93KO+MgefuPhjcSrIjtCQ==

v3/public-resolvers.md

@@ -1526,7 +1526,7 @@ Hosted in Amsterdam (AMS1), The Netherlands.
 
 Non-logging, non-filtering, supports DNSSEC.
 
-sdns://AQcAAAAAAAAADjEzNi4yNDQuOTcuMTE0IPyq3HBOXuNgu6FO4pU71Si6CTV6kPD85NA6AThr_6tiGDIuZG5zY3J5cHQtY2VydC5tZWdhbmVyZA
+sdns://AQcAAAAAAAAAEjEzNi4yNDQuOTcuMTE0OjQ0MyD8qtxwTl7jYLuhTuKVO9Uougk1epDw_OTQOgE4a_-rYhgyLmRuc2NyeXB0LWNlcnQubWVnYW5lcmQ
 
 
 ## meganerd-doh-ipv4
@@ -1556,7 +1556,7 @@ Hosted in Amsterdam (AMS1), The Netherlands.
 
 Non-logging, non-filtering, supports DNSSEC.
 
-sdns://AQcAAAAAAAAAJ1syMDAxOjE5ZjA6NTAwMTpjYmI6NTQwMDozZmY6ZmUwNzpmNzBkXSD8qtxwTl7jYLuhTuKVO9Uougk1epDw_OTQOgE4a_-rYhgyLmRuc2NyeXB0LWNlcnQubWVnYW5lcmQ
+sdns://AQcAAAAAAAAAK1syMDAxOjE5ZjA6NTAwMTpjYmI6NTQwMDozZmY6ZmUwNzpmNzBkXTo0NDMg_KrccE5e42C7oU7ilTvVKLoJNXqQ8Pzk0DoBOGv_q2IYMi5kbnNjcnlwdC1jZXJ0Lm1lZ2FuZXJk
 
 
 ## moulticast-ca-ipv4

v3/public-resolvers.md.minisig

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i56ZmENfAea8vuit4T08/DpohtTwm0lizt16g9f2TV/s4GBrh5CgFftaKY8ngPhY2WvbkY/e6d0ZwBEKxdu+AtgE=
+RWQf6LRCGA9i53Ukx13HVE5m9kgrhi7/pnIVQx9PAg05ys6q3Wkov8SM/RCz/gwn2/Grk3f5ET7KUMiAu0tgKhLXX4XXmvTqGgk=
-trusted comment: timestamp:1613921165	file:public-resolvers.md
+trusted comment: timestamp:1614095736	file:public-resolvers.md
-mUjkeFVgWXqmEGwUghDYQ3B0j9HlNFHSmdu7rvMspPf9lMpzkxf5P4sENKltnxeKB4DyWNjAWbE1xi9ivylfAw==
+q/OuWh2kBZaCEOfzhcgJyDfMyny/jpHPlc+3Hf/oZnm57z/+Uh9dnOhg7NEBaBCkVafLF9LDsWB2xpJzd0PfBg==

v3/relays.md

@@ -26,13 +26,6 @@ Anonymized DNS relay hosted in AMS on Scaleway
 sdns://gRZbMjAwMTpiYzg6MTgyNDo3Mzg6OjFd
 
 
-## anon-ams-nl
-
-Anonymized DNS relay hosted in Netherlands - NL
-
-sdns://gRI1MS4xNS4xMjQuMjA4OjQzNDM
-
-
 ## anon-ams-nl-ipv6
 
 Anonymized DNS relay hosted in Netherlands - NL
@@ -103,13 +96,6 @@ Anonymized DNS relay hosted in Rotterdam, Netherlands provided by https://crypto
 sdns://gQ4yMTMuMTYzLjY0LjIwOA
 
 
-## anon-cs-pt
-
-Anonymized DNS relay hosted in Lisbon, Portugal provided by https://cryptostorm.is/
-
-sdns://gQ0xMDkuNzEuNDIuMjI4
-
-
 ## anon-cs-se
 
 Anonymized DNS relay hosted in Stockholm, Sweden provided by https://cryptostorm.is/
@@ -206,14 +192,14 @@ sdns://gQ4xMzcuNzQuMjIzLjIzNA
 
 Anonymized DNS relay hosted by MegaNerd.nl (IPv4) (https://www.meganerd.nl/encrypted-dns-server) in Amsterdam, The Netherlands (AMS1)
 
-sdns://gQ4xMzYuMjQ0Ljk3LjExNA
+sdns://gRIxMzYuMjQ0Ljk3LjExNDo0NDM
 
 
 ## anon-meganerd-ipv6
 
 Anonymized DNS relay hosted by MegaNerd.nl (IPv6) (https://www.meganerd.nl/encrypted-dns-server) in Amsterdam, The Netherlands (AMS1)
 
-sdns://gSdbMjAwMToxOWYwOjUwMDE6Y2JiOjU0MDA6M2ZmOmZlMDc6ZjcwZF0
+sdns://gStbMjAwMToxOWYwOjUwMDE6Y2JiOjU0MDA6M2ZmOmZlMDc6ZjcwZF06NDQz
 
 
 ## anon-plan9-dns

v3/relays.md.minisig

@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i5xoxP9jnXvcFqMom/IjB6C+pXyus2KMA/KbV19zT5yZyW9+U7lKpapOE3ewPpPg4zKbsigF0Vk79TPzcg4z7IAc=
+RWQf6LRCGA9i5yCBbkKVV+oKz3/8grhNuM/WqDuEWR23Bhw1bv0xrWMEn5qU1LqCuqFf2Mai3XScfw5+1W2ch/2b3uPTbELTsAk=
-trusted comment: timestamp:1612029343	file:relays.md
+trusted comment: timestamp:1614096984	file:relays.md
-Uqo/W7MpemURyVjRV35U5YYlWEfT7je6fttwNI8/C8RgmH6lWMWWKSc3d3PzO5Nt+91nZDE1hQ8ATaFc4bbrBA==
+FtlbVZzIZUUOAj79nh/1EqIoAR3W+hm32WIGx708qbebYvZHMbam/dquJt7xDvNbId+o94U7Vds9IKnxikGNDw==