project/luci.git
2 years agoluci-mod-network: grammar fixes
Paul Dee [Fri, 11 Aug 2023 11:34:45 +0000 (13:34 +0200)]
luci-mod-network: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit d48979217c0b521d0e9d97090cf26c8e7941fa54)

2 years agoluci-app-siitwizard: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:09:22 +0000 (02:09 +0200)]
luci-app-siitwizard: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit 28e7201bcb547fed70c0b3dd9c64fe88d6d37d78)

2 years agoluci-proto-wireguard: grammar fixes
Paul Dee [Fri, 11 Aug 2023 11:12:26 +0000 (13:12 +0200)]
luci-proto-wireguard: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit 992cca55ae3d6599d177bdb3b9bfc2b679c650e5)

2 years agoluci-app-attendedsysupgrade: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:04:17 +0000 (02:04 +0200)]
luci-app-attendedsysupgrade: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit 987ae1abb86528e6acf6f80a418af6c49c7e2ea4)

2 years agoluci-app-statistics: grammar fixes
Paul Dee [Fri, 11 Aug 2023 11:09:17 +0000 (13:09 +0200)]
luci-app-statistics: grammar fixes

To setup (n) -> To set(v) up

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit d34e052811f23cb191a38a2170166a7d5e84a5c9)

2 years agoluci-mod-system: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:16:31 +0000 (02:16 +0200)]
luci-mod-system: grammar fixes

Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit 677da57a28f10428eb99488afef8e068614d4ea6)

2 years agoluci-base: grammar fixes
Paul Dee [Sat, 5 Aug 2023 00:16:07 +0000 (02:16 +0200)]
luci-base: grammar fixes

Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit 2c3018d426e7a8afe06b529075aa43df2f8096f8)

2 years agoluci-app-minidlna: move album covers to advanced tab
Sergey Ponomarev [Fri, 8 Sep 2023 09:31:54 +0000 (12:31 +0300)]
luci-app-minidlna: move album covers to advanced tab

Also remove o.default = o.enabled

Signed-off-by: Sergey Ponomarev <[email protected]>
(cherry picked from commit 2bedcdfa166a9fd6e9bbc873ca1a1d8843952cef)

2 years agoluci-app-dockerman: fix stats page always blank
Liangbin Lian [Thu, 26 Oct 2023 11:48:49 +0000 (19:48 +0800)]
luci-app-dockerman: fix stats page always blank

Signed-off-by: Liangbin Lian <[email protected]>
(cherry picked from commit 0fbbed4a84fb49c968e3ad8a5b76bbf332f42f5c)

2 years agoluci-app-dockerman: fix typos
Felix Baumann [Sat, 2 Sep 2023 22:49:55 +0000 (00:49 +0200)]
luci-app-dockerman: fix typos

useage > usage

Signed-off-by: Felix Baumann <[email protected]>
(cherry picked from commit 6afe7d91e5ae22008314de46e65310c9cf660edc)

2 years agoluci-app-pagekitec: add missing ACL rules
Jo-Philipp Wich [Thu, 19 Oct 2023 22:31:50 +0000 (00:31 +0200)]
luci-app-pagekitec: add missing ACL rules

Fixes: #6615
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 9b545a370be764351d1fde9bdde5a12deebf7f57)

2 years agoluci-mod-network: Static Leases improvements
Paul Dee [Tue, 1 Aug 2023 22:54:32 +0000 (00:54 +0200)]
luci-mod-network: Static Leases improvements

Under DHCP and DNS, Static Leases tab:
Add extra fields and booleans
Add 'ignore' value for ip field
Add description text for fields
Enable wildcards in mac addresses

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit f73abffa2aa64a91e6c16ddae7966a5c35e73fe1)

2 years agoluci-app-olsr-viz: migrate to js
Ayushman Tripathi [Thu, 13 Jul 2023 06:19:43 +0000 (11:49 +0530)]
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix tag

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix var name

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js use load for script & fix bugs

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix bugs

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix view

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js fix view

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <[email protected]>
luci-app-olsr-viz: migrate to js
(cherry picked from commit 00cfca13b5cd01ee86194e3f859b81e1db475b8a)

2 years agoluci-theme-openwrt-2020: import bootstrap radio/checkbox styling rules
Jo-Philipp Wich [Wed, 26 Jul 2023 13:46:06 +0000 (15:46 +0200)]
luci-theme-openwrt-2020: import bootstrap radio/checkbox styling rules

Import the radio and checkbox styling rules from the default Bootstrap
theme and adapt colors and margins to the OpenWrt 2020 one.

Fixes: #6442
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 7cded1f8bbbc85ea6ca57c515b9988130e85726f)

2 years agoluci-app-firewall: missing variable declaration
Sergey Ponomarev [Sat, 10 Jun 2023 18:51:09 +0000 (21:51 +0300)]
luci-app-firewall: missing variable declaration

Signed-off-by: Sergey Ponomarev <[email protected]>
(cherry picked from commit b5ba9c3741d7e554463035e623b7d7e52c84d1fb)

