Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-uhttpd: some fixes because of the lua to javascript porting

Browse source 
* 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 <ayushmantripathi7724@gmail.com>
Improvement of the commit title and description
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Ayushman Tripathi 2023-06-21 19:14:19 +05:30 committed by Florian Eckert
parent 3b9adf800f
commit 5865d02bfd
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-app-uhttpd/htdocs/luci-static/resources/view/uhttpd/uhttpd.js
View file

@ -103,13 +103,13 @@ return view.extend({
rfc1918Filter.default = rfc1918Filter.enabled; rfc1918Filter.default = rfc1918Filter.enabled;
rfc1918Filter.rmempty = false; 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.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.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.')); 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'; removeOld.inputstyle = 'remove';

2
applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json
View file

@ -3,7 +3,7 @@
"title": "uHTTPd", "title": "uHTTPd",
"action": { "action": {
"type": "view", "type": "view",
"path": "uhttpd" "path": "uhttpd/uhttpd"
}, },
"depends": { "depends": {
"acl": [ "luci-app-uhttpd" ], "acl": [ "luci-app-uhttpd" ],

12
applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json
View file

@ -2,16 +2,18 @@
"luci-app-uhttpd": { "luci-app-uhttpd": {
"description": "Grant UCI access for luci-app-uhttpd", "description": "Grant UCI access for luci-app-uhttpd",
"read": { "read": {
"uci": [ "uhttpd" ], "uci": ["uhttpd"],
"file": { "file": {
"/*": ["read"] "/*": ["read"],
"/etc/init.d/uhttpd restart": ["exec"]
} }
}, },
"write": { "write": {
"uci": [ "uhttpd" ], "uci": ["uhttpd"],
"file": { "file": {
"/*": ["write"], "/etc/luci-uploads/*": ["write"],
"/etc/init.d/uhttpd restart": ["exec"] "/etc/uhttpd.key": ["write"],
"/etc/uhttpd.crt": ["write"]
} }
} }
} }