From aee66ff094987f046fee2780e414150c1bf2b04d Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 29 Jul 2024 01:07:55 +0000 Subject: [PATCH] luci-app-https-dns-proxy: bugfix: OpenDNS family filter URL update * bugfix: update OpenDNS family filter URL * update copyright/license * update PKG_RELEASE to avoid double `r` on snapshots * add LUCI_URL to upstream repository * update README URL to upstream documentation * update pkg.URL property to allow linking to a specific version of README * remove duplicates of pkg object from overview.js/status include js files Signed-off-by: Stan Grishin (cherry picked from commit 9c836d14734f069421a459a63436d07cc91dd760) --- .../luci-app-https-dns-proxy/Makefile | 9 +- .../luci-app-https-dns-proxy/README.md | 4 + .../resources/https-dns-proxy/status.js | 15 ++- .../view/https-dns-proxy/overview.js | 29 +----- .../view/status/include/71_https-dns-proxy.js | 54 +---------- .../po/templates/https-dns-proxy.pot | 91 ++++++++++++++++++- .../providers/com.opendns.doh.json | 4 +- 7 files changed, 121 insertions(+), 85 deletions(-) create mode 100644 applications/luci-app-https-dns-proxy/README.md diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index f546806849..9ca8811899 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -1,15 +1,16 @@ -# Copyright 2017-2018 Stan Grishin (stangri@melmac.ca) -# This is free software, licensed under the GNU General Public License v3. +# Copyright 2017-2024 MOSSDeF, Stan Grishin (stangri@melmac.ca). +# This is free software, licensed under AGPL-3.0-or-later. include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-https-dns-proxy -PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE:=AGPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin PKG_VERSION:=2023.11.19 -PKG_RELEASE:=r3 +PKG_RELEASE:=4 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI +LUCI_URL:=https://github.com/stangri/luci-app-https-dns-proxy/ LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy LUCI_DEPENDS:=+luci-base +https-dns-proxy diff --git a/applications/luci-app-https-dns-proxy/README.md b/applications/luci-app-https-dns-proxy/README.md new file mode 100644 index 0000000000..a9e965270b --- /dev/null +++ b/applications/luci-app-https-dns-proxy/README.md @@ -0,0 +1,4 @@ +# README + +Documentation for this project is available at [https://docs.openwrt.melmac.net/luci-app-https-dns-proxy/](https://docs.openwrt.melmac.net/luci-app-https-dns-proxy/). + diff --git a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js index 0ae128b923..37675c5b83 100644 --- a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js +++ b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js @@ -13,8 +13,16 @@ var pkg = { get Name() { return "https-dns-proxy"; }, + get ReadmeCompat() { + return ""; + }, get URL() { - return "https://docs.openwrt.melmac.net/" + pkg.Name + "/"; + return ( + "https://docs.openwrt.melmac.net/" + + pkg.Name + + "/" + + (pkg.ReadmeCompat ? pkg.ReadmeCompat + "/" : "") + ); }, templateToRegexp: function (template) { return RegExp( @@ -30,6 +38,9 @@ var pkg = { "$" ); }, + templateToResolver: function (template, args) { + return template.replace(/{(\w+)}/g, (_, v) => args[v]); + }, }; var getInitList = rpc.declare({ @@ -428,6 +439,8 @@ RPC.on("setInitAction", function (reply) { return L.Class.extend({ status: status, + pkg: pkg, + getInitStatus: getInitStatus, getPlatformSupport: getPlatformSupport, getProviders: getProviders, getRuntime: getRuntime, diff --git a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js index 86cafd1030..5922a35279 100644 --- a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js +++ b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js @@ -11,34 +11,7 @@ "require view"; "require https-dns-proxy.status as hdp"; -var pkg = { - get Name() { - return "https-dns-proxy"; - }, - - get URL() { - return "https://docs.openwrt.melmac.net/" + pkg.Name + "/"; - }, - - templateToRegexp: function (template) { - return RegExp( - "^" + - template - .split(/(\{\w+\})/g) - .map((part) => { - let placeholder = part.match(/^\{(\w+)\}$/); - if (placeholder) return `(?<${placeholder[1]}>.*?)`; - else return part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); - }) - .join("") + - "$" - ); - }, - - templateToResolver: function (template, args) { - return template.replace(/{(\w+)}/g, (_, v) => args[v]); - }, -}; +var pkg = hdp.pkg; return view.extend({ load: function () { diff --git a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js index 8723b6e653..401e1546d1 100644 --- a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js +++ b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js @@ -3,62 +3,18 @@ "require uci"; "require form"; "require baseclass"; +"require https-dns-proxy.status as hdp"; -var pkg = { - get Name() { - return "https-dns-proxy"; - }, - get URL() { - return "https://docs.openwrt.melmac.net/" + pkg.Name + "/"; - }, - templateToRegexp: function (template) { - return RegExp( - "^" + - template - .split(/(\{\w+\})/g) - .map((part) => { - let placeholder = part.match(/^\{(\w+)\}$/); - if (placeholder) return `(?<${placeholder[1]}>.*?)`; - else return part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); - }) - .join("") + - "$" - ); - }, -}; - -var getInitStatus = rpc.declare({ - object: "luci." + pkg.Name, - method: "getInitStatus", - params: ["name"], -}); - -var getPlatformSupport = rpc.declare({ - object: "luci." + pkg.Name, - method: "getPlatformSupport", - params: ["name"], -}); - -var getProviders = rpc.declare({ - object: "luci." + pkg.Name, - method: "getProviders", - params: ["name"], -}); - -var getRuntime = rpc.declare({ - object: "luci." + pkg.Name, - method: "getRuntime", - params: ["name"], -}); +var pkg = hdp.pkg; return baseclass.extend({ title: _("HTTPS DNS Proxy Instances"), load: function () { return Promise.all([ - getInitStatus(pkg.Name), - getProviders(pkg.Name), - getRuntime(pkg.Name), + hdp.getInitStatus(pkg.Name), + hdp.getProviders(pkg.Name), + hdp.getRuntime(pkg.Name), ]); }, 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 c21d2cb6ef..91a8f48e62 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 @@ -37,6 +37,18 @@ msgstr "" msgid "DSCP Codepoint" msgstr "" +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.decloudus.dns.json:2 +msgid "DeCloudUs DNS" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/ch.digitale-gesellschaft.dns.json:2 +msgid "Digitale Gesellschaft (CH)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/app.tiarap.doh.json:14 +msgid "Direct" +msgstr "" + #: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js:376 msgid "Disable" msgstr "" @@ -57,6 +69,32 @@ msgstr "" msgid "Enabling %s service" msgstr "" +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.ffmuc.doh.json:2 +msgid "FFMUC DNS (DE)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/ca.cira.canadianshield.json:14 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:14 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.cloudflare-dns.json:14 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.controld.freedns.json:14 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json:14 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.cleanbrowsing.doh.json:18 +msgid "Family Filter" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.cleanbrowsing.doh.json:8 +msgid "Filter" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.ahadns.blitz.json:8 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.rethinkdns.sky.json:8 +msgid "Filters" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.blahdns.doh.json:22 +msgid "Finland" +msgstr "" + #: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:102 msgid "Force DNS Ports" msgstr "" @@ -215,6 +253,33 @@ msgstr "" msgid "Service Status" msgstr "" +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/one.comss.dns.json:13 +msgid "Siberia" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.blahdns.doh.json:30 +msgid "Singapore" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/org.snopyta.dns.doh.fi.json:2 +msgid "Snopyta DNS (FI)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.ahadns.doh.json:22 +msgid "Spain" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/co.oszx.dns.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.cloudflare-dns.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.controld.freedns.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/gr.libredns.doh.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.mullvad.doh.json:19 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.quad9.json:14 +msgid "Standard" +msgstr "" + #: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js:300 msgid "Start" msgstr "" @@ -231,10 +296,34 @@ msgstr "" msgid "Stopping %s service" msgstr "" -#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:149 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/ch.switch.dns.json:2 +msgid "Switch DNS (CH)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.blahdns.doh.json:14 +msgid "Switzerland" +msgstr "" + +#: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js:148 msgid "There are no active instances." msgstr "" +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/app.tiarap.doh.json:2 +msgid "Tiarap Public DNS (JP)" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.ahadns.doh.json:18 +msgid "US/Chicago" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.ahadns.doh.json:34 +msgid "US/Los Angeles" +msgstr "" + +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/net.ahadns.doh.json:46 +msgid "US/New York" +msgstr "" + #: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:245 msgid "Unknown" msgstr "" diff --git a/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json index b9989d5383..cbf5ca28ac 100644 --- a/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json +++ b/applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json @@ -7,10 +7,10 @@ "option": { "description": "Variant", "type": "select", - "regex": "(family.|)", + "regex": "(familyshield.|)", "options": [ { - "value": "family.", + "value": "familyshield.", "description": "Family Filter" }, { -- 2.30.2