2 years agoluci-base: ui.js: set `autocomplete="new-password"` for password fields
Jo-Philipp Wich [Wed, 7 Jun 2023 21:40:04 +0000 (23:40 +0200)]
luci-base: ui.js: set `autocomplete="new-password"` for password fields

Attempt to prevent Firefox from randomly filling nonesense into arbitrary
password fields such as the WireGuard private key field by setting the
`autocomplete="new-password"` attribute on any password type fields.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 23a246e4b4d0a0959d16a1add3868361b78f3021)

2 years agoluci-mod-dashboard: hide wireless pane when there are no radios
Rani Hod [Thu, 13 Apr 2023 08:45:03 +0000 (11:45 +0300)]
luci-mod-dashboard: hide wireless pane when there are no radios

Implements feature request #4472.

Signed-off-by: Rani Hod <[email protected]>
(cherry picked from commit b5836cd8252866a5d8993511bcd920b2bd3afe06)

2 years agoluci-mod-status: improve channel graph for 5GHz radio
Christian Marangi [Sun, 30 Jul 2023 21:03:20 +0000 (23:03 +0200)]
luci-mod-status: improve channel graph for 5GHz radio

Improve channel graph for 5GHz radio by using dotted lines to identify
the intermediate channel, full line to identify the different channel
band and bold line to identify the different section of the wifi
channels.

Signed-off-by: Christian Marangi <[email protected]>
(cherry picked from commit 69a8e4a98dd71ca7315684debc8e98eb273b03ef)

2 years agoluci-mod-status: fix wrong position of channel for 5GHz radio
Christian Marangi [Sun, 30 Jul 2023 20:58:57 +0000 (22:58 +0200)]
luci-mod-status: fix wrong position of channel for 5GHz radio

Channel tag for 5GHz radios is wrong and is confusing for any user
that wants to better identify the used channel from the graph.

Add some additional logic to better position the channel tag.

Fixes: #6419
Signed-off-by: Christian Marangi <[email protected]>
(cherry picked from commit 6d722ccdaeede14b9f42643176522bbb4f75e89c)

2 years agoluci-mod-status: channel_analysis.js: fix stale scan result.
Milad Mohtashamirad [Fri, 7 Jul 2023 01:14:28 +0000 (11:14 +1000)]
luci-mod-status: channel_analysis.js: fix stale scan result.

When the new result is empty, including when another scan is running in the background, the table was emptied, but the graph persisted.
With this change, the list will persist and missing APs will be shown faded.

Signed-off-by: Milad Mohtashamirad <[email protected]>
(cherry picked from commit 03f16840593c2b4db0628bcdce4ebd2956723e03)

2 years agoluci-app-firewall: cleaning up outdated instructions on hardware NAT
清靈語 [Mon, 31 Jul 2023 05:01:29 +0000 (13:01 +0800)]
luci-app-firewall: cleaning up outdated instructions on hardware NAT

(cherry picked from commit 5d1e58166386194dc0156f0c2d1bec5cd2415b13)

2 years agoluci-mod-network: wireless.js: remove form reset button
Jo-Philipp Wich [Fri, 11 Aug 2023 23:39:25 +0000 (01:39 +0200)]
luci-mod-network: wireless.js: remove form reset button

The form reset button on the wireless page has no function as no input
field is present outside of modal configuration views, so drop it to
avoid confusion.

Ref: #6514
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 4c3584bbdc1abe377c4b85099740f61d3213c1c5)

2 years agoluci-mod-status: fix iptables not showing comments
Liangbin Lian [Tue, 5 Sep 2023 06:26:33 +0000 (14:26 +0800)]
luci-mod-status: fix iptables not showing comments

Signed-off-by: Liangbin Lian <[email protected]>
(cherry picked from commit 2ca117c5a6a5c1cd047272548e53435c4d3adebc)

2 years agoluci-theme-bootstrap: better readability in System Log/Kernel Log.
Kristian Skramstad [Wed, 6 Sep 2023 20:16:12 +0000 (22:16 +0200)]
luci-theme-bootstrap: better readability in System Log/Kernel Log.

Signed-off-by: Kristian Skramstad <[email protected]>
(cherry picked from commit 04d9820f1746ff2a2c19a0e590b80baa830ad4d7)

2 years agoluci-proto-wireguard: Escape IPv6 endpoints with [] in generated wireguard config
Jonathan Duncan [Sun, 24 Sep 2023 15:16:35 +0000 (16:16 +0100)]
luci-proto-wireguard: Escape IPv6 endpoints with [] in generated wireguard config

Signed-off-by: Jonathan Duncan <[email protected]>
(cherry picked from commit 527453ff4851a0594f804aa2c572e820706827c8)

2 years agoluci-app-ksmbd: add UI for multiple interfaces
Rani Hod [Tue, 10 Oct 2023 11:48:22 +0000 (14:48 +0300)]
luci-app-ksmbd: add UI for multiple interfaces

/etc/config/ksmbd supports multiple interfaces (in config globals->
option interface) but the current UI only supports selecting a single
one. This patch adds support for selecting multiple interfaces, based on
how luci-app-samba4 does it.

