Jo-Philipp Wich [Mon, 9 Aug 2021 17:41:30 +0000 (19:41 +0200)]
luci-mod-network: fix legacy_rates option dependency
The recently introduced band option support changed the internal frequency
selector choice values, breaking the legacy rates option dependency.
Fixes: #5234
Fixes: 0829d31290 ("luci-mod-network: support newer wireless.wifi-device.band option")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
fd2e755b6f30d80ffdf15536669fdb739212ac96)
Stan Grishin [Wed, 4 Aug 2021 20:24:34 +0000 (13:24 -0700)]
Merge pull request #5227 from stangri/21.02-firewall
[21.02] luci-app-firewall: replace hh.mm.ss with hh:mm:ss
Stan Grishin [Wed, 4 Aug 2021 20:20:13 +0000 (20:20 +0000)]
luci-app-firewall: replace hh.mm.ss with hh:mm:ss
Signed-off-by: Stan Grishin <stangri@melmac.net>
Stan Grishin [Mon, 2 Aug 2021 05:58:55 +0000 (22:58 -0700)]
Merge pull request #5217 from stangri/21.02-luci-app-https-dns-proxy
[21.02] luci-app-https-dns-proxy: update to 2021-07-29-1
Stan Grishin [Sat, 31 Jul 2021 10:47:39 +0000 (10:47 +0000)]
luci-app-https-dns-proxy: update to 2021-07-29-1
* add HTTP/2-only supporting providers: Mullvad, Digitale-Gesellschaft, dns.sb and Rubyfish.cn
* switch default provider from Google to Cloudflare
* add IPv6 addresses for bootstrap resolvers for Google DNS
* add secondary bootstrap resolver (Cloudflare's) to all providers with a single bootstrap resolver
* modify model/cbi file to show HTTP/2-only providers (and help texts) on HTTP/2-supporting systems
Signed-off-by: Stan Grishin <stangri@melmac.net>
Paul Spooren [Sun, 25 Jul 2021 22:36:19 +0000 (00:36 +0200)]
luci-app-attendedsysupgrade: fix empty array condition
In JavaScript (other than in Python) an empty array is considered `true`
within if statements. Fix this by checking for the array length rather
than its existence.
This fixes the issue of an empty dropdown menu in case the user is
running the latest release.
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit
7f5becc69e004f831c9dc09e0859c179b439c7d2)
Huangbin Zhan [Wed, 23 Dec 2020 03:09:38 +0000 (11:09 +0800)]
luci-app-attendedsysupgrade: remove depends uhttpd-mod-ubus
Remove depenedency uhttpd-mod-ubus which is not required.
User may want to work with nginx rather uhttpd.
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
(cherry picked from commit
9866bfe13ce2bed07453cce968f670e00a0d7517)
Paul Spooren [Mon, 21 Jun 2021 08:27:25 +0000 (22:27 -1000)]
luci-app-attendedsysupgrade: fix ACL definition
Fix the ACL file which handles the permissions for the LuCI app.
Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit
02de3e4a2b08d2fb9d4f08b83a2526337671b6e2)
Hannu Nyman [Wed, 21 Jul 2021 21:29:06 +0000 (00:29 +0300)]
treewide: i18n - Backport translations
Backport translations from master.
Sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Thu, 15 Jul 2021 09:58:38 +0000 (11:58 +0200)]
luci-mod-system: reload crond upon saving crontab
Fixes: #5184
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8d4ac60f7a02e5c8e3d186f4009b4696b098152d)
Jo-Philipp Wich [Tue, 13 Jul 2021 18:45:29 +0000 (20:45 +0200)]
luci-app-acl: remove support for plaintext login passwords
Upon reviewing the rpcd session support code, it turns out that account
definitions with plaintext password values are not supported, the password
value is treated as crypt() hash/salt in any case.
Ref: https://github.com/openwrt/luci/issues/5179
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
f74b06cb92e403fa281414d5a6bd57228858bfa7)
Dirk Brenken [Sat, 10 Jul 2021 14:30:02 +0000 (16:30 +0200)]
luci-app-adblock: expose dns instance option
* expose the 'adb_dnsinstance' option to LuCI under
Advanced DNS Settings (only relevant for dnsmasq)
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
Anton Kikin [Fri, 2 Jul 2021 01:37:38 +0000 (04:37 +0300)]
luci-app-nlbwmon: Add translation context for Download/Upload terms
Added a translation context for the terms 'Download' and 'Upload'
used in this application. The reason is that these terms are
translated differently in Russian depending on the context.
If the terms are used in the sense of an action (download file
or upload file) then the translations should be as follows:
- Download = скачать
- Upload = загрузить
But if they are used in the context of a traffic counter (like
in this application) the correct translations are:
- Download = скачано
- Upload = загружено
A translation context has been added to all affected PO files
to avoid breaking existing translations. The Russian translation
in PO file is fixed to comply with the used context.
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit
fb52e86b54f25e8fb2f46c857af20dd3b4ddb022)
Jo-Philipp Wich [Sun, 13 Jun 2021 06:57:27 +0000 (08:57 +0200)]
luci-app-sqm: only reload view once sqm enable/start completed
Chain the exec calls to enable and start the SQM service and only reload
the view once these operations are complete and return the entire promise
chain from the handler function to ensure that the busy indicator remains
active throughout the entire duration of the operation.
Also replace exec_direct() with exec() as there is no need to bypass ubus
for the init script calls.
Fixes: e76d9cc767 ("luci-app-sqm: fix JS error if service is disabled")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
005c09a293d1d0f4a5a76e210e0fa23842f13cb3)
Dirk Brenken [Sat, 5 Jun 2021 07:43:46 +0000 (09:43 +0200)]
luci-app-sqm: fix JS error if service is disabled
* fix a 'resource not found error' if the sqm service has been disabled
and the dir '/var/run/sqm/available_qdiscs' not exist
* inform the user about this issue and provide a button
to enable & start the service
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
e76d9cc7673ffbebd8887bcfc14542c1269288e0)
Florian Eckert [Thu, 1 Jul 2021 13:54:21 +0000 (15:54 +0200)]
luci-base: do not add validation for named section if readonly is set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
1a2b7fef6cc181f7f0ff0e1133ad4d8ab03e279c)
Helge Mader [Fri, 12 Mar 2021 14:47:38 +0000 (15:47 +0100)]
luci-base: prevent empty field for adding new named section in JavaScript
Suggested-by: Helge Mader <ma@dev.tdt.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
87215e3d1bd2406c4a5ae5088e176fb4aefbe546)
Florian Eckert [Mon, 21 Jun 2021 13:02:04 +0000 (15:02 +0200)]
luci-base: change css class btn to cbi-button
The css class btn is only a valid input element on lua rendered pages.
Use instead cbi-button for javascript rendered pages.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
80262bb9a7e63eeee0e1fa5f290b27a569a644bf)
Florian Eckert [Mon, 21 Jun 2021 11:48:40 +0000 (13:48 +0200)]
luci-base: use button tag instead of input tag on named section add
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
97e673b72cc96f5f866df7e990a51fa65bff5b5f)
Florian Eckert [Wed, 30 Jun 2021 12:58:14 +0000 (14:58 +0200)]
luci-app-acl: unset read and write before acl set
If the setting in the view is set to `denied`, only the read list option
is deleted. This is not correct. The write list option must also be
deleted. To ensure that the correct configuration is saved, the write
and read list options are always deleted beforehand and then rewritten.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
f4e8fcb6b53780bd2d126b22a89c379cd7c071d7)
Jo-Philipp Wich [Wed, 7 Jul 2021 15:14:15 +0000 (17:14 +0200)]
luci-mod-status: disable "Set static" lease action on readonly view
Fixes: f6b6a12927 ("luci-mod-status: add support for one-click static lease")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a6d957d6f59329cc16c838afe3c88c6072fad236)
Jo-Philipp Wich [Wed, 7 Jul 2021 14:48:09 +0000 (16:48 +0200)]
luci-app-acl: ensure to set read/write ACL presets as uci lists
The rpcd daemon expects uci list notation for the login.read and login.write
options, so ensure to set them accordingly when chosing the `full access` or
`readonly` presets while configuring an account.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9922c838cd1abcda60f4e93b89b0c52a101fc667)
DeYu Liu [Tue, 6 Jul 2021 05:44:20 +0000 (13:44 +0800)]
luci-base: Fix time display error
Signed-off-by: DeYu Liu <vito_sam@outlook.com>
(cherry picked from commit
0e4b4c5b42f9d8b93a4936c4b2d63f9a90c5a61b)
Jo-Philipp Wich [Sat, 3 Jul 2021 18:10:22 +0000 (20:10 +0200)]
luci-base: validation: disallow mutlicast MACs by default
Extend the MAC address validator to disallow multicast MAC addresses and
add a new optional validator option to require multicast MACs instead of
unicast ones.
Fixes: #5166
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
00e41c3c4977f75e6ca43429dd4c8c2f5cb22419)
Dirk Brenken [Fri, 2 Jul 2021 18:14:10 +0000 (20:14 +0200)]
luci-app-openvpn: create base directory if not available
* trivial fix for never ending ticket #3454
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
b6f36ca91b74e708cb8866a0299923dab3f5343b)
Paul Spooren [Mon, 5 Jul 2021 03:45:49 +0000 (17:45 -1000)]
luci-app-attendedsysupgrade: fix typo
Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit
cef330a1c8b59b0b84bb862b8d04b56892be3803)
Jo-Philipp Wich [Sat, 3 Jul 2021 05:20:30 +0000 (07:20 +0200)]
Revert "luci-mod-network: issue with breakdown of dnsmasq after duplication of static IP was fixed"
This reverts commit
463e910119813aaea0755ff5c16c91ce412a8cbb.
This change causes the entire static lease to get deleted when attempting
to change the MAC address.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
91f46d765b36825fcfe63e2b7d4863de00cdc69d)
Jo-Philipp Wich [Fri, 2 Jul 2021 18:47:11 +0000 (20:47 +0200)]
luci-mod-network: fix saving bridge VLANs without member ports
Calling `uci.set()` with an empty array yields an invalid argument error,
make sure to pass `null` instead in this case.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
f1f566bfe2a6b0960ba95a5ea05ca4353b766867)
Jo-Philipp Wich [Fri, 2 Jul 2021 18:40:08 +0000 (20:40 +0200)]
luci-mod-network: work around jsmin bug
The jsmin minifier incorrectly transforms the expression `/\*/.test(...)`
into `/\* /.test(...)`, causing the VLAN filter dialog to not recognize
PVID settings in the configuration.
Work around the issue by using an equivalent `\x2a` escape sequence instead.
Ref: https://forum.openwrt.org/t/x/99222/28
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
2869c9cf324a9e057567075d4977c7cc40140938)
Jo-Philipp Wich [Mon, 21 Jun 2021 06:27:14 +0000 (08:27 +0200)]
treewide: fix typo in "Enable VLAN filtering" label
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
c48d8f4a2c9a771c8c03a76eb1b554f62d57140b)
Jo-Philipp Wich [Wed, 30 Jun 2021 15:26:07 +0000 (17:26 +0200)]
luci-mod-status: don't set '-' hostname when creating static lease
Fixes: #5153
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e3357deb7d273b6a982dfaf9800c83eba85fe6b2)
Jo-Philipp Wich [Wed, 30 Jun 2021 15:21:50 +0000 (17:21 +0200)]
luci-mod-network: enforce IPv4 mode for traceroute call
Recent busybox traceroute applet versions support both IPv4 and IPv6 and
default to IPv6 when running a route trace to an IPv6 enabled target
host. Pass the `-4` flag to enforce IPv4 mode in this case.
Fixes: #5155
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c4f429461545d1401429e7ba133f24a55d1015b6)
Jo-Philipp Wich [Thu, 17 Jun 2021 15:44:21 +0000 (17:44 +0200)]
luci-mod-network: parse ports without tag/pvid annotation as well
Fixes: 01eac366f6 ("luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e57f8663afd53cc7421debcd63444e1d136f5dec)
Jo-Philipp Wich [Thu, 17 Jun 2021 15:33:49 +0000 (17:33 +0200)]
luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports
The previous code naively looked for a `t` in the entire port spec,
wrongly matching untagged ports having a `t` in their name, such
as `eth0`.
Rework the logic to be more strict when parsing the port member
specification to avoid this issue.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
01eac366f69ba58c090ddc2cb70aeb069adbdd5a)
Jo-Philipp Wich [Thu, 17 Jun 2021 10:28:51 +0000 (12:28 +0200)]
luci-mod-network: refactor device configuration
Since all netifd device types inherit generic device settings, we can
simplify various aspects of the device configuration ui and drop unused
code while we're at it.
- Remove setIfActive() helper, superseded by commit
f3f74bd0fe ("luci-base: form.js: consider aliased options in AbstractValue.remove()")
- Remove most dependency constraints to make all generic device settings
available for all device types
- Add MTU value validation to disallow exceeding parent device MTU for
VLAN interfaces
- Dynamically update placeholder values when changing base or parent
device options
- Undo VLAN network config hack since all options are available now.
Reverts commit
3c6b59504a ("luci-mod-interfaces: simplify configuring MAC address of 802.1q devices")
- Do not suggest inactive wireless networks as existing device or base
device choices
- Disallow specifying names of already existing network devices when
creating new device settings
- Fix a number of multicast dependency specifications
- Drop now unused functions
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
f689d0d208acbf9934da5a2d49c8717c054be585)
Jo-Philipp Wich [Thu, 17 Jun 2021 07:45:48 +0000 (09:45 +0200)]
luci-mod-network: change port status layout in vlan filter config
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
36350e9867ca9fd2f9b137ed76f0fabe0e57c880)
Jo-Philipp Wich [Thu, 1 Jul 2021 19:10:53 +0000 (21:10 +0200)]
build: add script to find commits suitable for cherry picking
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
0ead87320bade6f924991f4310271582a760edb4)
Dirk Brenken [Wed, 30 Jun 2021 14:34:55 +0000 (16:34 +0200)]
luci-app-adblock: sync with latest version
* expose new reporting option to LuCI
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
83778c145281eb128a4acf23defda07003dfdc98)
Florian Eckert [Tue, 29 Jun 2021 06:58:19 +0000 (08:58 +0200)]
Merge pull request #5145 from msylgj/patch-2
luci-app-frpc/frps:add service status display
SiYao Mo [Thu, 24 Jun 2021 08:01:18 +0000 (16:01 +0800)]
luci-app-frpc/frps:add service status display
reference from luci-app-smartdns
Special thanks to Nick Peng <pymumu@gmail.com>
Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
Florian Eckert [Thu, 24 Jun 2021 06:22:36 +0000 (08:22 +0200)]
Merge pull request #5142 from msylgj/patch-2
luci-app-frpc: allow hostname in server address
Siyao Mo [Tue, 22 Jun 2021 18:40:14 +0000 (02:40 +0800)]
luci-app-frpc: allow hostname in server address
Sometimes, our frp server cannot use a static ip address.
So perhaps we should allow people to use hostname in server address.
Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
Florian Eckert [Mon, 21 Jun 2021 11:53:18 +0000 (13:53 +0200)]
luci-app-nlbwmon: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Mon, 21 Jun 2021 11:53:03 +0000 (13:53 +0200)]
luci-base: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Mon, 21 Jun 2021 11:52:50 +0000 (13:52 +0200)]
luci-app-watchcat: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Mon, 21 Jun 2021 11:52:28 +0000 (13:52 +0200)]
luci-app-banip: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Mon, 21 Jun 2021 11:52:12 +0000 (13:52 +0200)]
luci-app-adblock: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Anton Kikin [Tue, 6 Apr 2021 01:21:01 +0000 (04:21 +0300)]
luci-mod-network: Support for disabling routes
Support for disabling routes in netifd was added in commit [1]. This commit
adds support for disabling routes through the LuCI interface.
Additionally hidden the route options descriptions in the header of the
routes table (they are still available in the modal view).
[1]: https://git.openwrt.org/?p=project/netifd.git;a=commit;h=
327da9895327bc56b23413ee91a6e6b6e0e4329d
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit
bfe8a01040c8a74f38818195620f069f5bc10c5c)
Florian Eckert [Wed, 16 Jun 2021 14:32:35 +0000 (16:32 +0200)]
luci-mod-status: switch to html table for wlan channel analysis
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
8f8ce8613fb6e41954aa5bcbb60330e3b034bd3a)
Jo-Philipp Wich [Thu, 17 Jun 2021 12:11:39 +0000 (14:11 +0200)]
luci-theme-openwrt-2020: fix spinning disk animation
Fixes: #4824
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e8a6f0bb7c7c24f31ddbc36f81fa97b3a2a53b2e)
Florian Eckert [Thu, 17 Jun 2021 13:06:12 +0000 (15:06 +0200)]
luci-app-nlbwmon: show force reload button even if data are available
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
a7be13ff05cc35352a02ad7c36acd704a037e37f)
Florian Eckert [Thu, 17 Jun 2021 10:50:40 +0000 (12:50 +0200)]
luci-app-nlbwmon: adjused the display export page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
04c4499be74152c476ca1edfd6b8048252a55251)
Florian Eckert [Thu, 17 Jun 2021 10:26:24 +0000 (12:26 +0200)]
luci-app-nlbwmon: change force reload html element to button
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
d6443a629362f7ed79d1212cd964e5d6a127a9c0)
Florian Eckert [Thu, 17 Jun 2021 10:24:43 +0000 (12:24 +0200)]
luci-app-nlbwmon: add missing cbi-button class for database backup
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
6f6ec9f56cc24be9f432b0a88a29f46277dad7d5)
Florian Eckert [Wed, 16 Jun 2021 12:01:03 +0000 (14:01 +0200)]
luci-app-nlbwmon: fix url
When moving this application to the service section, the links were
forgotten to be changed.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
7a365183296f385bb8cb14b8eb6fcfc29941c7e4)
Florian Eckert [Wed, 8 Jul 2020 08:13:09 +0000 (10:13 +0200)]
luci-app-nlbwmon: move into menu entry into service section
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
9e91737566cc6101b4bf37107c6d945842f06bb8)
Jo-Philipp Wich [Fri, 18 Jun 2021 12:28:26 +0000 (14:28 +0200)]
luco-app-ksmbd, luci-app-omcproxy: use relative luci.mk include path
Fixes: #5134
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
2f0ffd9d82b1e41d64e4d63088086f4956010840)
Jo-Philipp Wich [Thu, 17 Jun 2021 06:58:15 +0000 (08:58 +0200)]
luci-mod-network: only consider bridge vlans belonging to the current device
In case multiple bridges with bridge vlans are declared, LuCI did not
correctly filter the VLANs to show only the ones belonging to the
bridge being configured currently.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
f6f1eacb012b0364940c1dc9b9392fc0e60405b9)
Yu Hua [Tue, 15 Jun 2021 14:24:27 +0000 (22:24 +0800)]
luci-lib-docker: add container export support
commit from https://github.com/lisaac/luci-lib-docker
Signed-off-by: Yu Hua <hue715@gmail.com>
(cherry picked from commit
fe795d5278e541c91d16374371c7f2a0c3eae998)
Jo-Philipp Wich [Tue, 15 Jun 2021 08:06:26 +0000 (10:06 +0200)]
treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Tue, 15 Jun 2021 08:02:44 +0000 (10:02 +0200)]
rpcd-mod-luci: bump version
Fixes: a78b74784d ("rpcd-mod-luci: refactor host hint gathering")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a26b53314db468e2a3c0c5ea4d8db4939d8eb09c)
Jo-Philipp Wich [Mon, 14 Jun 2021 18:47:11 +0000 (20:47 +0200)]
rpcd-mod-luci: refactor host hint gathering
- Do not incorrectly put the IP addresses from the rrdns reply into the
first hint, instead distribute hostnames to the appropriate hints.
- Avoid returning stale lease information from previously parsed records
by clearing the static struct before each parse attempt.
- Improve existing checks for empty MAC addresses and unspecified IPv6
addresses.
Fixes: #5126
Fixes: 87bcf9e923 ("rpcd-mod-luci: Return array of addresses in getHostHints")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a78b74784dc1d4a4007e3e21a79228d5192f0dad)
Jo-Philipp Wich [Mon, 14 Jun 2021 07:05:24 +0000 (09:05 +0200)]
luci-mod-network: wireless.js: recognize HE* htmodes
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=3856#comment9797
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
4286c84825c15f4d36f294b2ea28071667a4be7e)
Dirk Brenken [Sat, 12 Jun 2021 21:16:48 +0000 (23:16 +0200)]
luci-app-banip: sync with banip 0.7.9
* support the new 'ban_fetchinsecure' option
* improve the chain help text to make clear that you can assign
multiple FW chains
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
770548eadf21ea4c18c57b5e4ee68bf7dfa184fd)
Dirk Brenken [Sat, 12 Jun 2021 20:29:20 +0000 (22:29 +0200)]
luci-app-adblock: sync with adblock 4.1.3
* support the new 'adb_fetchinsecure' option
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
be578c64e97d138e7104dfa7025eb9ab998b3b07)
Jo-Philipp Wich [Sun, 13 Jun 2021 19:49:22 +0000 (21:49 +0200)]
luci-theme-bootstrap: mobile style fixes for vlan filter matrix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e6a2cdbdab83f8eaefeec36ad668468ea374d471)
Jo-Philipp Wich [Sun, 13 Jun 2021 19:47:40 +0000 (21:47 +0200)]
luci-mod-network: small styling fixes for vlan filter matrix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
cbf2cc396a29d6794a4d883d80f8390e227e072b)
Rafał Miłecki [Thu, 10 Jun 2021 11:20:41 +0000 (13:20 +0200)]
luci-mod-network: migrate more device options
Include mtu and igmp_snooping while migrating.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit
fa51d04459b16245d33a1562159c65d4b03a32f0)
Jo-Philipp Wich [Sun, 13 Jun 2021 17:54:36 +0000 (19:54 +0200)]
csstidy: update to latest Git HEAD
707feae parse_css: do not omit white space in url() property values
Ref: https://github.com/openwrt/luci/commit/
69608199973651baf585d24a095edf8c0c42e21f#commitcomment-
52088358
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e266c749034310b26410cf820e95691654e18174)
Jo-Philipp Wich [Sat, 12 Jun 2021 20:54:51 +0000 (22:54 +0200)]
luci-mod-network: reset bridge VLANs on cancelling modal dialog
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
bb3269945c7f189e1d1de1e7979d79d30a860b03)
Jo-Philipp Wich [Sat, 12 Jun 2021 20:08:13 +0000 (22:08 +0200)]
luci-mod-network: fix vlan filter matrix overflow after redraw
Ensure that the overflow styles are reapplied after a redraw. This also
simplifies the code as a side-effect.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
7a781d9cd8ab783dd7a5c72f154b972a9ea9aa98)
Jo-Philipp Wich [Sat, 12 Jun 2021 17:37:09 +0000 (19:37 +0200)]
treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 7 Jun 2021 11:59:03 +0000 (13:59 +0200)]
protocols: unify TOS and TTL description strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
b4c394f2d275ab093a16d994333da4f104e1723f)
Jo-Philipp Wich [Mon, 7 Jun 2021 10:43:36 +0000 (12:43 +0200)]
treewide: consolidate {IPv4,IPv6,MAC} {address,gateway} spellings
- Turn IPv4-Address into IPv4 address
- Turn IPv4-Gateway into IPv4 gateway
- Turn IPv6-Address into IPv6 address
- Turn IPv6-Gateway into IPv6 gateway
- Turn MAC-Address into MAC address
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
88b9d843882cf52a6acf4d08a878fd005120edd4)
Jo-Philipp Wich [Mon, 7 Jun 2021 09:51:06 +0000 (11:51 +0200)]
treewide: fix "promiscious" typo
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
b5832d134e0e38609ea8a2d83b8aa62e0e662f24)
Dirk Brenken [Wed, 14 Apr 2021 12:12:06 +0000 (14:12 +0200)]
luci-mod-system: remove bogus btn class in flash.js
* fixes #4970
Signed-off-by: Dirk Brenken <dev@brenken.org>
[omit translation sync]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
8c6a29a45cba64724bd726e52719eabbfa8528a6)
Wojciech Jowsa [Wed, 5 May 2021 13:28:39 +0000 (15:28 +0200)]
luci-mod-status: check if center_chan1 is defined
Signed-off-by: Wojciech Jowsa <wojciech.jowsa@gmail.com>
(cherry picked from commit
ead64c0195cd792341a6dddce7ea5e724247c60d)
Jo-Philipp Wich [Mon, 1 Mar 2021 18:02:57 +0000 (19:02 +0100)]
luci-theme-openwrt-2020: rework table styles
Target table, tr, th and td tags directly and stop using the corresponding
CSS class names.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
70571084004ede442e7f2e944d17156c83182a24)
Jo-Philipp Wich [Fri, 11 Jun 2021 08:18:10 +0000 (10:18 +0200)]
luci-mod-network: add port status to bridge vlan filter matrix
Also ensure that port devices are ordered numerically.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8c71b1d01ee234c5681684e9aae5f63dbe9ebb07)
Jo-Philipp Wich [Sat, 12 Jun 2021 16:41:40 +0000 (18:41 +0200)]
luci-base: network.js: add link status information accessors
Fixes: #5121
Fixes: 8c71b1d01e ("luci-mod-network: add port status to bridge vlan filter matrix")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
1bcb12570c3b6f26009801ee6006b2ab305d088f)
Jo-Philipp Wich [Fri, 11 Jun 2021 06:28:31 +0000 (08:28 +0200)]
lucihttp: update to latest Git HEAD
Fixes compilation under 32bit systems by using the proper printf format
specifier for size_t values.
Also fixes compilation with Ninja by appending instead of
overwriting CMAKE_OPTIONS.
Fixes: #5116
Suggested-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
d1fc11d852262bacb650a49782dbce0c8cbd572a)
Jo-Philipp Wich [Wed, 9 Jun 2021 17:18:04 +0000 (19:18 +0200)]
rpcd-mod-luci: add link details to ubus netdev information
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
113c0b0d26b2f60c38a605732ce4c0fb3bdfc7dc)
Jo-Philipp Wich [Wed, 9 Jun 2021 19:55:14 +0000 (21:55 +0200)]
luci-mod-network: fix horizontal scrolling in the bridge vlan filter matrix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
ded6e53bcdb9c484f99779fffa20a37bc6d70c3c)
Jo-Philipp Wich [Wed, 9 Jun 2021 19:45:13 +0000 (21:45 +0200)]
luci-base: ui.js: determine dropdown position relative to overflow parent
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e3bf521edbd0c6f59aba9aa9a89a9d96e1da3fd2)
Lukasz Baj [Fri, 16 Apr 2021 17:36:43 +0000 (19:36 +0200)]
luci-mod-status: fix NaN errors in realtime graphs
When I use Realtime Graphs I see following NaN errors:
Error: <polyline> attribute points: Expected number, "0,298 0,NaN 5,NaN 10,NaN…".
Error: <polyline> attribute points: Expected number, "0,298 0,NaN 5,NaN 10,NaN…".
wireless.js?v=git-21.105.40538-
2da37c2:19 Error: <polyline> attribute points: Expected number, "0,298 0,NaN 5,NaN 10,NaN…".
eval @ wireless.js?v=git-21.105.40538-
2da37c2:19
Promise.then (async)
eval @ wireless.js?v=git-21.105.40538-
2da37c2:8
step @ luci.js?v=git-21.105.40538-
2da37c2:91
start @ luci.js?v=git-21.105.40538-
2da37c2:87
add @ luci.js?v=git-21.105.40538-
2da37c2:82
pollData @ wireless.js?v=git-21.105.40538-
2da37c2:7
render @ wireless.js?v=git-21.105.40538-
2da37c2:24
Promise.then (async)
__init__ @ luci.js?v=git-21.105.40538-
2da37c2:148
super @ luci.js?v=git-21.105.40538-
2da37c2:22
Anonymous42Class @ luci.js?v=git-21.105.40538-
2da37c2:12
(anonymous) @ luci.js?v=git-21.105.40538-
2da37c2:181
Promise.then (async)
compileClass @ luci.js?v=git-21.105.40538-
2da37c2:177
Promise.then (async)
require @ luci.js?v=git-21.105.40538-
2da37c2:183
instantiateView @ ui.js?v=git-21.105.40538-
2da37c2:311
(anonymous) @ wireless:47
Promise.then (async)
(anonymous) @ wireless:46
Signed-off-by: Lukasz Baj <l.baj@celerway.com>
[adjust subject]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c6a5c809ed1fb050d257cf6273b8bc832babfa9b)
Jo-Philipp Wich [Wed, 9 Jun 2021 09:01:36 +0000 (11:01 +0200)]
luci-mod-network: interfaces.js: fix ifname migration in device sections
The migration code attempted to add new device sections instead of moving
the ifname option to a ports list within the existing ones.
Fixes: #5108
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e13d82a202975bd9ac5eca380049b887cb1d585d)
Jo-Philipp Wich [Wed, 9 Jun 2021 08:22:38 +0000 (10:22 +0200)]
luci-mod-network: interfaces: show bridge port device icons again
Restore the display of bridge port device icons in the interface overviews.
This feature has been lost after migrating the network config from legacy
bridge declarations to device bridge declarations.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
608f89429b4b8537ddaefd070c777a6d4fb1c7a1)
Jo-Philipp Wich [Wed, 9 Jun 2021 07:59:15 +0000 (09:59 +0200)]
luci-mod-network: support newer wireless.wifi-device.band option
OpenWrt switched from "option hwmode" to "option band" in order to select
the frequency band to use for the radio phy.
Extend the channel selector to recognize and use an existing "option band"
to select the appropriate channel list. When operating upon a wireless
configuration still using "option hwmode", then translate it to a band
value internally and translate it back to "option hwmode" on save.
This should provide forward- and backwards compatibility with both current
OpenWrt master and older versions still using hwmode.
Fixes: #5106
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
0829d31290e7c902743fbd86ea91b06ee90c6e42)
Jo-Philipp Wich [Sat, 5 Jun 2021 16:41:39 +0000 (18:41 +0200)]
luci-mod-network: allow device declarations and device configs to coexist
It is legal to have two device sections referring to the same netdev if one
section is a declaration (a section setting option type) and the other is
a configuration (a section not specifying a type but matching an existing
netdev).
Support this case in LuCI since it might be required for some complex
device setups.
Additionally, fix the device type determination for device configuration
sections without type, those should be treated as ethernet (a.k.a.
simple device) configuration instead of falling back to the underlying
netdev device type.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a6c0ad00b28a5d3f91338b50f7e69fbd45f2154e)
David Bauer [Sat, 5 Jun 2021 14:21:42 +0000 (16:21 +0200)]
luci-base: add 11ax HW / HT modes
Add the known values returned for 802.11ax HW as well as HT modes to the
respective method descriptions.
Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit
4b17f8baa3574527dc6ab8914fd322a08cb9784c)
David Bauer [Tue, 20 Apr 2021 15:42:02 +0000 (17:42 +0200)]
luci-mod-network: add 802.11ax HE support
This commit adds the ability to configure HE-modes for radios
(HE20 / HE40 / HE80 / HE160) as well as HE rate information in the
assiciation view.
Tested-on: Ubiquiti UniFi 6 Lite / LR
Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit
f35e877dc65c727a6ce7f7972a5be4d15921827b)
Jo-Philipp Wich [Sat, 5 Jun 2021 14:16:14 +0000 (16:16 +0200)]
luci-mod-interfaces: simplify configuring MAC address of 802.1q devices
Treat not explicitly configured, preexisting VLAN interfaces as simple
network devices when adding configuration for them, since it is more
likely that people want to set general device properties such as MAC
address instead of reconfiguring ingress/egress QoS mapping, which is
the only editable property of preexisting VLAN device config dialogs.
Ref: https://github.com/openwrt/luci/issues/5102
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
3c6b59504aaa6ee33a2ee768aafc0aeaefb06004)
Jo-Philipp Wich [Tue, 1 Jun 2021 20:23:09 +0000 (22:23 +0200)]
luci-mod-network: interfaces: restructure DHCPv6 and IPv6 RA options
- Condense overly large IPv6 RA/DHCPv6 description texts and get rid of most embedded markup
- Switch ra/ndp/dhcpv6 mode selections to rich dropdown lists and move extended choice
descriptions next to the selection options
- Drop ndproxy_static option which has been removed from odhcpd long ago
- Add format validations to all text input fields
- Add ability to configure master/relay modes for non-static interfaces (#2998)
- Move extended RA configuration options into a new tab
- Prevent enabling master mode on multiple interfaces
- Prevent enabling ra/dhcpv6 server mode on non-static or master interfaces
- Drop ra_management in favor to ra_flags option (#5083)
- Add support for dns_service option
- Read current effective IPv6 MTU and hop limit placeholder values from procfs
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
3fbd4338846e8229935b54256a3a541a3e15d8bd)
Jo-Philipp Wich [Thu, 3 Jun 2021 08:03:48 +0000 (10:03 +0200)]
luci-app-firewall: further luci-rpc/getHostHints compatibility fixes
Rework some further code instances to fall back to the legacy ipv4/ipv6
properties if needed.
Fixes: c7b7b42cd3 ("treewide: Update JS using luci-rpc getHostHints")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
dc0cfc642e42eefcac91bb965f9aa612089fad5d)
Jo-Philipp Wich [Wed, 2 Jun 2021 18:35:32 +0000 (14:35 -0400)]
luci-proto-wireguard: fix fwmark validation to allow 32 bit values
The iptables mark field is 32 bits wide, which is 4 bytes and so 8 hex
characters. Fix the fwmark validation to allow 8 characters in the hex
string.
Fixes: #5098
Suggested-by: Robert <32970961+differentblue@users.noreply.github.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
bc1015f7db57506b2468846f79dbd5bfe0dbea7a)
Jo-Philipp Wich [Wed, 2 Jun 2021 09:54:42 +0000 (11:54 +0200)]
luci-base: network.js: sorting fixes
Ensure that sort callbacks consistently return [-N .. 0 .. +N] values
instead of just true/false.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e35041e0a8edcf039d62a74cbc5e0f4043d04029)
Niels Widger [Wed, 31 Mar 2021 12:23:12 +0000 (08:23 -0400)]
treewide: Update JS using luci-rpc getHostHints
Update frontend JS code which uses luci-rpc getHostHints to support the new
response format which removes the `ipv4` and `ipv6` host hint string fields
and replaces them with `ipaddrs` and `ip6addrs` weighted string list fields.
Signed-off-by: Niels Widger <niels@qacafe.com>
[rework code to be forwards/backwards compatible, fix some Network.Hosts
methods, fix IP choice ordering, change commit subject, rewrap commit
message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c7b7b42cd3840cfd67f412191578a8659eb63c87)
Niels Widger [Mon, 1 Mar 2021 19:33:33 +0000 (14:33 -0500)]
rpcd-mod-luci: Return array of addresses in getHostHints
Update luci-rpc's getHostHints method to return two string arrays for
each host, `ipaddrs` and `ip6addrs`, each containing the host's IPv4
and IPv6 addresses, respectively. Each array is sorted by a priority
derived from the source from which the address was discovered. The
current address sources and their priority is as follows (a
higher (larger) priority is listed first):
- neighbor table entries: 10
- /etc/ethers entries: 50
- DHCP leasefile: 100
- RRDNS queries: 100
- getifaddrs(): 200
- UCI static leases: 200
The existing `ipv4` and `ipv6` string fields for each host in
`getHostHints` has been removed. Downstream users of getHostHints
still need to be updated.
Fixes: #4838
Signed-off-by: Niels Widger <niels@qacafe.com>
[squash commits, reformat fixes tag]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
a5195e7825cbbc3942ca6e571ae0020c1cf080c4)
Jo-Philipp Wich [Tue, 1 Jun 2021 13:31:44 +0000 (15:31 +0200)]
protocols: rename "device" option to "_modem_device"
This is required to resolve clashes with the generic "option device"
referring to netdev names in current netifd versions.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
96ee6dc8d6c9796ab67de6f313a068a4bd3bb20f)
Jo-Philipp Wich [Tue, 1 Jun 2021 13:27:24 +0000 (15:27 +0200)]
luci-mod-network: rename "device" option to "_net_device" internally
This is required to resolve conflicts with the existing "device" option
in other proto handlers such as PPP or QMI where "device" refers to the
device path of the tty control device instead of a netdev name.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
10f02472c5fdab72615a7d3695e8f354811cd661)