Commit graph

14799 commits

Author SHA1 Message Date
Rafał Miłecki
a5586749d0 luci-mod-network: drop duplicated "Master" option
It got accidentally added while cherry picking RA and NDP params
support.

Fixes: 3a9ebc537f ("luci-mod-network: Introduce new RA and NDP params with help-text.")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2021-05-27 08:41:14 +02:00
Hannu Nyman
d851570070 treewide: backport i18n translations from master
Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-26 19:11:37 +03:00
Liangbin Lian
ac0bcc2d10 luci-theme-material: fix wrong active state on common prefix node
Before fixed, if we have two nodes: 'services/ddns' and 'services/ddnsto',
click any one of they, will show they all actived.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 97d50d2c6b)
2021-05-26 10:09:05 +03:00
Liangbin Lian
19de3acdde luci-app-samba4: support listen on multiple interfaces
/etc/init.d/samba4 already support that

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 169ab9979eee780758256c2859f7c2ee86a0b0ae)
2021-05-25 20:04:30 +03:00
Hannu Nyman
53c572ac9b treewide: i18n - Backport translations
Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-16 20:52:12 +03:00
Jo-Philipp Wich
e2abb45b0e luci-mod-status: fix potential XSS via specially crafted DNS names
When an upstream NS returns PTR domain names containing HTML, it is
added verbatim to the connection status table.

Prevent this issue by HTML escaping any values in the source and
destination columns.

Fixes: CVE-2021-32019
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3c66c5b165)
2021-05-12 12:03:00 +02:00
Hannu Nyman
766e8f8cbf treewide: backport translations i18n
Backport translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-05-08 17:05:54 +03:00
Jo-Philipp Wich
e9b6431b14 luci-mod-status: iptables: always make tab pane visible
When ip6tables is not present, the tab group was not initialized,
causing the iptables status display to be empty with certain themes.

Manually mark the pane active in this case to avoid the problem.

Fixes: #5040
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d24e3295f0)
2021-05-07 19:19:35 +02:00
Paul Spooren
56c323505b luci-app-attendedsysupgrade: fix branch detection
The running branch determines which upgrades are suggested. A jump to a
newer branch (e.g. 19.07.8 to 21.02.1) is only suggested if the advanced
mode is enable, since it may break the router.

OpenWrt versions end in either `-SNAPSHOT`, `.X-rcY` or `.x`. All these
suffixes are removed, resulting in the branch name.

Previously the `-SNAPSHOT` suffix wasn't removed resulting in wrong
branch names.

Also clean up some log spam.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 85e9ee3123)
2021-05-07 03:45:32 -10:00
Paul Spooren
29d3ed290c luci-app-attendedsysupgrade: hide branch update
Branch updates (e.g. 19.07 to 21.02) are risky and shouldn't be
suggested by default. Hide those unless the advanced mode is enabled.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 9184721fab)
2021-05-07 03:45:32 -10:00
Florian Eckert
424d11381b luci-app-mwan3: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-05-06 12:27:00 +02:00
Florian Eckert
0ddb72dec2 luci-app-mwan3: fix css status with
This commit fixes the width of the mwan3 status page for the
openwrt-2020 theme.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6fa40fffca)
2021-05-06 12:23:21 +02:00
Florian Eckert
ea334e254e luci-app-mwan3: add i18n to status page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 2b0fbcb0c8)
2021-05-06 12:23:12 +02:00
Florian Eckert
d31345fc77 luci-app-mwan3: update status page for no tracked interfaces
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 4fee871630)
2021-05-06 12:23:04 +02:00
Florian Eckert
942288b4fa luci-base: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-05-04 09:17:11 +02:00
Sven Roederer
1a59584167 luci-base: change button-text from Dismiss to Close in UCI changes overview
Change the left button of the UCI Apply-changes overview to the more correct
function close. This also avoids confusion between Dismiss and Revert, which
translate to the same in german.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
(cherry picked from commit b56912d9fcf6acb0ba3008de3df15188318376f2)
2021-05-04 09:16:12 +02:00
Florian Eckert
9dc93d5d2f treewide: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-05-04 09:16:04 +02:00
Dirk Brenken
11cfd83648
luci-app-banip: switch IP query provider
* switch to IPWHOIS.IO for IP report queries, the IP geolocation API is
  more accurate & faster

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-05-02 22:11:25 +02:00
Dirk Brenken
0eb4e0911a
luci-app-travelmate: typo fix
* typo fix & sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-05-01 11:11:32 +02:00
Paul Spooren
33aa61ff25 luci-app-attendedsysupgrade: add target in reuqest
The updated ASU api requires `target` within reuqests since the
`profile` or `board_name` is never truely unique. This is especially a
problem for x86 devices which mostly use `generic` as profile name.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit c6b4d4ab5a)
2021-04-28 01:31:04 -10:00
Hannu Nyman
a27b10dd36 treewide: i18n - backport translations from master
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-04-27 23:31:27 +03:00
Jo-Philipp Wich
9344026efd luci-app-statistics: treat APC UPS "host" setting as single value option
Existing Lua code incorrectly stated that the "Host" option takes a space
sparated list of hostnames which is not the case since the collect plugin
does not handle multiple hosts.

