Commit graph

189 commits

Author SHA1 Message Date
Jo-Philipp Wich
d6b4a3d45a luci-mod-admin-full: fix request path access in uci controller
Fixes #1725
Fixes 731ed77c0 ("treewide: improve handling of page redirections in uci change views")

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-06 06:58:32 +02:00
Jo-Philipp Wich
bfc98bec4d luci-mod-admin-full: escape display parameter
Prevent reflected XSS through the reset button by url encoding the
display parameter.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 23:03:01 +02:00
Jo-Philipp Wich
731ed77c0b treewide: improve handling of page redirections in uci change views
Instead of passing the full LuCI request url, pass the relative resolved
request path instead and filter the received value through the lookup()
dispatcher function to only allow paths to actual internal pages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 23:03:01 +02:00
Jo-Philipp Wich
c0d9c4f3ce treewide: filter shell arguments through shellquote() where applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 09:37:43 +02:00
Jo-Philipp Wich
9e4b8a9138 luci-mod-admin-full: fix possible shell injection in bandwith status
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 00:33:09 +02:00
Jo-Philipp Wich
94ea907707 luci-mod-admin-full: use strict hostname validation for dhcp hosts
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-04 23:21:53 +02:00
Jo-Philipp Wich
005f4fb7d4
Merge pull request #1654 from TDT-AG/pr/20180301-luci-several-fixes
luci-app-firewall/luci-base/luci-mod-admin-full: some fixes and improvements
2018-03-15 09:52:22 +01:00
Jo-Philipp Wich
28e3b32854 treewide: unify mac address handling
Use the new luci.ip MAC address facilities to parse and verify MAC addresses
in a common way, instead of relying on various ad-hoc solutions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-12 16:12:18 +01:00
Jo-Philipp Wich
852ec6e28b luci-base, luci-mod-admin-full: store backup vars in luci configuration
Keep the ifname and bridge state backup variables in /etc/config/luci to not
pollute /etc/config/network.

Fixes #1655.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-02 12:44:35 +01:00
Florian Eckert
10fbf9b2e4 luci-mod-admin-full: add hint on backup restore
Add a hint to backup restore that files could remain on the system.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-03-01 12:33:43 +01:00
Jo-Philipp Wich
e6cfe35baf luci-mod-admin-full: prevent unknown sysctl key warnings on status page
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-02-04 19:20:32 +01:00
Hannu Nyman
7062250701 luci-mod-admin-full: fix typos on dhcp page
Based on #1568

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-01-20 10:51:29 +02:00
Mathias Kresin
cfdeaa91fa luci-mod-admin-full: set 0 db DSL SNR offset by default
If no DSL SNR offset is set for the dsl line the first entry from the
dropdown list is pre-selected by default, which would apply a -10 db
offset by default.

Pre-select the 0 db option if nothing else is specified in the uci config
files.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2018-01-13 07:46:36 +01:00
Martin Schiller
673a8bd76f luci-mod-admin-full: led config: add support for Switch Port Mask
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
2018-01-09 08:11:23 +01:00
Arjen de Korte
96f6a79eb2 luci-mod-admin-full: fix incorrect length of DUID-LL
The length of DUID-LL is 80 bits (16 bit DUID type, 16 bit hardware type, 48 bit mac)
which corresponds to 20 nibbles. Also lower the minimum required length of DUID to
20 nibbles in order to allow entering a DUID-LL.

Signed-off-by: Arjen de Korte <build+github@de-korte.org>
2018-01-09 08:08:55 +01:00
Jo-Philipp Wich
e034f271d8 luci-base: adjust translations
- Modify labels for mesh forwarding and 802.11b rate options
 - Synchronize translations
 - Complete german base translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-09 08:03:03 +01:00
