Commit graph

97 commits

Author SHA1 Message Date
Jo-Philipp Wich
c2f30fbe4d treewide: import utility classes explicitly
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 3c4bc228a1)
2020-05-07 19:40:49 +02:00
Ansuel Smith
c1fd6f5222 luci-base: remove hardcoded cgi-bin path
Currently LuCI can be loaded only when placed in the root of the server as the cgi-bin path are hardcoded. Change the index.html to load the cgi-bin path from the current level.
Also add a new entry in the env Object to make the cgi_base path easily accessible.
This variable will be based on the position of /cgi-bin/luci.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 5e6ec8562f)
2020-03-04 08:50:21 +01:00
Jo-Philipp Wich
3f5a67b62e luci-mod-system: fix zram compression placeholder
Fixes: #3583
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b8f65c340c)
2020-01-29 09:19:28 +01:00
Hannu Nyman
0bef1804ed luci-mod-system: remove abbreviation from LED config menu item
Remove the abbreviation coding from the menu item, as it does nor work
in menu and seems to prevent translation of the menu item.

(This was the only menu item in LuCI that had abbr logic.)

Reference to #3553

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2a1a9874f5)
2020-01-24 20:54:51 +02:00
Jo-Philipp Wich
640f26238c luci-mod-system: sshkeys.js: do not incorrectly filter ecdsa keys on load
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a3ea891b7e)
2019-11-13 16:56:48 +01:00
Jo-Philipp Wich
ae61ecb6be luci-mod-system: leds.js: display default state as On/Off
Fixes: #3289
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0731f7e5e4)
2019-11-11 10:15:49 +01:00
Yousong Zhou
a1e70b9534 luci-mod-system: validate log_ip as "host" instead of just ipaddr
Fixes FS#2444

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 90051b6858)
2019-11-04 02:58:58 +00:00
Jo-Philipp Wich
86f492173d treewide: require ui.js explicitly
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-03 21:55:50 +01:00
Jo-Philipp Wich
54163c95e1 luci-mod-system: sshkeys.js: explicitely require ui.js
While ui.js is implicitely autoloaded by other classes, we need to require
it directly in the view to avoid race conditions during rendering.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-03 18:03:01 +01:00
Jo-Philipp Wich
af5dc2652e luci-mod-system: flash.js: upon sysupgrade, select reconnect ip by keep state
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:45:00 +01:00
Jo-Philipp Wich
7d84396471 luci-mod-system: flash.js: fix flash erase modal
The firstboot rpc call might not return, therefor do not wait on promise
fullfillment but display modal dialog right away.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:42:48 +01:00
Jo-Philipp Wich
33346dadf4 luci-base, luci-mod-system: move file upload handling to ui.js
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:03:33 +01:00
Jo-Philipp Wich
470464ae4a luci-mod-system: use declarative dependencies in controller
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:03:33 +01:00
Jo-Philipp Wich
5ce16764ad luci-base, luci-mod-system: replace luci/setUmount with fs.exec calls
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:03:33 +01:00
Jo-Philipp Wich
c67d2ddc2c luci-base, luci-mod-system: replace luci/setReboot with fs.exec
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:03:33 +01:00
Richard Yu
c6d0822793
luci-mod-system: add missing speed_mask option in leds.js
Signed-off-by: Richard Yu <yurichard3839@gmail.com>
2019-10-28 14:57:19 +08:00
Jo-Philipp Wich
36b052f8cc luci-mod-system: flash.sh: gracefully handle missing sysupgrade.conf
Fixes: #3228
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-21 15:30:22 +02:00
Jo-Philipp Wich
dffa9c57fe luci-mod-system: sshkeys.js: create authorized_keys as 0600
Fixes: #3226
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-21 08:43:07 +02:00
Jo-Philipp Wich
45b56e85a6 luci-mod-system: leds.js: fix handling device option
Since the modal overlay map was unable to read the current trigger value,
it mistakingly allowed the removal of the device option value.

Fix it by finding the option object through lookupOption() instead of
relying on a reference.

Fixes: #3216
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-18 18:55:10 +02:00
Jo-Philipp Wich
3d11af11a7
Merge pull request #3145 from ptpt52/refine-flash-reset
luci-mod-system: refine flash reset
2019-10-16 21:31:26 +02:00
Jo-Philipp Wich
5ccbda54e8 luci-mod-system: flash.js: fix passing sysupgrade opts
Instead of binding the checked state to the button handler function,
bind the underlying checkboxes instead to observe the actual user
choice instead of the initial value.