Closes: #6620
Suggested-by: @AndroKev
Signed-off-by: Rani Hod <[email protected]>
(cherry picked from commit 55643d2075ee6cc4b6c4e16dd8e45b9899fe02fb)

2 years agoluci-mod-network: rework DHCP relay settings
Jo-Philipp Wich [Thu, 19 Oct 2023 22:25:39 +0000 (00:25 +0200)]
luci-mod-network: rework DHCP relay settings

 - Drop completely bogus 'ID' option, it's not handled by anything
 - Clarify relay from / relay to / accept from options

Fixes: #6639
Fixes: a627744bb5 ("luci-mod-network: 'relay' tab added")
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 88326b809ba9388a1b11b1c4226ccb07e5911261)

2 years agoluci-mod-status: 29_ports.js: handle devices without speed indication
Jo-Philipp Wich [Tue, 31 Oct 2023 22:53:25 +0000 (23:53 +0100)]
luci-mod-status: 29_ports.js: handle devices without speed indication

Use carrier state to distinguish connected/no link states and simply
print "Connected" if no speed indication is available.

Fixes: #6663
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 0bf5e5ca06a53140667f12fd728257157a3d945e)

2 years agoluci-mod-status: protect against infinite recursion in port status
Jo-Philipp Wich [Wed, 25 Oct 2023 21:16:13 +0000 (23:16 +0200)]
luci-mod-status: protect against infinite recursion in port status

When attempting to resolve VLAN devices, protect against potential deep
recursion due to invalid bridge configs referencing themselves.

Fixes: #6648
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 25dd8934f18a6cebfca1adb8a0d4b5d0bed73145)

2 years agoluci-mod-status: add ACL to allow access to getBuiltinEthernetPorts
Jo-Philipp Wich [Wed, 25 Oct 2023 21:15:16 +0000 (23:15 +0200)]
luci-mod-status: add ACL to allow access to getBuiltinEthernetPorts

Fixes: ed059e4cd3 ("luci-mod-status: 29_ports.js: attempt to use getBuiltinEthernetPorts")
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 575ce5512df534b52185af877d26192adde6a9b5)

2 years agoMerge pull request #6665 from andibraeu/openwrt-23.05
Jo-Philipp Wich [Wed, 1 Nov 2023 10:39:12 +0000 (11:39 +0100)]
Merge pull request #6665 from andibraeu/openwrt-23.05

[23.05] luci-app-olsr-services: change menu order

2 years agoMerge pull request #6669 from Ayushmanwebdeveloper/openwrt-23.05
Jo-Philipp Wich [Wed, 1 Nov 2023 10:38:49 +0000 (11:38 +0100)]
Merge pull request #6669 from Ayushmanwebdeveloper/openwrt-23.05

[23.05] luci-app-olsr: change menu order and improve etx display for neighbours status view

2 years agoluci-app-olsr: change menu order and improve etx display for neighbours status view
Ayushman Tripathi [Wed, 1 Nov 2023 09:54:35 +0000 (15:24 +0530)]
luci-app-olsr: change menu order and improve etx display for neighbours status view

Signed-off-by: Ayushman Tripathi <[email protected]>
2 years agoluci-mod-network: relax RA server mode requirements
Jo-Philipp Wich [Tue, 31 Oct 2023 23:48:59 +0000 (00:48 +0100)]
luci-mod-network: relax RA server mode requirements

Allow RA server mode on all but some known incompatible interface protocols.

Fixes: #6667
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit f105827f42b5e4c02292db4f2537ac9ef3dde204)

2 years agoluci-app-firewall: fix german SNAT traqnslation entry
Jo-Philipp Wich [Tue, 31 Oct 2023 23:07:51 +0000 (00:07 +0100)]
luci-app-firewall: fix german SNAT traqnslation entry

Fixes: #6666
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit da202240bf48e6953fb1ec9f715da1408b734a5c)

2 years agoluci-app-olsr-services: change menu order
Andi Bräu [Sun, 29 Oct 2023 10:32:11 +0000 (11:32 +0100)]
luci-app-olsr-services: change menu order

Signed-off-by: Andi Bräu <[email protected]>
2 years agoluci-app-dawn: Implement in JavaScript
Daniel Vijge [Thu, 26 Oct 2023 20:58:03 +0000 (22:58 +0200)]
luci-app-dawn: Implement in JavaScript

This commit re-implements luci-app-dawn in JavaScript, removing the older
lua implementation. Besides a 1-to-1 port, there are some
changes/improvements:

* In both the network overview and the hearing map, replace MAC addresses
  by host name if known.
* In the hearing map, the table is sortable. If the same client is
  connected to multiple access points/frequencies the MAC/host name is
  listed twice, whereas in the lua implementation the second MAC address
  was empty to show it was referring to the same client. This means the
  table can be sorted on any column, and the information remains correct.
* The view in the network overview is a bit different. This table is not
  sortable, because LuCi doesn't seem to like a table inside a table for
  sorting.
* Align the column names between the network overview and the hearing
  table.
* Add tooltips for abbreviations in column names.

