project/luci.git
3 years agoluci-app-dawn: add missing quotation mark
Schleifer, Werner [Fri, 24 Sep 2021 07:26:27 +0000 (09:26 +0200)]
luci-app-dawn: add missing quotation mark

Signed-off-by: Schleifer, Werner <werner.schleifer@gmx.de>
(cherry picked from commit d4ab37d9a03cce11620414b98137d11d889d8720)

3 years agoluci-mod-network: fix name of network.device.isolate uci option
Jo-Philipp Wich [Thu, 23 Sep 2021 15:33:43 +0000 (17:33 +0200)]
luci-mod-network: fix name of network.device.isolate uci option

Fixes: #5383
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e0053fe79d7c2167298907b06f161795f9c38031)

3 years agotreewide: i18n - Sync, backport translations
Hannu Nyman [Thu, 23 Sep 2021 15:19:52 +0000 (18:19 +0300)]
treewide: i18n - Sync, backport translations

Backport translations from master.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-attendedsysupgrade: use correct linter settings
Paul Spooren [Tue, 31 Aug 2021 19:22:13 +0000 (09:22 -1000)]
luci-app-attendedsysupgrade: use correct linter settings

The previous settings would use spaces which messed up things since LuCI
uses tabs everywhere.

Also removed a stray console.log

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 641bfe3967cef3a7f5a2a5c72f138438c395428b)

3 years agoluci-app-attendedsysupgrade: support revision checks
Paul Spooren [Sun, 29 Aug 2021 10:37:31 +0000 (00:37 -1000)]
luci-app-attendedsysupgrade: support revision checks

SNAPSHOTS are not real releases and therefore the app always offers an
upgrade, even if running the latest build. To prevent that all SNAPSHOTS
now check for the running revision and if a newer one is available.

Also do a bunch of refactoring based on JavaScript I learned over the
last week.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit f799d550b6389baee5b388eefe638ba9a690f4c5)

3 years agoluci-app-yggdrasil: Update to support v0.4.0 config
George Iv [Wed, 21 Jul 2021 16:23:49 +0000 (19:23 +0300)]
luci-app-yggdrasil: Update to support v0.4.0 config

Signed-off-by: George Iv <zhoreeq@users.noreply.github.com>
(cherry picked from commit 3953b1a5b249b09e566ca1ec4ce2fb4e23cdf69e)

3 years agotreewide: i18n - Backport translations
Hannu Nyman [Thu, 9 Sep 2021 15:01:47 +0000 (18:01 +0300)]
treewide: i18n - Backport translations

Backport translations from master.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-travelmate: EAP-bugfixes
Dirk Brenken [Sun, 5 Sep 2021 20:05:47 +0000 (22:05 +0200)]
luci-app-travelmate: EAP-bugfixes

* fix numerous errors in EAP handling
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 9f9247a08c79e2b94deeeb82af086ec5f5c2ebe9)
Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoluci-app-firewall: add ipv6 exclusive ICMP types
Paul Dee [Tue, 31 Aug 2021 21:10:44 +0000 (23:10 +0200)]
luci-app-firewall: add ipv6 exclusive ICMP types

fixes #5213

Signed-off-by: Paul Dee <systemcrash@users.noreply.github.com>
(cherry picked from commit 19c66ef539da5136bcdb3978e5e8b87c87f8ae21)
Update commit description
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agoluci-mod-network: fix route6 source autocomplete
Vladislav Grigoryev [Thu, 26 Aug 2021 10:33:44 +0000 (13:33 +0300)]
luci-mod-network: fix route6 source autocomplete

Fix the wrong value for the "source" option of the "route6" section.

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 8b4015036d6f298cbfe0291ab8fdc23b4133cca7)

3 years agoluci-theme-openwrt-2020: add css success label
Florian Eckert [Mon, 9 Aug 2021 12:00:27 +0000 (14:00 +0200)]
luci-theme-openwrt-2020: add css success label

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a655389032b85b12ec56733c455abaac07693f56)