Sven Roederer
a6b41271b7 luci-mod-admin-full: Add 802.11b legacy_rates support
this was added to LEDE with ed62d91f4b5296a4aa883ce975d76f590ef4e910 and defaults to enable.

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
2018-01-09 07:09:31 +01:00
Sven Roederer
63255ec38b luci-mod-admin-full: Add mesh_fwding support
* make it only visible for 802.11s mesh-networks
* have it enabled by default

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
[add empty line before meshfwd assignment]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-09 07:08:08 +01:00
Jo-Philipp Wich
08b40acc4e luci-mod-admin-full: allow setting DSL SNR offset for VDSL
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-08 10:31:03 +01:00
Kishan Gondaliya
267bf83db0 luci-mod-admin-full: Add meshId support
Signed-off-by: Kishan Gondaliya <kishanpgondaliya@gmail.com>
[move mode before the SSID / Mesh ID setting]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-07 19:38:23 +01:00
Jo-Philipp Wich
dac0cce6b9 luci-mod-admin-full: remove unused button cbi model
Remove the unused admin_system/buttons cbi model. It has been broken,
was not exposed in the controller and the corresponding support code
which only ever was available for the ath25 target has been dropped in
with https://git.lede-project.org/0a3d721in June 2016.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-03 23:25:35 +01:00
Jo-Philipp Wich
dbb694c699 luci-mod-admin-full: allow a wider range of DSL SNR margins
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-02 18:26:16 +01:00
Hannu Nyman
878a64f538 typo: fileystem --> filesystem
fix typo:
sed -i "s/fileystem/filesystem/"

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-12-28 14:15:16 +02:00
Jo-Philipp Wich
a41215581d
Merge pull request #1452 from mkresin/master
fix DHCPv6 hostname display
2017-12-07 14:03:54 +01:00
Brian J. Murrell
2c2e7f5cbb
Fix bad argument #1 to 'tonumber'
Fixes [FS#1118](https://bugs.lede-project.org/index.php?do=details&task_id=1118)

Luci chokes on devices that do not have _iptables_ installed with:

/usr/lib/lua/luci/dispatcher.lua:460: Failed to execute function dispatcher target for entry '/'.
The called action terminated with an exception:
/usr/lib/lua/luci/dispatcher.lua:460: Failed to execute firstchild dispatcher target for entry '/admin'.
The called action terminated with an exception:
/usr/lib/lua/luci/dispatcher.lua:460: Failed to execute function dispatcher target for entry '/admin/status'.
The called action terminated with an exception:
/usr/lib/lua/luci/dispatcher.lua:460: Failed to execute template dispatcher target for entry '/admin/status/overview'.
The called action terminated with an exception:
/usr/lib/lua/luci/template.lua:97: Failed to execute template 'admin_status/index'.
A runtime error occured: [string "/usr/lib/lua/luci/view/admin_status/index.h..."]:34: bad argument #1 to 'tonumber' (string expected, got nil)
stack traceback:
	[C]: in function 'assert'
	/usr/lib/lua/luci/dispatcher.lua:460: in function 'dispatch'
	/usr/lib/lua/luci/dispatcher.lua:141: in function </usr/lib/lua/luci/dispatcher.lua:140>

The code should be more defensive.
2017-12-04 08:44:00 -05:00
Mathias Kresin
0a2c7b9e5c luci-mod-admin-full: indicate DHCPv6 hostname mismatch
In case the DUID can be mapped to the MAC-Address of an already known
host, show the already know hostname next to the DHCPv6 supplied one in
case they differ.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-11-17 01:37:21 +01:00
Mathias Kresin
9f5a1de8b1 luci-mod-admin-full: always indicate missing DHCPv6 hostname
Don't show a DHCPv6 supplied hostname if none was send. It happens in
case the DUID can be mapped to the MAC-Address of an existing host and
the existing host has a name set.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-11-17 01:37:19 +01:00
Mathias Kresin
a1ee8e16b6 luci-mod-admin-full: don't replace DHCPv6 hostname
Don't replace the DHCPv6 supplied hostname if the DUID can be mapped to
the MAC-Address of an already known host.

It hides the issue of a missing DHCPv6 hostname and could lead to the
conclution that the already known host has an IPv6 address.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-11-17 01:27:18 +01:00
Andrea Merello
f0716ecd6e luci-mod-admin-full: add SNR tweak option to DSL
Reported-by: Andrea Merello <andrea.merello@gmail.com>
[rebase onto master, fix indentation, commit subject, depend on adsl mode]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10 15:08:38 +01:00
Jo-Philipp Wich
084d8b120a luci-mod-admin-full: restrict DSL xfer_mode and line_mode options to VDSL modems
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10 14:36:38 +01:00
Jan Pavlinec
37f4a3b90c luci-mod-admin-full: add DUID option to static leases section
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
[add field validation]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-11-10 13:00:26 +01:00
Lorenzo Santina
40c744d96a luci-mod-admin-full: wifi.lua: 80211r ft_over_ds
Allow user to chose if use FT over DS protocol or
FT over the Air protocol for Fast BSS Transition

Signed-off-by: Lorenzo Santina <lorenzo.santina@edu.unito.it>
2017-11-06 14:15:43 +01:00
Lorenzo Santina
0ded26eba9 luci-mod-admin-full: wifi.lua: 80211r ft_psk_generate_local
Add local generation of PMK when using a PSK.
So 802.11r is easier to configure and no inter AP
communication is needed any more.

Signed-off-by: Lorenzo Santina <lorenzo.santina@edu.unito.it>
2017-11-06 14:10:18 +01:00
Jo-Philipp Wich
4609c1360f Merge pull request #1365 from psyborg55/master
luci-mod-admin-full: add fontsize style parameter
2017-10-20 10:22:52 +02:00
Jo-Philipp Wich
b7be0b9d16 luci-mod-admin-full: tone down KRACK countermeasure description
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-10-18 00:03:13 +02:00
Jo-Philipp Wich
48ed00e5b9 luci-mod-admin-full: wifi: expose "wpa_disable_eapol_key_retries" option
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-10-17 22:19:08 +02:00
Jo-Philipp Wich
04e45906da luci-mod-admin-full: wifi.lua: fix indentation
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-10-17 17:37:11 +02:00
psyborg55
549949ad8b add fontsize style parameter
add fontsize style parameter to reduce output text size

Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
2017-09-13 19:49:40 +02:00
psyborg55
bac20bc648 add fontsize style parameter
add fontsize style parameter to reduce output text size

Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
2017-09-13 19:47:47 +02:00
Anton Engelhardt
e38a03f1e3 [PATCH] luci-mod-admin-full: 802.11r AP-WDS mode enable
Made 802.11r selection availible in AP-WDS mode

Signed-off-by: Anton Engelhardt anton@neednow.de
2017-08-09 18:52:50 +02:00
Martin Schiller
a50c56d474 luci-mod-admin-full: add 'auto' xfer_mode to dsl configuration
This change is needed to support the new default 'auto' xfer_mode
setting.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
2017-08-07 08:06:18 +02:00
Jo-Philipp Wich
00ae50134b luci-mod-admin-full: use rpcd-mod-rrdns for reverse DNS lookups
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-07-11 14:18:40 +02:00
Kishan Gondaliya
d735903e94 luci-mod-admin-full: Enable adhoc mode encryption options
Currently there are only 2 encryption options visible for adhoc
	mode. But in netifd, others are also supported and working as
	expected. So adding WPA-PSK, WPA2-PSK and WPA-PSK/WPA2-PSK Mixed
	mode as encryption options.

Signed-off-by: Kishan Gondaliya <kishanpgondaliya@gmail.com>
2017-06-05 14:30:37 +05:30
Jo-Philipp Wich
a9e8376c20 luci-mod-admin-full: automatically set dns=1 for static leases with hostname
Most users likely want the hostname of a static DHCP lease to be resolveable,
even if the corresponding host is currently offline.

Adjust the form logic to automatically set 'option dns 1' whenever a name is
specified in the static lease entry.

FIxes LEDE FS#815.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-06-02 01:02:42 +02:00
Jo-Philipp Wich
2a81ae6d15 luci-mod-admin-full: use "Lease time" instead of "Leasetime" as translation label
This allows sharing a common translation string between DHCP and interface pages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-05-30 21:25:28 +02:00
Jo-Philipp Wich
aa2b1cdc2c luci-mod-admin-full: auto-migrate ifnames when changing VLAN configuration
This change extends the switch VLAN configuration page to automatically
adjust interface ifname options when altering VLAN settings.

For example "eth0" is changed to "eth0.1" when a previously untagged LAN
VLAN is switched to tagged on the CPU port and vice versa.

Notifications are displayed in the page header if an auto migration was
performed.

This change should make the switch configuration more user friendly and
less prone to soft bricking.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-05-29 08:45:38 +02:00
Hannu Nyman
1970c21e3b luci-mod-admin-full: add advice to restart cron
Cron init script starts the service only if a crontab file
exists. If there is no crontab file at boot and the user
later creates one, he needs to manually restart the service.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-05-08 15:20:13 +03:00
fantom-x
aee99ce927 luci-mod-admin-full: "isolate" option is missing for mac80211
Signed-off-by: Marc Benoit marcb6218@gmail.com
2017-05-01 17:16:00 -04:00
muddyfeet
4669782829 luci-mod-admin-full: correct logic for dnsmasq boguspriv keyword
Prevents deletion of the UCI dns boguspriv keyword and explicitly sets it to
either 0 or removes it as the LEDE/Openwrt dnsmasq.conf default is 1 - not 0.

This allows boguspriv to be turned off from the GUI.

Signed-off-by: Warren Linton <warren@linton.id.au>
[Jo-Philipp Wich: squashed commits, updated commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-04-25 14:40:18 +02:00
Jo-Philipp Wich
7ae244a26e luci-mod-admin-full: use nf_conntrack_count for counting connections (#1114)
As suggested by PR #1114, use `/proc/sys/net/netfilter/nf_conntrack_count`
instead of counting the lines in `/proc/net/nf_conntrack` but use a slightly
more efficient approach which avoids spawning an extra `cat` command.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-04-20 16:55:29 +02:00