Signed-off-by: Daniel Vijge <[email protected]>
(cherry picked from commit ea8c0aa2a1a1ff9f29ffd452049a7b749298ed17)
[apply latest Makefile changes that did not get backported to 23.05]
Signed-off-by: Nick Hainke <[email protected]>
2 years agoluci-app-travelmate: fix ACL typo
Dirk Brenken [Fri, 27 Oct 2023 07:22:33 +0000 (09:22 +0200)]
luci-app-travelmate: fix ACL typo

* fix long standing ACL path typo

Signed-off-by: Dirk Brenken <[email protected]>
(cherry picked from commit 71931c2314cc681e0654de1c7c44d8e11cd3b5f4)

2 years agoluci-app-travelmate: sync with travelmate 2.1.1
Dirk Brenken [Mon, 30 Oct 2023 18:43:56 +0000 (19:43 +0100)]
luci-app-travelmate: sync with travelmate 2.1.1

Signed-off-by: Dirk Brenken <[email protected]>
(cherry picked from commit 425bcfcb5285a1e1d3bea2680afbc21030dfd23e)
Signed-off-by: Dirk Brenken <[email protected]>
2 years agotreewide: Backport i18n translations from master
Hannu Nyman [Sat, 28 Oct 2023 15:40:12 +0000 (18:40 +0300)]
treewide: Backport i18n translations from master

Sync and backport translations.

Signed-off-by: Hannu Nyman <[email protected]>
2 years agoMerge pull request #6655 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Thu, 26 Oct 2023 22:09:03 +0000 (16:09 -0600)]
Merge pull request #6655 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: add status->overview include file

2 years agoluci-app-https-dns-proxy: add status->overview include file
Stan Grishin [Thu, 26 Oct 2023 14:46:30 +0000 (14:46 +0000)]
luci-app-https-dns-proxy: add status->overview include file

* add status->overview include file
* sync version to principal package
* minor code formatting/styling fixes for js files
* improve HTTP/2 and HTTP/3 detection in RPCD script

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit dea2f135d7c915d46940e95a49891b945037be29)

2 years agoMerge pull request #6650 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Thu, 26 Oct 2023 14:31:40 +0000 (08:31 -0600)]
Merge pull request #6650 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: localizable entries in overview

2 years agoluci-app-adblock-fast: bugfix: localizable entries in overview
Stan Grishin [Wed, 25 Oct 2023 21:46:57 +0000 (21:46 +0000)]
luci-app-adblock-fast: bugfix: localizable entries in overview

* bugfix: localizable entries in overview
* update grammar/naming for buttons
* prepare for pause button
* add status include file to show service status

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit a0574a3ad1c7831705d979ad09b8dcc94bbd4184)

2 years agoluci-lib-jsonc: improve handling of integral numeric values
Jo-Philipp Wich [Wed, 25 Oct 2023 20:35:08 +0000 (22:35 +0200)]
luci-lib-jsonc: improve handling of integral numeric values

Properly deal with integral numeric values exceeding the int32_t range
by replacing the cast logic with more fine grained checks:

 - Lua numbers which are integers in the first place are directly converted
   to JSON integers

 - Finite double Lua numbers which are integral are converted to JSON
   integer values

 - All other numeric values are converted to JSON doubles

This should bring the handling of large integral value in line with the
documented behavior of turning non-fractional Lua numbers into JSON
integers.

Fixes: #6647
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit efcd4879781ee6c428b467052957534a7919d36d)

2 years agoluci-app-statistics: memory: make hiding 'free' configurable
Hannu Nyman [Sat, 21 Oct 2023 09:01:24 +0000 (12:01 +0300)]
luci-app-statistics: memory: make hiding 'free' configurable

Make hiding the 'free' memory configurable.
Set default as disabled, shown in graph which always scales to 100%.

If enabled, the graph scales to actually used memory,
which enables a more detailed view to memory usage.

Signed-off-by: Hannu Nyman <[email protected]>
(cherry picked from commit 08540c44629ad0fedf5feb2b535c2df182ac3973)

2 years agoluci-app-statistics: missing sensor types added
Carsten Spieß [Wed, 23 Aug 2023 10:17:31 +0000 (12:17 +0200)]
luci-app-statistics: missing sensor types added

Added missing graphs for voltage, current, power and fanspeed sensors.
No new or modified translation strings.

Signed-off-by: Carsten Spieß <[email protected]>
(cherry picked from commit 8262352fe35505909e8fe3f981da039389a6ccc7)

2 years agoluci-mod-status: persist sorting of DHCP lease status tables
Jo-Philipp Wich [Thu, 19 Oct 2023 21:44:53 +0000 (23:44 +0200)]
luci-mod-status: persist sorting of DHCP lease status tables

Add an ID attribute to the dynamically generated lease status tables to
persist row ordering choice across reloads.

Fixes: #6640
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 603992560c5ca4b5929047e8e8c70f901f75d7f7)

2 years agoluci-base: ui.js: sorting fixes for tables initialized from markup
Jo-Philipp Wich [Thu, 19 Oct 2023 21:42:13 +0000 (23:42 +0200)]
luci-base: ui.js: sorting fixes for tables initialized from markup

 - Populate id option from table id attribute
 - Update column head sort indicator in UITable.update()
 - Don't store sort state for tables without id