3 years agoluci-app-wireguard: set allowed_ips option as optional value
Keith Irwin [Sun, 29 Aug 2021 04:44:38 +0000 (22:44 -0600)]
luci-app-wireguard: set allowed_ips option as optional value

Signed-off-by: Keith Irwin <git@ki9.us>
(cherry picked from commit 092109c9056444a4ba691d15031f69403ab2b37c)
fixed commit title
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
3 years agotreewide: i18n - Backport translations, sync.
Hannu Nyman [Wed, 25 Aug 2021 17:22:45 +0000 (20:22 +0300)]
treewide: i18n - Backport translations, sync.

Sync translations.
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-app-attendedsysupgrade: use detail not message
Paul Spooren [Sun, 22 Aug 2021 10:07:20 +0000 (00:07 -1000)]
luci-app-attendedsysupgrade: use detail not message

The new API unifies all human readable responses in the `detail` field
to follow the newly used framework.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 2a29911121bf72d5d316b2eeae7f184b8ce14482)

3 years agoluci-app-attendedsysupgrade: use latest.json
Paul Spooren [Mon, 16 Aug 2021 04:52:18 +0000 (18:52 -1000)]
luci-app-attendedsysupgrade: use latest.json

The content is the same response as for `/api/latest.json` but
statically hosted by a webserver rather than Python generated.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit a672875402a0802ddcd0e4c8c2d0ac7913dff671)

3 years agoluci-app-attendedsysupgrade: show position in queue
Paul Spooren [Mon, 16 Aug 2021 04:50:49 +0000 (18:50 -1000)]
luci-app-attendedsysupgrade: show position in queue

The server provides a queue_position argument, show it.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 53ff7ca676d10fa253d3ab472b9b5645996527ed)

3 years agoluci-app-attendedsysupgrade: add timeout and catch
Paul Spooren [Mon, 9 Aug 2021 18:45:58 +0000 (08:45 -1000)]
luci-app-attendedsysupgrade: add timeout and catch

If the upgrade server API does not respond, show an error message.
Fix #5222

While at it, minimal code linting

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit ff24b78c807a52a0f9afb62ba0aba1085d9ad045)

3 years agoluci-app-travelmate: sync with travelmate 2.0.6
Dirk Brenken [Sun, 22 Aug 2021 07:19:15 +0000 (09:19 +0200)]
luci-app-travelmate: sync with travelmate 2.0.6

* a few (visual) fixes reported in the forum
* emphasize normal uplinks in blue, vpn uplinks in green
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit f1d1e752b8b08b7803b6c027d9c44dded97d2a4c)
Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoluci-app-travelmate: sync with travelmate 2.0.5-3
Dirk Brenken [Sun, 22 Aug 2021 07:14:54 +0000 (09:14 +0200)]
luci-app-travelmate: sync with travelmate 2.0.5-3

* adapt the travelmate UI to support the changed 'trm_maxscan' option

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit fd7494ffb19d1c0197ddcb048c381b44cdb205e5)
Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agoluci-base: support loopback by widgets.NetworkSelect
Vladislav Grigoryev [Sat, 14 Aug 2021 23:37:44 +0000 (02:37 +0300)]
luci-base: support loopback by widgets.NetworkSelect

Support the "loopback" interface by "widgets.NetworkSelect".
Enable the "loopback" option to include this interface.
Can be used to configure interface binding for services.

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 376af36975579008e3176a860ae032759d27dcbb)

3 years agoluci-mod-system: hide unsupported option on flash.js
Ansuel Smith [Wed, 18 Aug 2021 17:46:04 +0000 (20:46 +0300)]
luci-mod-system: hide unsupported option on flash.js

Hide unsupported option when /rom is not used in flash.js

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 82035eec6150fef1319e6fcec324124f82ada754)

3 years agoluci-mod-system: improve sysupgrade page
Ansuel Smith [Wed, 18 Aug 2021 17:45:18 +0000 (20:45 +0300)]
luci-mod-system: improve sysupgrade page

