openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-05-31 18:41:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-https-dns-proxy: update to 2025.12.29-3

Browse Source 
status.js:
* update the donate anchor
* replace RPCD call with direct ubus pull of service info for faster
  operation

Overview page include javascript file:
* replace RPCD call with ubus pull

RPCD script:
* remove obsolete getRuntime method
* bugfix: prevent execution of arbitrary code (thanks @iwallplace)

ACL file:
* remove obsolete getRuntime access and add access to service list

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
2026-01-19 23:54:50 +00:00
parent 637c075193
commit 721ec94145
6 changed files with 62 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/https-dns-proxy/status.js
+25 -26
View File
@@ -30,22 +30,22 @@ var pkg = {
pkg.Name +
"/" +
(pkg.ReadmeCompat ? pkg.ReadmeCompat + "/" : "") +
"#Donate"
"#donate"
);
},
templateToRegexp: function (template) {
if (template)
return new RegExp(
"^" +
template
.split(/(\{\w+\})/g)
.map((part) => {
let placeholder = part.match(/^\{(\w+)\}$/);
if (placeholder) return `(?<${placeholder[1]}>.*?)`;
else return part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
})
.join("") +
"$"
template
.split(/(\{\w+\})/g)
.map((part) => {
let placeholder = part.match(/^\{(\w+)\}$/);
if (placeholder) return `(?<${placeholder[1]}>.*?)`;
else return part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
})
.join("") +
"$"
);
return new RegExp("");
},
@@ -79,10 +79,10 @@ const getProviders = rpc.declare({
params: ["name"],
});
const getRuntime = rpc.declare({
object: "luci." + pkg.Name,
method: "getRuntime",
params: ["name"],
const getServiceInfo = rpc.declare({
object: "service",
method: "list",
params: ["name", "verbose"],
});
const _setInitAction = rpc.declare({
@@ -138,10 +138,10 @@ var RPC = {
}.bind(this)
);
},
getRuntime: function (name) {
getRuntime(name).then(
getServiceInfo: function (name, verbose) {
getServiceInfo(name, verbose).then(
function (result) {
this.emit("getRuntime", result);
this.emit("getServiceInfo", result);
}.bind(this)
);
},
@@ -159,7 +159,7 @@ var status = baseclass.extend({
return Promise.all([
L.resolveDefault(getInitStatus(pkg.Name), {}),
L.resolveDefault(getProviders(pkg.Name), {}),
L.resolveDefault(getRuntime(pkg.Name), {}),
L.resolveDefault(getServiceInfo(pkg.Name, true), {}),
]).then(function (data) {
var text;
var reply = {
@@ -170,9 +170,8 @@ var status = baseclass.extend({
version: null,
},
providers: (data[1] && data[1][pkg.Name]) || [{ title: "empty" }],
runtime: (data[2] && data[2][pkg.Name]) || {
instances: null,
triggers: [],
ubus: (data[2] && data[2][pkg.Name]) || {
instances: {},
},
};
reply.providers.sort(function (a, b) {
@@ -220,7 +219,7 @@ var status = baseclass.extend({
]);
var instancesDiv = [];
if (reply.runtime.instances) {
if (reply.ubus.instances && Object.keys(reply.ubus.instances).length > 0) {
var instancesTitle = E(
"label",
{ class: "cbi-value-title" },
@@ -228,14 +227,14 @@ var status = baseclass.extend({
);
text = _("See the %sREADME%s for details.").format(
'<a href="' +
pkg.URL +
'#a-word-about-default-routing " target="_blank">',
pkg.URL +
'#a-word-about-default-routing " target="_blank">',
"</a>"
);
var instancesDescr = E("div", { class: "cbi-value-description" }, "");
text = "";
Object.values(reply.runtime.instances).forEach((element) => {
Object.values(reply.ubus.instances).forEach((element) => {
var resolver;
var address;
var port;
@@ -464,5 +463,5 @@ return L.Class.extend({
getInitStatus: getInitStatus,
getPlatformSupport: getPlatformSupport,
getProviders: getProviders,
getRuntime: getRuntime,
getServiceInfo: getServiceInfo,
});