Ref: https://github.com/openwrt/luci/issues/6640
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit ee6a4da00b70949eccb5a0a7b69d2c5b98ef1f89)

2 years agofirewall: ipsets.js: validate set names
Jo-Philipp Wich [Thu, 12 Oct 2023 07:38:46 +0000 (09:38 +0200)]
firewall: ipsets.js: validate set names

Ensure that user supplied set name values conform to the nftables identifier
syntax constraints.

Fixes: #6633
Fixes: 0484343903 ("luci-app-firewall: implement IPsets GUI")
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 755edf6fbf65fa2f6b778e7edfd8b56fd1742f70)

2 years agoluci-network-interfaces: Add IPv6 lifetime options
Paul Dee [Wed, 30 Aug 2023 20:34:25 +0000 (22:34 +0200)]
luci-network-interfaces: Add IPv6 lifetime options

Signed-off-by: Paul Dee <[email protected]>
(cherry picked from commit 598b1eb272a39a36c37d00463b089260d8167ccb)

2 years agotreewide: Backport translations from master
Hannu Nyman [Sun, 8 Oct 2023 15:03:49 +0000 (18:03 +0300)]
treewide: Backport translations from master

Backport from master and sync translations.

Signed-off-by: Hannu Nyman <[email protected]>
2 years agoMerge pull request #6622 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 6 Oct 2023 22:42:51 +0000 (16:42 -0600)]
Merge pull request #6622 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: working re-download

2 years agoluci-app-banip: fix last, incomplete commit
Dirk Brenken [Fri, 6 Oct 2023 14:29:14 +0000 (16:29 +0200)]
luci-app-banip: fix last, incomplete commit

Signed-off-by: Dirk Brenken <[email protected]>
(cherry picked from commit 127ca64a672ba4b748ea230cce79b0c4cc1c8207)
Signed-off-by: Dirk Brenken <[email protected]>
2 years agoluci-app-banip: sync with banIP-0.9.1
Dirk Brenken [Fri, 6 Oct 2023 14:25:43 +0000 (16:25 +0200)]
luci-app-banip: sync with banIP-0.9.1

Signed-off-by: Dirk Brenken <[email protected]>
(cherry picked from commit 71de98eea77f567f81da411595990997ea324bc0)
Signed-off-by: Dirk Brenken <[email protected]>
2 years agoluci-app-banip: Remove unused unspecified option
Sergey Ponomarev [Thu, 31 Aug 2023 09:00:51 +0000 (12:00 +0300)]
luci-app-banip: Remove unused unspecified option

Signed-off-by: Sergey Ponomarev <[email protected]>
(cherry picked from commit 737619f8b27483a3ad4975a2008beef27157dd04)

2 years agoluci-app-adblock-fast: bugfix: working re-download
Stan Grishin [Thu, 5 Oct 2023 14:55:29 +0000 (14:55 +0000)]
luci-app-adblock-fast: bugfix: working re-download

* bugfix: add missing dl command to RPCD script
* improve output of error messages/link to README

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit d15a1fb6939684583b327f7388a1473c7d49841d)

2 years agoMerge pull request #6604 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 29 Sep 2023 18:00:24 +0000 (12:00 -0600)]
Merge pull request #6604 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.0.0-4

2 years agoluci-app-adblock-fast: update to 1.0.0-4
Stan Grishin [Thu, 28 Sep 2023 21:28:51 +0000 (21:28 +0000)]
luci-app-adblock-fast: update to 1.0.0-4

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit 4a40a7ad72777d0e8c03c1b8c7249f2cc6cfb770)

2 years agoMerge pull request #6599 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Thu, 28 Sep 2023 03:36:00 +0000 (21:36 -0600)]
Merge pull request #6599 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.0.0-3

2 years agoluci-app-adblock-fast: update to 1.0.0-3
Stan Grishin [Tue, 26 Sep 2023 22:54:37 +0000 (22:54 +0000)]
luci-app-adblock-fast: update to 1.0.0-3

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit 8d502df1b0951c415b236ccfd7a3b8ae104b765f)

2 years agotreewide: Backport translations and sync
Hannu Nyman [Sat, 9 Sep 2023 07:19:29 +0000 (10:19 +0300)]
treewide: Backport translations and sync

Backport translations from master and sync.

Signed-off-by: Hannu Nyman <[email protected]>
2 years agoMerge pull request #6558 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Mon, 4 Sep 2023 01:04:35 +0000 (18:04 -0700)]
Merge pull request #6558 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: initial commit

2 years agoMerge pull request #6560 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Mon, 4 Sep 2023 01:03:52 +0000 (18:03 -0700)]
Merge pull request #6560 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: rewrite in javascript

2 years agoluci-app-https-dns-proxy: rewrite in javascript
Stan Grishin [Tue, 29 Aug 2023 18:42:10 +0000 (18:42 +0000)]
luci-app-https-dns-proxy: rewrite in javascript

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit 6df7b92a50485d7a7c61c38c5abeaf96ad69a28c)

