Skip to content

luci-app-https-dns-proxy: providers.json support; new provider #8368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stangri merged 1 commit into from
Mar 4, 2026
Merged

luci-app-https-dns-proxy: providers.json support; new provider #8368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
661 changes: 661 additions & 0 deletions applications/luci-app-https-dns-proxy/LICENSE
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 23 additions & 2 deletions applications/luci-app-https-dns-proxy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ PKG_NAME:=luci-app-https-dns-proxy
PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=2025.12.29
PKG_RELEASE:=3
PKG_RELEASE:=4

LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
LUCI_URL:=https://github.com/stangri/luci-app-https-dns-proxy/
LUCI_URL:=https://github.com/mossdef-org/luci-app-https-dns-proxy/
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
LUCI_DEPENDS:=+luci-base +https-dns-proxy

Expand All @@ -22,6 +22,27 @@ help
Version: $(PKG_VERSION)-$(PKG_RELEASE)
endef

# Consolidate individual provider JSON files into providers.json in the build tree.
# luci.mk's Build/Prepare calls Build/Prepare/$(LUCI_NAME) as a per-package hook.
# The merged file lands in root/ so luci.mk's install step copies it automatically.
define Build/Prepare/luci-app-https-dns-proxy
@if [ -d $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers ] \
&& ls $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers/*.json >/dev/null 2>&1; then \
sep=''; printf '[' > $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
for f in $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers/*.json; do \
printf '%s' "$$$$sep" >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
cat "$$$$f" >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
sep=','; \
done; \
printf ']' >> $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
fi
@if grep -q '"title"' $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json 2>/dev/null; then \
rm -rf $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers; \
else \
rm -f $(PKG_BUILD_DIR)/root/usr/share/https-dns-proxy/providers.json; \
fi
endef

include ../../luci.mk

# call BuildPackage - OpenWrt buildroot signature
1 change: 1 addition & 0 deletions ...ns/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"require rpc";
"require view";
"require https-dns-proxy.status as hdp";
/* globals hdp */

var pkg = hdp.pkg;

Expand Down
109 changes: 56 additions & 53 deletions ...pp-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"require form";
"require baseclass";
"require https-dns-proxy.status as hdp";
/* globals hdp */

var pkg = hdp.pkg;

Expand All @@ -19,61 +20,60 @@ return baseclass.extend({
},

render: function (data) {
var reply = {
status: (data[0] && data[0][pkg.Name]) || {
enabled: null,
running: null,
force_dns_active: null,
version: null,
},
providers: (data[1] && data[1][pkg.Name]) || [{ title: "empty" }],
runtime: (data[2] && data[2][pkg.Name]) || { instances: null, triggers: [] },
};
reply.providers.sort(function (a, b) {
return _(a.title).localeCompare(_(b.title));
});
reply.providers.push({
title: "Custom",
template: "{option}",
params: { option: { type: "text" } },
});

var forceDnsText = "";
if (reply.status.force_dns_active) {
reply.status.force_dns_ports.forEach((element) => {
forceDnsText += element + " ";
try {
var reply = {
status: (data[0] && data[0][pkg.Name]) || {},
providers: (data[1] && data[1][pkg.Name]) || [],
runtime: (data[2] && data[2][pkg.Name]) || {},
};
if (Array.isArray(reply.providers)) {
reply.providers.sort(function (a, b) {
return _(a.title).localeCompare(_(b.title));
});
} else {
reply.providers = [];
}
reply.providers.push({
title: "Custom",
template: "{option}",
params: { option: { type: "text" } },
});
} else {
forceDnsText = "-";
}

var table = E(
"table",
{ class: "table", id: "https-dns-proxy_status_table" },
[
E("tr", { class: "tr table-titles" }, [
E("th", { class: "th" }, _("Name / Type")),
E("th", { class: "th" }, _("Listen Address")),
E("th", { class: "th" }, _("Listen Port")),
E("th", { class: "th" }, _("Force DNS Ports")),
]),
]
);
var forceDnsText = "-";
if (reply.status.force_dns_active && Array.isArray(reply.status.force_dns_ports)) {
var ports = reply.status.force_dns_ports.join(" ");
if (ports) forceDnsText = ports;
}

var table = E(
"table",
{ class: "table", id: "https-dns-proxy_status_table" },
[
E("tr", { class: "tr table-titles" }, [
E("th", { class: "th" }, _("Name / Type")),
E("th", { class: "th" }, _("Listen Address")),
E("th", { class: "th" }, _("Listen Port")),
E("th", { class: "th" }, _("Force DNS Ports")),
]),
]
);

var rows = [];
if (reply.runtime.instances) {
Object.values(reply.runtime.instances).forEach((element) => {
var rows = [];
var instances = (reply.runtime && reply.runtime.instances) || {};
Object.values(instances).forEach((element) => {
var resolver;
var address;
var port;
var name;
var option;
var found;
element.command.forEach((param, index, arr) => {
if (param === "-r") resolver = arr[index + 1];
if (param === "-a") address = arr[index + 1];
if (param === "-p") port = arr[index + 1];
});
if (Array.isArray(element.command)) {
element.command.forEach((param, index, arr) => {
if (param === "-r") resolver = arr[index + 1];
if (param === "-a") address = arr[index + 1];
if (param === "-p") port = arr[index + 1];
});
}
resolver = resolver || "Unknown";
address = address || "127.0.0.1";
port = port || "Unknown";
Expand All @@ -83,27 +83,30 @@ return baseclass.extend({
found = true;
name = _(prov.title);
let match = resolver.match(regexp);
if (match[1] != null) {
if (match && match[1] != null) {
if (
prov.params &&
prov.params.option &&
prov.params.option.options
Array.isArray(prov.params.option.options)
) {
prov.params.option.options.forEach((opt) => {
if (opt.value === match[1]) option = _(opt.description);
});
name += " (" + option + ")";
if (option) name += " (" + option + ")";
} else {
if (match[1] !== "") name += " (" + match[1] + ")";
}
}
}
});
rows.push([name, address, port, forceDnsText]);
rows.push([name || _("Unknown"), address, port, forceDnsText]);
});
}
cbi_update_table(table, rows, E("em", _("There are no active instances.")));
cbi_update_table(table, rows, E("em", _("There are no active instances.")));

return table;
return table;
} catch (e) {
return E("div", { class: "alert-message warning" },
_("Unable to retrieve %s status").format("HTTPS DNS Proxy"));
}
},
});
Loading