This change reverts the configuration to a simple value as proposed by
the original PR and adjusts the config summary accordingly, while retaining
the translation string.

Ref: https://github.com/openwrt/luci/pull/5010#issuecomment-827285319
Fixes: dd5d96afd ("luci-app-statistics: fix APC UPS host configuration")
Fixes: e7d22dce5 ("luci-app-statistics: convert collectd configuration to client side views")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8816c8fff7)
2021-04-27 10:18:14 +02:00
Jo-Philipp Wich
a6efaee0dc luci-app-statistics: fix APC UPS host configuration
Ensure that list of hosts is stored as space separated list, like it was
done in the previous Lua implementation.

Fixes: #5010
Fixes: e7d22dce5 ("luci-app-statistics: convert collectd configuration to client side views")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dd5d96afdb)
2021-04-26 17:41:19 +02:00
Dirk Brenken
bbc677096d
luci-app-banip: sync with banIP 0.7.7
* support the new 'Whitelist Only' mode
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-04-22 06:04:22 +02:00
Florian Eckert
a7845594f5 luci-app-dockerman: Carelessness fixed during branch rebasing
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit c4f3ac0528)
2021-04-21 23:00:29 +02:00
Hannu Nyman
af7a61d3a6 luci-mod-network: fix handling of optional RA/NDP options
Fix the handling of optional IPv6 RA and NDP options
that were exposed to LuCI with 504bdb23f

Commit 504bdb23f defined them optional but provided default values.
Those values might get unnecessarily written to /etc/config dhcp when
the the user modifies some other values. Remove the default values,
but provide placeholder for some of them.