2 years agoluci-app-adblock-fast: initial commit
Stan Grishin [Mon, 28 Aug 2023 21:30:42 +0000 (21:30 +0000)]
luci-app-adblock-fast: initial commit

* Depends on https://github.com/openwrt/packages/pull/21943

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit 81fc75739c13881ba339d02017ec3a5d2a32948d)

2 years agoluci-proto-modemmanager: also allow none for preferredmode config option
Florian Eckert [Fri, 1 Sep 2023 07:51:21 +0000 (09:51 +0200)]
luci-proto-modemmanager: also allow none for preferredmode config option

Signed-off-by: Florian Eckert <[email protected]>
(cherry picked from commit 3f2320e0aa140d6e59dedeca97a523e0be4a399b)

2 years agoluci-proto-modemmanger: register missing error codes
Florian Eckert [Thu, 17 Aug 2023 13:25:00 +0000 (15:25 +0200)]
luci-proto-modemmanger: register missing error codes

Signed-off-by: Florian Eckert <[email protected]>
(cherry picked from commit 818bf22b8b7e78216cfec2eb6d73694c02618ec7)

2 years agoluci-proto-modemmanager: delete removed error codes
Florian Eckert [Thu, 17 Aug 2023 13:19:11 +0000 (15:19 +0200)]
luci-proto-modemmanager: delete removed error codes

Signed-off-by: Florian Eckert <[email protected]>
(cherry picked from commit 1e6f52ac69239491e58fb0615100b912719db8f6)

2 years agoluci-proto-modemmanager: add allowed and preferred mode
Florian Eckert [Wed, 9 Aug 2023 11:48:33 +0000 (13:48 +0200)]
luci-proto-modemmanager: add allowed and preferred mode

Signed-off-by: Florian Eckert <[email protected]>
(cherry picked from commit 5b925ea92b2d3a2f068f9835e533c8cfd86c427a)

2 years agoluci-app-olsr: migrate to js
Ayushman Tripathi [Sun, 25 Jun 2023 19:53:48 +0000 (01:23 +0530)]
luci-app-olsr: migrate to js

Signed-off-by: Ayushman Tripathi <[email protected]>
Signed-off-by: Jo-Philipp Wich <[email protected]> [fixup commit message]
(cherry picked from commit ebd09332b4330001ecd3a86d1b379e0afc3bafee)

2 years agoluci-mod-status: 29_ports.js: attempt to use getBuiltinEthernetPorts
Jo-Philipp Wich [Thu, 24 Aug 2023 14:46:02 +0000 (16:46 +0200)]
luci-mod-status: 29_ports.js: attempt to use getBuiltinEthernetPorts

Try to use the new luci/getBuiltinEthernetPorts RPC call to enumerate known
ports and fall back to manual board.json parsing if the call is unavailable
yet. The fallback code will be dropped in a while when everything settled.

Ref: #6534, #6538
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit ed059e4cd3ee9b15aabcc974b4e66b0090b920ae)

2 years agoluci-base: rpc: add call to enumerate builtin ethernet ports
Jo-Philipp Wich [Thu, 24 Aug 2023 14:44:40 +0000 (16:44 +0200)]
luci-base: rpc: add call to enumerate builtin ethernet ports

Add a new luci/getBuiltinEthernetPorts RPC call which returns a consolidated
list of known ethernet ports found in `/etc/board.json`.

Add an x86/64 specific workaround which attempts to enumerate missing
ethernet devices too.

Ref: #6534, #6538
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 98e37433e7f33b3e2ee751250e04b194a0aa6a0b)

2 years agotreewide: sync and merge master translations
Jo-Philipp Wich [Thu, 24 Aug 2023 13:01:57 +0000 (15:01 +0200)]
treewide: sync and merge master translations

Signed-off-by: Jo-Philipp Wich <[email protected]>
2 years agoluci-base: http.uc: fix eof detection in temporary upload files
Jo-Philipp Wich [Mon, 21 Aug 2023 14:37:11 +0000 (16:37 +0200)]
luci-base: http.uc: fix eof detection in temporary upload files

Binary string comparisons in ucode are currently unsafe, so use the
`length()` function to determine the just read data chunk size in
order to test for end of file.

Fixes: #6530
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit b4594b3d111171510d2581e9f0ce30bee78bd214)

2 years agoluci-lua-runtime: dispatcher.lua: re-add post_on() dispatch action
Jo-Philipp Wich [Mon, 21 Aug 2023 13:44:36 +0000 (15:44 +0200)]
luci-lua-runtime: dispatcher.lua: re-add post_on() dispatch action

Existing legacy Lua controllers still use the `post_on()` node dispatch
action, so restore this functionality.

Fixes: #6531
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 18b637fed9f58b7a3f146a004ecd5b0aef2cb058)

2 years agoluci-lua-runtime: dispatcher.lua: re-add test_post_security()
Jo-Philipp Wich [Mon, 21 Aug 2023 13:35:41 +0000 (15:35 +0200)]
luci-lua-runtime: dispatcher.lua: re-add test_post_security()

While no LuCI code utilizes this function anymore, some existing legacy
Lua controllers expect the function to exist, so restore it.

