From da3bb1e80bc98f90d1128f332fc5ceecc20bf6d5 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 28 Dec 2021 22:14:18 +0000 Subject: [PATCH] luci-app-https-dns-proxy: add AhaDNS and minor fixes * Add AhaDNS: thanks to @Jefe777 (account now deleted) and their PR at https://github.com/openwrt/luci/pull/5612 * Update email addresses * Add missing new line to ControlD files * Add RPCD reload to uci-defaults file Signed-off-by: Stan Grishin --- .../luci-app-https-dns-proxy/Makefile | 6 +-- .../providers/com.controld.freedns.family.lua | 2 +- ...om.controld.freedns.malware-ads-social.lua | 2 +- .../com.controld.freedns.malware-ads.lua | 2 +- .../com.controld.freedns.malware.lua | 2 +- .../com.controld.freedns.unfiltered.lua | 2 +- .../providers/net.ahadns.au.doh.lua | 8 ++++ .../providers/net.ahadns.chi.doh.lua | 8 ++++ .../providers/net.ahadns.es.doh.lua | 8 ++++ .../providers/net.ahadns.in.doh.lua | 8 ++++ .../providers/net.ahadns.it.doh.lua | 8 ++++ .../providers/net.ahadns.la.doh.lua | 8 ++++ .../providers/net.ahadns.nl.doh.lua | 8 ++++ .../providers/net.ahadns.no.doh.lua | 8 ++++ .../providers/net.ahadns.ny.doh.lua | 8 ++++ .../providers/net.ahadns.pl.doh.lua | 8 ++++ .../luasrc/view/https-dns-proxy/buttons.htm | 2 +- .../po/templates/https-dns-proxy.pot | 40 +++++++++++++++++++ .../etc/uci-defaults/40_luci-https-dns-proxy | 1 + 19 files changed, 130 insertions(+), 9 deletions(-) create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua create mode 100644 applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index c85bb3264d..e1d81696c4 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -1,11 +1,11 @@ -# Copyright 2017-2018 Stan Grishin (stangri@melmac.net) +# Copyright 2017-2018 Stan Grishin (stangri@melmac.ca) # This is free software, licensed under the GNU General Public License v3. include $(TOPDIR)/rules.mk PKG_LICENSE:=GPL-3.0-or-later -PKG_MAINTAINER:=Stan Grishin -PKG_VERSION:=2021-07-29-1 +PKG_MAINTAINER:=Stan Grishin +PKG_VERSION:=2021-09-27-2 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua index 7275cbcc91..e28cb81323 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.family.lua @@ -5,4 +5,4 @@ return { bootstrap_dns = "76.76.2.4,2606:1a40::4", help_link = "https://kb.controld.com/tutorials", help_link_text = "ControlD" -} \ No newline at end of file +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua index bea84b4c15..4b8ee02729 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads-social.lua @@ -5,4 +5,4 @@ return { bootstrap_dns = "76.76.2.3,2606:1a40::3", help_link = "https://kb.controld.com/tutorials", help_link_text = "ControlD" -} \ No newline at end of file +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua index 5849cbd21c..947ed59a1c 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware-ads.lua @@ -5,4 +5,4 @@ return { bootstrap_dns = "76.76.2.2,2606:1a40::2", help_link = "https://kb.controld.com/tutorials", help_link_text = "ControlD" -} \ No newline at end of file +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua index c82a042ec9..77f062b1b4 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.malware.lua @@ -5,4 +5,4 @@ return { bootstrap_dns = "76.76.2.1,2606:1a40::1", help_link = "https://kb.controld.com/tutorials", help_link_text = "ControlD" -} \ No newline at end of file +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua index eb5bbbd87a..d4128df343 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.controld.freedns.unfiltered.lua @@ -5,4 +5,4 @@ return { bootstrap_dns = "76.76.2.0,2606:1a40::0", help_link = "https://kb.controld.com/tutorials", help_link_text = "ControlD" -} \ No newline at end of file +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua new file mode 100644 index 0000000000..7fdf97f899 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-au", + label = _("AhaDNS.com - Australia (Block Malware + Ads)"), + resolver_url = "https://doh.au.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua new file mode 100644 index 0000000000..0cc45add9d --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-chi", + label = _("AhaDNS.com - US/Chicago (Block Malware + Ads)"), + resolver_url = "https://doh.chi.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua new file mode 100644 index 0000000000..1550e99827 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-es", + label = _("AhaDNS.com - Spain (Block Malware + Ads)"), + resolver_url = "https://doh.es.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua new file mode 100644 index 0000000000..09a58ce54c --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-in", + label = _("AhaDNS.com - India (Block Malware + Ads)"), + resolver_url = "https://doh.in.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua new file mode 100644 index 0000000000..d167a15ef0 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-it", + label = _("AhaDNS.com - Italy (Block Malware + Ads)"), + resolver_url = "https://doh.it.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua new file mode 100644 index 0000000000..1b8ddb6cd5 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-la", + label = _("AhaDNS.com - US/Los Angeles (Block Malware + Ads)"), + resolver_url = "https://doh.la.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua new file mode 100644 index 0000000000..01421a87b5 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-nl", + label = _("AhaDNS.com - Netherlands (Block Malware + Ads)"), + resolver_url = "https://doh.nl.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua new file mode 100644 index 0000000000..93478e5b89 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-no", + label = _("AhaDNS.com - Norway (Block Malware + Ads)"), + resolver_url = "https://doh.no.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua new file mode 100644 index 0000000000..ca688de930 --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-ny", + label = _("AhaDNS.com - US/New York (Block Malware + Ads)"), + resolver_url = "https://doh.ny.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua new file mode 100644 index 0000000000..9b0539a6cc --- /dev/null +++ b/applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua @@ -0,0 +1,8 @@ +return { + name = "ahadns-doh-pl", + label = _("AhaDNS.com - Poland (Block Malware + Ads)"), + resolver_url = "https://doh.pl.ahadns.net/dns-query", + bootstrap_dns = "185.213.26.187,45.67.219.208,5.2.75.75,45.79.120.233,2a0d:5600:33:3::3,2a04:bdc7:100:70::70,2a04:52c0:101:75::75,2400:8904:e001:43::43", + help_link = "https://ahadns.com/dns-over-https/", + help_link_text = "AhaDNS.com" +} diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm index f10042a460..6a01206094 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm +++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm @@ -1,4 +1,4 @@ -<%# Copyright 2020 Stan Grishin -%> +<%# Copyright 2020 Stan Grishin -%> <%+https-dns-proxy/css%> <%+https-dns-proxy/js%> diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index b46a9498ba..ad50530d4c 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -17,6 +17,46 @@ msgstr "" msgid "AdGuard (Standard)" msgstr "" +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.au.doh.lua:3 +msgid "AhaDNS.com - Australia (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.in.doh.lua:3 +msgid "AhaDNS.com - India (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.it.doh.lua:3 +msgid "AhaDNS.com - Italy (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.nl.doh.lua:3 +msgid "AhaDNS.com - Netherlands (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.no.doh.lua:3 +msgid "AhaDNS.com - Norway (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.pl.doh.lua:3 +msgid "AhaDNS.com - Poland (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.es.doh.lua:3 +msgid "AhaDNS.com - Spain (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.chi.doh.lua:3 +msgid "AhaDNS.com - US/Chicago (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.la.doh.lua:3 +msgid "AhaDNS.com - US/Los Angeles (Block Malware + Ads)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.ahadns.ny.doh.lua:3 +msgid "AhaDNS.com - US/New York (Block Malware + Ads)" +msgstr "" + #: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/com.alidns.dns.lua:3 msgid "AliDNS" msgstr "" diff --git a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy index a1ecfcea24..b42fa5859f 100644 --- a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy +++ b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy @@ -1,3 +1,4 @@ #!/bin/sh rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache; +[ -x /etc/init.d/rpcd ] && /etc/init.d/rpcd reload exit 0 -- 2.30.2