- Add missing -k and -u option from sysupgrade page.
- Fix missing check for image verification exit code
- Provide the actual reason of the image verification

Fixes: #4160
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 0f4f6e89f15aa1dac0bfd676cb8364ef0b6c6e1f)

3 years agoluci-mod-battstatus: chmod battstatus.js to 644
Florian Eckert [Tue, 17 Aug 2021 10:07:36 +0000 (12:07 +0200)]
luci-mod-battstatus: chmod battstatus.js to 644

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7f5751c16f9c883728ab67cab8b3c717aaf6a590)

3 years agoluci-mod-battstatus: fix quotation marks
Florian Eckert [Tue, 17 Aug 2021 10:05:33 +0000 (12:05 +0200)]
luci-mod-battstatus: fix quotation marks

Fixes output on i18n generation:
standard input:56: warning: RegExp literal terminated too early

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7e1e83fcb8b3e4229dd1bf9218e1b256f81deda6)

3 years agoluci-app-travelmate: sync with travelmate 2.0.5
Dirk Brenken [Fri, 13 Aug 2021 09:35:04 +0000 (11:35 +0200)]
luci-app-travelmate: sync with travelmate 2.0.5

* support new features of travelmate 2.0.5
* made the station manager more comfortable
* a few minor bugfixes
* sync translations

Signed-off-by: Dirk Brenken dev@brenken.org
Signed-off-by: Dirk Brenken <dev@brenken.org>
3 years agotreewide: i18n - Sync and backport translations
Hannu Nyman [Tue, 10 Aug 2021 19:08:54 +0000 (22:08 +0300)]
treewide: i18n - Sync and backport translations

Sync translations.
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
3 years agoluci-proto-bonding: bugfix xmit_hash_policy dependencies
Helge Mader [Mon, 19 Jul 2021 10:37:35 +0000 (12:37 +0200)]
luci-proto-bonding: bugfix xmit_hash_policy dependencies

Signed-off-by: Helge Mader <ma@dev.tdt.de>
(cherry picked from commit adaf3feb65918bd56ac3a24ac4fc68820f794a6e)

3 years agoluci-proto-bonding: fix member because of API change
Helge Mader [Thu, 15 Jul 2021 07:33:31 +0000 (09:33 +0200)]
luci-proto-bonding: fix member because of API change

Signed-off-by: Helge Mader <ma@dev.tdt.de>
(cherry picked from commit 64a066c33972ce803b3e78292081285e5013b4aa)

3 years agoluci-mod-network: fix legacy_rates option dependency
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)

3 years agoMerge pull request #5227 from stangri/21.02-firewall
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

3 years agoluci-app-firewall: replace hh.mm.ss with hh:mm:ss 5227/head
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>
3 years agoMerge pull request #5217 from stangri/21.02-luci-app-https-dns-proxy
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

3 years agoluci-app-https-dns-proxy: update to 2021-07-29-1 5217/head
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>
3 years agoluci-app-attendedsysupgrade: fix empty array condition
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)

3 years agoluci-app-attendedsysupgrade: remove depends uhttpd-mod-ubus
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)

3 years agoluci-app-attendedsysupgrade: fix ACL definition
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)

3 years agotreewide: i18n - Backport translations
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>
3 years agoluci-mod-system: reload crond upon saving crontab
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)

3 years agoluci-app-acl: remove support for plaintext login passwords
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)

3 years agoluci-app-adblock: expose dns instance option
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>
3 years agoluci-app-nlbwmon: Add translation context for Download/Upload terms
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)

3 years agoluci-app-sqm: only reload view once sqm enable/start completed
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)

3 years agoluci-app-sqm: fix JS error if service is disabled
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)

3 years agoluci-base: do not add validation for named section if readonly is set
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)

3 years agoluci-base: prevent empty field for adding new named section in JavaScript
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)