Fixes: #6532
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 2fd74a8239c3986bb2e741e907b2a90f2833f073)

2 years agoluci-mod-network: routes.js: enforce interface setting
Jo-Philipp Wich [Mon, 21 Aug 2023 08:09:34 +0000 (10:09 +0200)]
luci-mod-network: routes.js: enforce interface setting

Fixes: #6521
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit a6a428fe60b6fd306bef6d0559bc1d78372b0e56)

2 years agoluci-base: dispatcher.uc: improve error reporting for actionless nodes
Jo-Philipp Wich [Mon, 21 Aug 2023 07:28:18 +0000 (09:28 +0200)]
luci-base: dispatcher.uc: improve error reporting for actionless nodes

In case a - potentially auto-created, intermediate - node is requested, reply
with a clean HTTP 404 error instead of an internal assertion about an unknown
action type.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 86f04d85fc774db9cb7e60a34a50f936d8d7be23)

2 years agoluci-base: dispatcher.uc: satisfy auto-created intermediate nodes
Jo-Philipp Wich [Mon, 21 Aug 2023 07:24:32 +0000 (09:24 +0200)]
luci-base: dispatcher.uc: satisfy auto-created intermediate nodes

When we auto-create intermediate parent nodes, make sure that those nodes
are marked as satisfied, so that it is possible to dispatch their actual
child nodes.

This aligns the behavior with the old Lua based dispatcher implementation.

Fixes: #6529
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit ec8cf9e83cd4e4afdf0a00910e057a890600e8a8)

2 years agotreewide: Backport and sync trasnlations
Hannu Nyman [Thu, 10 Aug 2023 17:12:27 +0000 (20:12 +0300)]
treewide: Backport and sync trasnlations

Backport from master, sync.

Signed-off-by: Hannu Nyman <[email protected]>
2 years agoucode-mod-html: fix build with gcc 5
Jo-Philipp Wich [Tue, 8 Aug 2023 18:49:31 +0000 (20:49 +0200)]
ucode-mod-html: fix build with gcc 5

Older gcc versions raise a `label at end of compound statement` error due
to the empty default case. Fix the problem by adding an explicit `break`
statement.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit b3d661cd84760a0cdf084a25f21556a07e369d33)

2 years agoluci-base: runtime.uc: fix error500() invocation on theme failure
Jo-Philipp Wich [Mon, 7 Aug 2023 21:36:36 +0000 (23:36 +0200)]
luci-base: runtime.uc: fix error500() invocation on theme failure

In case no single theme could be loaded successfully, the runtime class
failed to properly invoke the `error500()` method, which is only available
through the passed environment at this point.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 9763e3e9d320b5128f374117d0ff95ab8cc7f626)

2 years agoluci-base: dispatcher.uc: fix `N_()` fallback implementation
Jo-Philipp Wich [Mon, 7 Aug 2023 21:33:56 +0000 (23:33 +0200)]
luci-base: dispatcher.uc: fix `N_()` fallback implementation

The fallback implementation of `N_()` accessed the wrong variable, a
global `n` instead of the local `args`. Adjust the expression to reference
the correct variable.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 107ed061a8b68f080df122770690d513f52eeed0)

2 years agoluci-base: dispatcher.uc: fix error500() reporting in fallback case
Jo-Philipp Wich [Mon, 7 Aug 2023 21:29:50 +0000 (23:29 +0200)]
luci-base: dispatcher.uc: fix error500() reporting in fallback case

Fix the `error500()` fallback code path to properly output the given error
message in case rendering the error template failed.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit a435d4e11a1f0701200ad392000dbaf0d0135405)

2 years agoluci-mod-network: Adjust DNS/DHCP tab order
Hannu Nyman [Sat, 5 Aug 2023 16:00:34 +0000 (19:00 +0300)]
luci-mod-network: Adjust DNS/DHCP tab order

Adjust the order of tabs in the DNS/DHCP page.
Based on estimated importance of tabs
* move common (old) tabs to be earlier
* move the less frequently used (new) tabs later

Signed-off-by: Hannu Nyman <[email protected]>
(cherry picked from commit 7735bc1fdd2a98dbce15d52c1b1546d442cfcd40)

2 years agoluci-mod-network: added support for cname records
Santiago Kozak [Sat, 5 Aug 2023 11:45:43 +0000 (08:45 -0300)]
luci-mod-network: added support for cname records

This commit adds a tab that allows creating CNAME records

Signed-off-by: Santiago Kozak <[email protected]>
(cherry picked from commit 8a170b3149cf1d08f431cfa859dbc09d539035f0)

2 years agoluci-mod-status: gracefully handle missing port stats
Jo-Philipp Wich [Sat, 29 Jul 2023 20:03:31 +0000 (22:03 +0200)]
luci-mod-status: gracefully handle missing port stats

Ref: https://github.com/openwrt/luci/commit/cba58fcafbe3a3f4f599354f7c123b546e045887#commitcomment-123043170
Fixes: 4e46624817 ("luci-mod-status: introduce ethernet port status view")
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 00a941e618ecfb80dcccc5fd8e7d5d3eecb674b5)