Add the missing optional definition to 'ndproxy_routing'.
(It is a flag, so optional default values do not get written to
the config file.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b7dd10da0f)
2021-04-20 21:13:33 +03:00
Florian Eckert
7d913b9976 luci-app-dockerman: update I18n
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-19 16:27:34 +02:00
Florian Eckert
0e664b6c56 luci-app-dockerman: revised the information for the individual page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit ad05a0187b)
2021-04-19 16:26:45 +02:00
Florian Eckert
cef2ac7942 luci-app-dockerman: move docker uci configuration to own page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a9b196edaf)
2021-04-19 16:26:35 +02:00
Florian Eckert
f6ec2b545b luci-app-dockerman: if remote_endpoint is selected a port must be set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 483f1005b1)
2021-04-19 16:26:29 +02:00
Florian Eckert
fa69377ad3 luci-app-dockerman: if remote_endpoint is selected a host must be set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 2ffdf1988e)
2021-04-19 16:26:23 +02:00
Florian Eckert
4b4850ead6 luci-app-dockerman: add datatype and detail info for remote_host option
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit f406004c9c)
2021-04-19 16:26:16 +02:00
Florian Eckert
48d8a1a732 luci-app-dockerman: add log_level i18n translation
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 0e29a0ecc6)
2021-04-19 16:26:10 +02:00
Florian Eckert
31abfc71ee luci-app-dockerman: do not set log_level for dockerd default setting
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 36869ffd2b)
2021-04-19 16:26:04 +02:00
Florian Eckert
b03a826846 luci-app-dockerman: do not preset value selection
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 9fd1278698)
2021-04-19 16:25:58 +02:00
Florian Eckert
e88a046c1e luci-app-dockerman: set examle registry url as placeholder
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit ec564ddf6b)
2021-04-19 16:25:52 +02:00
Florian Eckert
a0d1d9f0fb luci-app-dockerman: remove setting default bip option
If no bip option is set, then the default configuration of dockerd should
be used. The option does not need to be set explicitly.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a9fe74d8fb)
2021-04-19 16:25:46 +02:00
Florian Eckert
e23eec581b luci-app-dockerman: removal of the option socket_path
This option is for debug purposes only. It makes no sense to offer this
option to the user. Especially as it is not used for a remote
connection.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 63c5cb5614)
2021-04-19 16:25:37 +02:00
Dirk Brenken
0cdf59d845
luci-app-adblock: sync with adblock 4.1.1
* support new RPZ-Trigger 'RPZ-CLIENT-IP' (currently bind only)
* Reporting tweaks/mailing
* cosmetics
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-04-18 21:07:37 +02:00
Hannu Nyman
30ca1dbae5 treewide: Backport translations - i18n
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-04-17 19:21:32 +03:00
Dirk Brenken
a307abc9d6 luci-mod-network: fix xhtml markup
* fix markup in interfaces.js (#4980)

Signed-off-by: Dirk Brenken <dev@brenken.org>

(Adapted from commit 2617fcdc63
 by taking only the .js part.)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-04-17 19:15:57 +03:00
Paul Dee
3a9ebc537f luci-mod-network: Introduce new RA and NDP params with help-text.
New: Router Advertisement parameters and accompanying help-text.
New: 3 additional NDP options and accompanying help-text.

Until now, some of the IPv6 settings are mysterious. They are now
clarified. The information is accessible to IPv6 beginners.

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 504bdb23fb)
2021-04-17 19:13:52 +03:00
Paul Dee
c649db4f23 luci-mod-network: Add help text for many existing odhcpd IPv6 parameters
and Global network options ULA.

Relocated the "DHCPv6 Mode" to below RA-Service: DHCPv6-Mode is actually
ra_management in disguise. Better grouping.

Until now, some of the IPv6 settings are mysterious. They are now
clarified. The information is accessible to IPv6 beginners.

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 988c98bdc6)
2021-04-17 19:13:40 +03:00
Jo-Philipp Wich
06dd6b521d luci-base: form.js: fix AbstractValue.textvalue() for uci list options
Serialize the uci list value into a space separated string before passing
it to String.format() for HTML escaping. Without that change, empty strings
were returned whenever the underlying uci get operation yieled an array.

Fixes: #4993
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 5c792aefc7)
2021-04-16 17:32:47 +02:00
Ptilopsis Leucotis
93c869efe1 luci-app-fwknopd: add support for ENABLE_CMD_EXEC
Add support for execution commands on the fwknopd server.

Signed-off-by: Ptilopsis Leucotis <PtilopsisLeucotis@yandex.com>
(cherry picked from commit 57839f183b)
2021-04-13 19:12:59 +03:00
Eneas U de Queiroz
49d2a94ebd luci-app-xlc: don't build package for arc
lxc does not build on arc.  Since luci-app-xlc selects lxc, it needs to
check @!arc first.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit c6d196cc82)
2021-04-13 19:12:42 +03:00
Alexander Egorenkov
a953870b3b luci-app-transmission: fix '&nbsp' exception in OpenWrt theme
Convert '&nbsp;' to '&#160;' which is both syntactically correct (semicolon present) and XHTML compliant.

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
(cherry picked from commit afd096edfc)
2021-04-13 19:12:34 +03:00
Stan Grishin
9a135ae4b3
Merge pull request #4975 from stangri/21.02-luci-app-simple-adblock
[21.02] luci-app-simple-adblock: bugfix: crash when dnsmasq.ipset selected
2021-04-11 09:38:48 -07:00
Stan Grishin
4f7ccf0d85 luci-app-simple-adblock: bugfix: crash when dnsmasq.ipset selected
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-04-10 18:45:01 +00:00
Jo-Philipp Wich
3fff72a3f5 luci-app-commands: prevent page reload on invoking command actions
Fixes: f117b7f ("luci-app-commands: use <button> elements")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 36959dc0d1)
2021-04-09 14:37:03 +02:00