3 years agoluci-base: change css class btn to cbi-button
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)

3 years agoluci-base: use button tag instead of input tag on named section add
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)

3 years agoluci-app-acl: unset read and write before acl set
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)

3 years agoluci-mod-status: disable "Set static" lease action on readonly view
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)

3 years agoluci-app-acl: ensure to set read/write ACL presets as uci lists
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)

3 years agoluci-base: Fix time display error
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)

3 years agoluci-base: validation: disallow mutlicast MACs by default
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)

3 years agoluci-app-openvpn: create base directory if not available
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)

3 years agoluci-app-attendedsysupgrade: fix typo
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)

3 years agoRevert "luci-mod-network: issue with breakdown of dnsmasq after duplication of static...
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)

3 years agoluci-mod-network: fix saving bridge VLANs without member ports
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)

3 years agoluci-mod-network: work around jsmin bug
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)

3 years agotreewide: fix typo in "Enable VLAN filtering" label
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)

3 years agoluci-mod-status: don't set '-' hostname when creating static lease
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)

3 years agoluci-mod-network: enforce IPv4 mode for traceroute call
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)

3 years agoluci-mod-network: parse ports without tag/pvid annotation as well
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)

3 years agoluci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports
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)

3 years agoluci-mod-network: refactor device configuration
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)

3 years agoluci-mod-network: change port status layout in vlan filter config
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)

3 years agobuild: add script to find commits suitable for cherry picking
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)

3 years agoluci-app-adblock: sync with latest version
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)

3 years agoMerge pull request #5145 from msylgj/patch-2
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

3 years agoluci-app-frpc/frps:add service status display 5145/head
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>
3 years agoMerge pull request #5142 from msylgj/patch-2
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

3 years agoluci-app-frpc: allow hostname in server address 5142/head
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>
3 years agoluci-app-nlbwmon: i18n sync translations
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>
3 years agoluci-base: i18n sync translations
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>
3 years agoluci-app-watchcat: i18n sync translations
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>
3 years agoluci-app-banip: i18n sync translations
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>
3 years agoluci-app-adblock: i18n sync translations
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>
3 years agoluci-mod-network: Support for disabling routes
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)

3 years agoluci-mod-status: switch to html table for wlan channel analysis
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)

3 years agoluci-theme-openwrt-2020: fix spinning disk animation
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)

3 years agoluci-app-nlbwmon: show force reload button even if data are available
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)

3 years agoluci-app-nlbwmon: adjused the display export page
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)

3 years agoluci-app-nlbwmon: change force reload html element to button
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)

3 years agoluci-app-nlbwmon: add missing cbi-button class for database backup
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)

3 years agoluci-app-nlbwmon: fix url
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)

3 years agoluci-app-nlbwmon: move into menu entry into service section
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)

3 years agoluco-app-ksmbd, luci-app-omcproxy: use relative luci.mk include path
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)

3 years agoluci-mod-network: only consider bridge vlans belonging to the current device
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)

3 years agoluci-lib-docker: add container export support
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)

3 years agotreewide: resync and merge master translations
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>
3 years agorpcd-mod-luci: bump version
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)

3 years agorpcd-mod-luci: refactor host hint gathering
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)

3 years agoluci-mod-network: wireless.js: recognize HE* htmodes
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)

3 years agoluci-app-banip: sync with banip 0.7.9
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)

3 years agoluci-app-adblock: sync with adblock 4.1.3
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)

3 years agoluci-theme-bootstrap: mobile style fixes for vlan filter matrix
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)

3 years agoluci-mod-network: small styling fixes for vlan filter matrix
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)

3 years agoluci-mod-network: migrate more device options
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)

3 years agocsstidy: update to latest Git HEAD
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)

3 years agoluci-mod-network: reset bridge VLANs on cancelling modal dialog
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)

3 years agoluci-mod-network: fix vlan filter matrix overflow after redraw
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)

3 years agotreewide: resync and merge master translations
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>