From 5865d02bfd9dad34e2d3106d57675045d8eb235c Mon Sep 17 00:00:00 2001 From: Ayushman Tripathi Date: Wed, 21 Jun 2023 19:14:19 +0530 Subject: [PATCH] luci-app-uhttpd: some fixes because of the lua to javascript porting * Fix menu path for uhttpd * Add hint that files could only be uploaded to /etc/luci-uploads * Rename not knowing enable_delete FileUpload option to enable_remove * Update ACL list Signed-off-by: Ayushman Tripathi Improvement of the commit title and description Signed-off-by: Florian Eckert --- .../luci-static/resources/view/uhttpd/uhttpd.js | 8 ++++---- .../root/usr/share/luci/menu.d/luci-app-uhttpd.json | 2 +- .../root/usr/share/rpcd/acl.d/luci-app-uhttpd.json | 12 +++++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/applications/luci-app-uhttpd/htdocs/luci-static/resources/view/uhttpd/uhttpd.js b/applications/luci-app-uhttpd/htdocs/luci-static/resources/view/uhttpd/uhttpd.js index db659f659b..3619e0835f 100644 --- a/applications/luci-app-uhttpd/htdocs/luci-static/resources/view/uhttpd/uhttpd.js +++ b/applications/luci-app-uhttpd/htdocs/luci-static/resources/view/uhttpd/uhttpd.js @@ -103,13 +103,13 @@ return view.extend({ rfc1918Filter.default = rfc1918Filter.enabled; rfc1918Filter.rmempty = false; - cert_file = ucs.taboption('general', form.FileUpload, 'cert', _('HTTPS Certificate (DER or PEM format)')); + cert_file = ucs.taboption('general', form.FileUpload, 'cert', _('HTTPS Certificate (DER or PEM format)'), _('Files can only be uploaded and saved to the /etc/luci-uploads directory.')); cert_file.root_directory = '/'; - cert_file.enable_delete = false; + cert_file.enable_remove = false; - key_file = ucs.taboption('general', form.FileUpload, 'key', _('HTTPS Private Key (DER or PEM format)')); + key_file = ucs.taboption('general', form.FileUpload, 'key', _('HTTPS Private Key (DER or PEM format)'), _('Files can only be uploaded and saved to the /etc/luci-uploads directory.')); key_file.root_directory = '/'; - key_file.enable_delete = false; + key_file.enable_remove = false; var removeOld = ucs.taboption('general', form.Button, 'remove_old', _('Remove old certificate and key'), _('uHTTPd will generate a new self-signed certificate using the configuration shown below.')); removeOld.inputstyle = 'remove'; diff --git a/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json b/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json index 03a97cb2e7..e372a37d0f 100644 --- a/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json +++ b/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json @@ -3,7 +3,7 @@ "title": "uHTTPd", "action": { "type": "view", - "path": "uhttpd" + "path": "uhttpd/uhttpd" }, "depends": { "acl": [ "luci-app-uhttpd" ], diff --git a/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json b/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json index ab946db77a..f03d0d1a45 100644 --- a/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json +++ b/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json @@ -2,16 +2,18 @@ "luci-app-uhttpd": { "description": "Grant UCI access for luci-app-uhttpd", "read": { - "uci": [ "uhttpd" ], + "uci": ["uhttpd"], "file": { - "/*": ["read"] + "/*": ["read"], + "/etc/init.d/uhttpd restart": ["exec"] } }, "write": { - "uci": [ "uhttpd" ], + "uci": ["uhttpd"], "file": { - "/*": ["write"], - "/etc/init.d/uhttpd restart": ["exec"] + "/etc/luci-uploads/*": ["write"], + "/etc/uhttpd.key": ["write"], + "/etc/uhttpd.crt": ["write"] } } } -- 2.30.2