2 years agoMerge pull request #6489 from stangri/openwrt-23.05-luci-app-simple-adblock
Stan Grishin [Sat, 29 Jul 2023 15:09:59 +0000 (08:09 -0700)]
Merge pull request #6489 from stangri/openwrt-23.05-luci-app-simple-adblock

[23.05] luci-app-simple-adblock: bugfix: unsupported DNS options display

2 years agoluci-app-simple-adblock: bugfix: unsupported DNS options display
Stan Grishin [Fri, 28 Jul 2023 23:26:59 +0000 (23:26 +0000)]
luci-app-simple-adblock: bugfix: unsupported DNS options display

* bugfix: move the break tag in front of the unsupported DNS options to pretty up
  the output
* use pkg.Name in RPCD calls
* slightly change the version display in WebUI to make it consistent with other
  packages

Signed-off-by: Stan Grishin <[email protected]>
(cherry picked from commit 8001cc5f2fce4b54fccca46157d42cbfca9f5894)

2 years agoluci-app-nft-qos: Remove redundant MAC address item.
Hannu Nyman [Thu, 27 Jul 2023 15:20:40 +0000 (18:20 +0300)]
luci-app-nft-qos: Remove redundant MAC address item.

Remove the redundant upload rate MAC address field.
Download was removed by 1166050 of PR #4351, but upload was overlooked.

Reference to PR #6477.

Signed-off-by: Hannu Nyman <[email protected]>
(cherry picked from commit 68a671d2dabde5a776d377fd3fd1abf1c3ab30e3)

2 years agobuild: enable packaging of Lithuanian translations
Jo-Philipp Wich [Thu, 27 Jul 2023 08:35:31 +0000 (10:35 +0200)]
build: enable packaging of Lithuanian translations

Ref: https://github.com/openwrt/luci/issues/3183#issuecomment-1652824925
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 66ddb2f747a0de0a31233d6d4f574de96eea4d45)

2 years agotreewide: sync and merge master translations
Jo-Philipp Wich [Thu, 27 Jul 2023 11:21:40 +0000 (13:21 +0200)]
treewide: sync and merge master translations

Signed-off-by: Jo-Philipp Wich <[email protected]>
2 years agoluci-app-firewall: add reflection_zone field to forwards
Julien Cassette [Wed, 12 Jul 2023 12:18:35 +0000 (14:18 +0200)]
luci-app-firewall: add reflection_zone field to forwards

This allows to to define multiple zones for NAT reflection rules.

Fixes: #1560
Signed-off-by: Julien Cassette <[email protected]>
(cherry picked from commit 3f20598acf57759aeda8ef5448e60f5a70e532f9)

2 years agoluci-mod-status: introduce ethernet port status view
Jo-Philipp Wich [Tue, 2 Aug 2022 13:41:31 +0000 (15:41 +0200)]
luci-mod-status: introduce ethernet port status view

This commit adds an ethernet port status overview to the main status page.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 4e4662481759b705fc65f71de384e08e9a3f49bc)

2 years agoluci-app-nlbwmon: drop luci-compat dependency
Jo-Philipp Wich [Thu, 27 Jul 2023 10:21:45 +0000 (12:21 +0200)]
luci-app-nlbwmon: drop luci-compat dependency

Since the transition to client side JS, no compatibilty libraries are
required anymore.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 01d26bff876f5bcd55c5828a1668e41ff8b8da5f)

2 years agoluci-mod-network: wireless.js: rename `multicast_to_unicast` option
Jo-Philipp Wich [Wed, 26 Jul 2023 13:04:52 +0000 (15:04 +0200)]
luci-mod-network: wireless.js: rename `multicast_to_unicast` option

The `multicast_to_unicast` option has been renamed to
`multicast_to_unicast_all` in OpenWrt commit
https://github.com/openwrt/openwrt/commit/09ea1db93

Fixes: #6472
Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit 6069f4f228305e3e0b59cb6deb9de9934aa68b6f)

2 years agotreewide: merge master translations
Jo-Philipp Wich [Wed, 26 Jul 2023 13:02:35 +0000 (15:02 +0200)]
treewide: merge master translations

Signed-off-by: Jo-Philipp Wich <[email protected]>
2 years agoluci-app-banip: fix URL regex in custom feed editor
Dirk Brenken [Mon, 17 Jul 2023 14:09:45 +0000 (16:09 +0200)]
luci-app-banip: fix URL regex in custom feed editor

- accept special chars for BASIC AUTH in URL

Signed-off-by: Dirk Brenken <[email protected]>
(cherry picked from commit ceb490df59d23664e409af991e578122e259a65d)

2 years agoluci-app-banip: sync with banIP 0.9.0-1
Dirk Brenken [Sun, 16 Jul 2023 14:38:32 +0000 (16:38 +0200)]
luci-app-banip: sync with banIP 0.9.0-1

Signed-off-by: Dirk Brenken <[email protected]>
(cherry picked from commit 56bbacbeca5dcd7e71d4e2bd22c15f338f878506)
Signed-off-by: Dirk Brenken <[email protected]>