This fixes forcing sysupgrade or deselecting keep settings.

Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 19:55:31 +02:00
Chen Minqiang
29aad47121 luci-mod-system: refine flash reset
We determine flash reset capability by checking overlayfs in /proc/mounts

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
2019-10-07 23:37:35 +08:00
Jo-Philipp Wich
90c52a1782 luci-app-advanced-reboot: import applyreboot template from luci-mod-system
Since the advanced-reboot app is the sole remaining user of the applyreboot
template, import it into this package to avoid the need for shipping it
with the default installation.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
b637cf6750 luci-mod-system: port reboot view to client side js
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
29ccea14f1 luci-mod-system: use awaitReconnect() from ui.js
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
55fb53e995 luci-mod-system: sshkeys.js: use common fs.js class
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
811012cab5 luci-mod-system: startup.js: use common fs.js class
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
807dd50640 luci-mod-system: flash.js: use common fs.js class
Also move the keep settings checkbox above the error messages in the
sysupgrade confirmation dialog.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
641c82cb21 luci-mod-system: crontab.js: use common fs.js class
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-07 11:53:39 +02:00
Jo-Philipp Wich
020ac1e08d luci-mod-system: flash.js: fix "rootfs_data" partition detection
The `/sys/devices/virtual/mtd/` information is not available on all
devices so rely on the contents of `/proc/mtd` instead to check for
the existence of the `rootfs_data` partition.

Fixes: #3136
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-02 13:02:04 +02:00
Rafał Miłecki
fb740f2c79 luci-mod-system: check for sysupgrade with backup possibility
Some firmware images may not support preserving backup. In such cases
display a warning and disable relevant checkbox.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2019-10-02 11:13:19 +02:00
Rafał Miłecki
5f2a17938f luci-mod-system: check if it's possible to force sysupgrade
Some validation errors may be critical enough to prevent sysupgrade.
Check the "forceable" property and disallow forcing sysupgrade if
applicable. It would fail anyway at the "sysupgrade" call.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2019-10-02 09:47:20 +02:00
Rafał Miłecki
7c108683c6 luci-mod-system: use "system" new "validate_firmware_image" ubus method
This new ubus method provides more properly-formatted details about
firmware file. Use it to check if uploaded image is valid.

The old "sysupgrade --test" method is left for now to provide stderr
output.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
[Added missing ACL, add default value for the ubus failure case]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-10-02 09:46:18 +02:00
Jo-Philipp Wich
f1db82399a luci-mod-system: allow IPv6 addresses for external syslog server
Fixes: #3126
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-30 10:28:11 +02:00
Jo-Philipp Wich
355223ecdd luci-mod-system: fix rerendering of ssh key list after add/remove
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-27 12:53:47 +02:00
Jo-Philipp Wich
ad05b61dce luci-mod-system: allow deleting all NTP servers
Fixes: #3121
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-27 12:02:08 +02:00
Jo-Philipp Wich
855208c59d luci-mod-system: flash.js: disable mtdblock downloads on mtd-less systems
Ref: 3c40a7450a (commitcomment-35233073)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-25 19:42:06 +02:00
Jo-Philipp Wich
e17cd94be7 luci-mod-system: flash.js: rename handleReset to handleFirstboot
Rename the procedure to prevent a name clash with the standard view action
which we intentionally disable.

Ref: 3c40a7450a (commitcomment-35233207)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-25 19:37:27 +02:00
Jo-Philipp Wich
3c40a7450a luci-mod-system: flash.js: improve storage size detection heuristics
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-25 16:23:02 +02:00
Jo-Philipp Wich
e091859116 luci-mod-system: system.js: use more concise label for use_dhcp
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-24 19:26:33 +02:00
Jo-Philipp Wich
1bad6f3e61 luci-mod-system: system.js: expose use_dhcp NTP option
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-24 18:41:54 +02:00
Jo-Philipp Wich
2a5c5f47f9 luci-mod-system: reimplement flashops as client side view
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-24 14:21:08 +02:00
Jo-Philipp Wich
cc786f9833 luci-mod-system: startup.js: fix syntax error
Fixes: f3ff641d8 ("luci-mod-system: ensure that textarea contents are properly escaped")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-24 12:17:26 +02:00
Jo-Philipp Wich
f3ff641d8e luci-mod-system: ensure that textarea contents are properly escaped
Fixes: #3090
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-23 11:44:18 +02:00
Jo-Philipp Wich
2dd6c009be luci-mod-system: remove unused controller actions
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-21 19:06:30 +02:00
Jo-Philipp Wich
4518f8f342 luci-mod-system: mounts.js: preload fstab uci
Preload the uci configuration on page load to avoid accidential double
rendering of the globals section and mount overview table.

Fixes: e39ab8725 ("luci-mod-system: mounts.js: implicitely create globals section")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-21 18:46:17 +02:00
Jo-Philipp Wich
e39ab87255 luci-mod-system: mounts.js: implicitely create globals section
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-21 18:43:42 +02:00
Jo-Philipp Wich
71e265a7f0 luci-mod-system: remplement fstab settings as client side view
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-21 18:36:31 +02:00
Jo-Philipp Wich
982b08f45d luci-mod-system: system.js: simplify btn actions, use feature flags
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-18 08:17:58 +02:00
Jo-Philipp Wich
a67175cab1 luci-mod-system: disable redundant page actions in crontab, startup views
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-18 07:23:01 +02:00