Mail archive
alpine-devel

Re: [alpine-devel] [PATCH] testing/dnscrypt-proxy: Updated DNS server list

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Sun, 20 Apr 2014 12:32:53 +0200

Why is the list hardcoded into a script? Why is it not fetched from
some place so we don't need to update the script every time the list
needs modification? (eg separation of code and data)

fcolista: could you please have a look at this?

-nc



On Fri, 18 Apr 2014 16:04:02 +0000
Stuart Cardall <developer_at_it-offshore.co.uk> wrote:

> Updated the DNS server list in /sbin/setup-dnscrypt - there are now
> 17 servers to choose from (ipv4 / ipv6 / tor.onion).
>
> Small change in setup-dnscrypt to set /etc/resolv.conf correctly if
> unbound is not used as a caching dns server.
> ---
> testing/dnscrypt-proxy/APKBUILD | 8 +--
> testing/dnscrypt-proxy/dnscrypt-proxy.setup | 87 +++++++++++++++++++++--------
> 2 files changed, 67 insertions(+), 28 deletions(-)
>
> diff --git a/testing/dnscrypt-proxy/APKBUILD b/testing/dnscrypt-proxy/APKBUILD
> index a8cbd7e..7b569a6 100644
> --- a/testing/dnscrypt-proxy/APKBUILD
> +++ b/testing/dnscrypt-proxy/APKBUILD
> _at_@ -2,7 +2,7 @@
> # Maintainer: Francesco Colista <francesco.colista_at_gmail.com>
> pkgname=dnscrypt-proxy
> pkgver=1.3.3
> -pkgrel=1
> +pkgrel=2
> pkgdesc="A tool for securing communications between a client and a DNS resolver"
> url="http://dnscrypt.org/"
> arch="x86"
> _at_@ -55,12 +55,12 @@ package() {
> md5sums="6a10b1d6018bfeed9a6dbc3b49cc39d8 dnscrypt-proxy-1.3.3.tar.gz
> fc51d5d38e7f3066221300fff821d81f dnscrypt-proxy.initd
> 223bc3032b229ca961bec2a3f3c44d4d dnscrypt-proxy.confd
> -b24f47765020c342ba6df8c65f4f593d dnscrypt-proxy.setup"
> +d4bfabd4695c521f38e67aed6d45a8ec dnscrypt-proxy.setup"
> sha256sums="b797b1cc2ce6b7a01bc8a8d119367971f0cff20beea506cd0aeaa613fd5eaa24 dnscrypt-proxy-1.3.3.tar.gz
> a56cb07b4bcedd0e9bb994f93f5f721c276ba61b576c3059a1bfad4e56c786ac dnscrypt-proxy.initd
> 8291300235a79932ce753f948f850d0817f374159f28bfbbf527f8a3dcefb1c7 dnscrypt-proxy.confd
> -1b07365a4859ba94fa39cf1ed017744995876f75cbfc62b9865401b41723f96e dnscrypt-proxy.setup"
> +06c7f329377e62b1a6ce7e56b798631fe7163f404cd011d384e1ace5aa850467 dnscrypt-proxy.setup"
> sha512sums="e0d668446eaf65dce358b6d90fc7cf9905e49e267f0ff6c4d399c54b4ccc13d1c9f9622ac68f5fd992ce0b0c275b4e07bd98bc35404c822f521f20a244287dce dnscrypt-proxy-1.3.3.tar.gz
> e5516c7e1fd6baf391059407aee65a837c7324698f15a675d0368fd34de10f023fe39671e95bc951bee260254fb4e3613fde6045cdf2faf085f322b769969864 dnscrypt-proxy.initd
> 70be47b2954bb95341a678b3e6d68c8684e16644b8162b52c736fbac314928e1fa1d7fa9f97b4034b38d443808526fecd833b1d356df1a5e74a443e96e97d8e5 dnscrypt-proxy.confd
> -9161f14bee77b935fd12fa36ed60a2dd5c74c761eb75804ddb661eabc8f1cf7dd2b6506665dbc2e0f2f92540cb18e56463409c5ec5a9ceb55635bd0aba28d949 dnscrypt-proxy.setup"
> +099cc86753b905dc6f38c21ef1d9950b28594166799940a78e6f47b13583954cdf5e84a92d7ad712223d95ad637847580583c49226118c9bc4933b84e3f2fc2b dnscrypt-proxy.setup"
> diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.setup b/testing/dnscrypt-proxy/dnscrypt-proxy.setup
> index 736d94d..7c15408 100644
> --- a/testing/dnscrypt-proxy/dnscrypt-proxy.setup
> +++ b/testing/dnscrypt-proxy/dnscrypt-proxy.setup
> _at_@ -125,17 +125,26 @@ fi
>
> clear;
> print_table "\n DNSCRYPT-PROXY MANAGER"
> -print_green "-----------------------------------------------------------------"
> -print_table "1:" "OpenDNS"
> -print_table "2:" "Cloud NS\t\t : Canberra, Australia" "(No Logs, DNSSEC)"
> -print_table "3:" "Cloud NS\t\t : Canberra" "(over TOR .onion:443)"
> -print_table "4:" "Cloud NS\t\t : Sydney, Australia" "(No Logs, DNSSEC)"
> -print_table "5:" "Cloud NS\t\t : Sydney" "(over TOR .onion:443)"
> -print_table "6:" "OpenNIC\t\t : Japan" "(No Logs)"
> -print_table "7:" "DNSCrypt.eu\t\t : Holland" "(No logs, DNSSEC)"
> -print_table "8:" "Soltysiak.com\t : Poland" "(No logs, DNSSEC)"
> -print_green "-----------------------------------------------------------------"
> -print_question "Please choose a DNS Resolver for dnscrypt-proxy to query" "[1 - 8]:"
> +print_green "------------------------------------------------------------------------"
> +print_table "1:" " OK Turtle\t\t : DNSChains Project www.okturtles.com" "(No Logs)"
> +print_table "2:" " OpenDNS"
> +print_table "3:" " Cloud NS\t\t : Canberra, Australia" " (No Logs, DNSSEC)"
> +print_table "4:" " Cloud NS\t\t : Canberra" " (over TOR .onion:443)"
> +print_table "5:" " Cloud NS\t\t : Sydney, Australia" " (No Logs, DNSSEC)"
> +print_table "6:" " Cloud NS\t\t : Sydney" " (over TOR .onion:443)"
> +print_table "7:" " OpenNIC\t\t : Japan" " (No Logs)"
> +print_table "8:" " OpenNIC\t\t : UK (ns8)" " (No Logs)"
> +print_table "9:" " OpenNIC\t\t : UK (ns9)" " (No Logs)"
> +print_table "10:" "OpenNIC\t\t : UK (ns10)" " (No Logs)"
> +print_table "11:" "OpenNIC\t\t : USA (Fremont #1)" " IP4 (No Logs)"
> +print_table "12:" "OpenNIC\t\t : USA (Fremont #2)" " *IP6* (No Logs)"
> +print_table "13:" "DNSCrypt.eu\t\t : Holland" " IP4 (No logs, DNSSEC)"
> +print_table "14:" "DNSCrypt.eu\t\t : Holland" " *IP6* (No logs, DNSSEC)"
> +print_table "15:" "DNSCrypt.eu\t\t : Denmark" " IP4 (No logs, DNSSEC)"
> +print_table "16:" "DNSCrypt.eu\t\t : Denmark" " *IP6* (No logs, DNSSEC)"
> +print_table "17:" "Soltysiak.com\t : Poland" " (No logs, DNSSEC)"
> +print_green "------------------------------------------------------------------------"
> +print_question "Please choose a DNS Resolver for dnscrypt-proxy to query" "[1 - 17]:"
>
>
> until [ "$DNS" -gt 0 ] 2>/dev/null
> _at_@ -144,30 +153,57 @@ do
> read DNS
>
> case $DNS in
> - 1) RESOLVER=208.67.220.220:443;
> - PROVIDER=2.dnscrypt-cert.opendns.com
> + 1) RESOLVER=23.226.227.93:443;
> + PROVIDER=2.dnscrypt-cert.okturtles.com;
> + PUBKEY=1D85:3953:E34F:AFD0:05F9:4C6F:D1CC:E635:D411:9904:0D48:D19A:5D35:0B6A:7C81:73CB;;
> + 2) RESOLVER=208.67.220.220:443;
> + PROVIDER=2.dnscrypt-cert.opendns.com;
> PUBKEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79;;
> - 2) RESOLVER=113.20.6.2:443;
> + 3) RESOLVER=113.20.6.2:443;
> PROVIDER=2.dnscrypt-cert.cloudns.com.au;
> PUBKEY=1971:7C1A:C550:6C09:F09B:ACB1:1AF7:C349:6425:2676:247F:B738:1C5A:243A:C1CC:89F4;;
> - 3) RESOLVER=gc2tzw6lbmeagrp3.onion:443;
> + 4) RESOLVER=gc2tzw6lbmeagrp3.onion:443;
> PROVIDER=2.dnscrypt-cert.cloudns.com.au;
> PUBKEY=1971:7C1A:C550:6C09:F09B:ACB1:1AF7:C349:6425:2676:247F:B738:1C5A:243A:C1CC:89F4;;
> - 4) RESOLVER=113.20.8.17:443;
> + 5) RESOLVER=113.20.8.17:443;
> PROVIDER=2.dnscrypt-cert-2.cloudns.com.au;
> PUBKEY=67A4:323E:581F:79B9:BC54:825F:54FE:1025:8B4F:37EB:0D07:0BCE:4010:6195:D94F:E330;;
> - 5) RESOLVER=l65q62lf7wnfme7m.onion:443;
> + 6) RESOLVER=l65q62lf7wnfme7m.onion:443;
> PROVIDER=2.dnscrypt-cert-2.cloudns.com.au;
> PUBKEY=67A4:323E:581F:79B9:BC54:825F:54FE:1025:8B4F:37EB:0D07:0BCE:4010:6195:D94F:E330;;
> - 6) RESOLVER=106.186.17.181:2053;
> + 7) RESOLVER=106.186.17.181:2053;
> PROVIDER=2.dnscrypt-cert.ns2.jp.dns.opennic.glue;
> PUBKEY=8768:C3DB:F70A:FBC6:3B64:8630:8167:2FD4:EE6F:E175:ECFD:46C9:22FC:7674:A1AC:2E2A;;
> - 7) RESOLVER=176.56.237.171:443;
> - PROVIDER=2.dnscrypt-cert.dnscrypt.eu;
> - PUBKEY=67C0:0F2C:21C5:5481:45DD:7CB4:6A27:1AF2:EB96:9931:40A3:09B6:2B8D:1653:1185:9C66;;
> - 8) RESOLVER=178.216.201.222:2053;
> - PROVIDER=2.dnscrypt-cert.soltysiak.com;
> - PUBKEY=25C4:E188:2915:4697:8F9C:2BBD:B6A7:AFA4:01ED:A051:0508:5D53:03E7:1928:C066:8F21;;
> + 8) RESOLVER=185.19.104.45:443;
> + PROVIDER=2.dnscrypt-cert.ns8.uk.dns.opennic.glue;
> + PUBKEY=A17C:06FC:BA21:F2AC:F4CD:9374:016A:684F:4F56:564A:EB30:A422:3D9D:1580:A461:B6A6;;
> + 9) RESOLVER=185.19.105.6:443;
> + PROVIDER=2.dnscrypt-cert.ns9.uk.dns.opennic.glue;
> + PUBKEY=E864:80D9:DFBD:9DB4:58EA:8063:292F:EC41:9126:8394:BC44:FAB8:4B6E:B104:8C3B:E0B4;;
> + 10) RESOLVER=185.19.105.14:443;
> + PROVIDER=2.dnscrypt-cert.ns10.uk.dns.opennic.glue;
> + PUBKEY=B1AB:7025:1119:9AEE:E42E:1B12:F2EF:12D4:53D9:CD92:E07B:9AF4:4794:F6EB:E5A4:F725;;
> + 11) RESOLVER=173.230.156.28:443;
> + PROVIDER=2.dnscrypt-cert.ns17.ca.us.dns.opennic.glue;
> + PUBKEY=2342:215C:409A:85A5:FB63:2A3B:42CD:5089:6BA8:551A:8BDC:2654:CF57:804F:B1B2:5019;;
> + 12) RESOLVER=[2600:3c01::f03c:91ff:fe6e:1f6b]:443;
> + PROVIDER=2.dnscrypt-cert.ns18.ca.us.dns.opennic.glue;
> + PUBKEY=689B:DAF2:6A9F:DB2D:42B4:AA15:1825:89E8:6FAE:0C2C:522A:D0AA:DD2B:80B4:8D61:0A43;;
> + 13) RESOLVER=176.56.237.171:443;
> + PROVIDER=2.dnscrypt-cert.dnscrypt.eu;
> + PUBKEY=67C0:0F2C:21C5:5481:45DD:7CB4:6A27:1AF2:EB96:9931:40A3:09B6:2B8D:1653:1185:9C66;;
> + 14) RESOLVER=[2a00:d880:3:1::a6c1:2e89]:443;
> + PROVIDER=2.dnscrypt-cert.dnscrypt.eu;
> + PUBKEY=67C0:0F2C:21C5:5481:45DD:7CB4:6A27:1AF2:EB96:9931:40A3:09B6:2B8D:1653:1185:9C66;;
> + 15) RESOLVER=77.66.84.233:443;
> + PROVIDER=2.dnscrypt-cert.resolver2.dnscrypt.eu;
> + PUBKEY=3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955;;
> + 16) RESOLVER=[2001:1448:243::dc2]:443;
> + PROVIDER=2.dnscrypt-cert.resolver2.dnscrypt.eu;
> + PUBKEY=3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955;;
> + 17) RESOLVER=178.216.201.222:2053;
> + PROVIDER=2.dnscrypt-cert.soltysiak.com;
> + PUBKEY=25C4:E188:2915:4697:8F9C:2BBD:B6A7:AFA4:01ED:A051:0508:5D53:03E7:1928:C066:8F21;;
> #check for numerical input
> ''|0|*[!0-9]*) print_question "Please choose a NUMERIC option:" "[1 - 8]" ;;
> *) if [ "$DNS" -gt 8 ]; then
> _at_@ -200,6 +236,9 @@ if ! which unbound 1> /dev/null; then
> read installsrv
> if [ "$installsrv" = "Y" ] || [ "$installsrv" = "y" ]; then
> apk add -q unbound
> + else
> + echo "127.0.0.1" > /etc/resolv.conf
> + exit 0
> fi
> fi
>



---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Sun Apr 20 2014 - 12:32:53 UTC