project/luci.git
9 months agoluci-base: extend Expires directive to prevent caching
Andre Heider [Tue, 12 Sep 2023 18:09:53 +0000 (20:09 +0200)]
luci-base: extend Expires directive to prevent caching

Some browsers apparently act on fixed dates only, so add that too.
Tested on firefox.

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 12378d77cea16c268e980cca33e46df614ce5ecd)

9 months agoluci-base: i18n sync
Paul Donald [Sat, 17 Feb 2024 16:58:47 +0000 (17:58 +0100)]
luci-base: i18n sync

for 29f1e98c41a4e44aecf343069154513fac1c5573

Signed-off-by: Paul Donald <newtwen@gmail.com>
9 months agoluci-mod-status: routes: help strings to clarify column titles
Paul Donald [Fri, 16 Feb 2024 00:07:28 +0000 (01:07 +0100)]
luci-mod-status: routes: help strings to clarify column titles

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 2abc93c6e8d9ad81881756014a151840c7c7de6e)

9 months agoluci-base: i18n sync
Paul Donald [Sat, 17 Feb 2024 16:47:57 +0000 (17:47 +0100)]
luci-base: i18n sync

for fc60bacaf8421c1da113707155bf45d529136682

Signed-off-by: Paul Donald <newtwen@gmail.com>
9 months agoluci-mod-network: wireless: RADIUS Access/Accounting-Request attrs
Paul Donald [Fri, 16 Feb 2024 00:49:29 +0000 (01:49 +0100)]
luci-mod-network: wireless: RADIUS Access/Accounting-Request attrs

See following for more detail:

https://w1.fi/cgit/hostap/commit/?id=af35e7af7f8bb1ca9f0905b4074fb56a264aa12b

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit d9e7be1b435c9dc98829b10d153e5ff83ee4c213)

9 months agoMerge pull request #6923 from stangri/openwrt-22.03-luci-app-https-dns-proxy
Stan Grishin [Fri, 16 Feb 2024 23:24:22 +0000 (16:24 -0700)]
Merge pull request #6923 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: bugfix: dnsmasq_instance parsing

9 months agoluci-app-https-dns-proxy: bugfix: dnsmasq_instance parsing 6923/head
Stan Grishin [Wed, 14 Feb 2024 20:38:53 +0000 (20:38 +0000)]
luci-app-https-dns-proxy: bugfix: dnsmasq_instance parsing

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit ffc0ffe6697bb315b96a75ab7807cecdd95f7314)

9 months agoluci-proto-wireguard: fix broken DNS option in peer config generator
Jo-Philipp Wich [Fri, 16 Feb 2024 15:17:26 +0000 (16:17 +0100)]
luci-proto-wireguard: fix broken DNS option in peer config generator

The config generation code was referencing a not existing `dns_servers`
input field.

Fixes: #6921
Fixes: 5b26887c52 ("Adding a DNS option to the wireguard peer config ...")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e28f9a0491f5f50a70bbefb1720ff8241f456f83)

9 months agoluci-mod-network: dhcp: separate actual value and display string
Paul Donald [Thu, 15 Feb 2024 22:07:31 +0000 (23:07 +0100)]
luci-mod-network: dhcp: separate actual value and display string

saved value will now be only an integer.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 5b955f1ae922e37ec6bc07599d547aa9c3a5ebf1)

9 months agoluci-app-usteer: filter repeated SSIDs in config
Miguel Angel Mulero Martinez [Wed, 14 Feb 2024 07:03:43 +0000 (08:03 +0100)]
luci-app-usteer: filter repeated SSIDs in config

When the SSID name was the same in different radio, they appear repeated in the options. This commit filter them.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 2841d28396984431f3cf313cf0fbf381441ec40e)

9 months agobuild: invoke ./build/mkbasepot.sh without any parameters
Paul Donald [Thu, 15 Feb 2024 03:01:14 +0000 (04:01 +0100)]
build: invoke ./build/mkbasepot.sh without any parameters

e.g. to build everything

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 269df2426d8c207d6c89ad2950a65f187d9a922e)

9 months agoluci-mod-network: fix broken formatting
Paul Donald [Thu, 15 Feb 2024 01:58:42 +0000 (02:58 +0100)]
luci-mod-network: fix broken formatting

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit ca80c2acf7a1a5c3600d44bbaff1c51b7b170bc2)

9 months agoluci-app-usteer: Fix no wireless defined setup
Miguel Angel Mulero Martinez [Tue, 13 Feb 2024 11:25:48 +0000 (12:25 +0100)]
luci-app-usteer: Fix no wireless defined setup

Some users use the usteer app in a "non wireless" device. With the current code it crashes because there is no SSID defined. Making the ui element a DynamicList fixes the issue because it allows free text input.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit ac8cf93a015a3eeb960ef216e59dde643bf059ed)

9 months agoluci-app-tor: i18n sync
Paul Donald [Tue, 13 Feb 2024 02:39:59 +0000 (03:39 +0100)]
luci-app-tor: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 9b978c522ecc0b71275606ea109d7233edbf86bb)

9 months agoluci-base: i18n sync
Paul Donald [Wed, 14 Feb 2024 23:39:26 +0000 (00:39 +0100)]
luci-base: i18n sync

after revert of commit 4d823900c5393f083754d388748dd09f2d2c5384.

Signed-off-by: Paul Donald <newtwen@gmail.com>
9 months agobuild: invoke ./build/mkbasepot.sh with -b
Paul Donald [Thu, 15 Feb 2024 00:24:55 +0000 (01:24 +0100)]
build: invoke ./build/mkbasepot.sh with -b

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 50f470f6be08a989f1a92094769a1db671862cf3)

9 months agobuild: update build/i18n-* tools
Paul Donald [Wed, 14 Feb 2024 23:44:01 +0000 (00:44 +0100)]
build: update build/i18n-* tools

modify i18n-add-language.sh so it can:
- be run from any path
- bootstrap any (or all) po folder(s) with existing language(s)
- (partially) update luci.mk with new languages

deprecate build/i18n-init.sh

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit b98d8c526e05d658856a83c469f79957223fbfd6)

9 months agoluci-app-opkg: i18n sync
Paul Donald [Wed, 14 Feb 2024 22:09:51 +0000 (23:09 +0100)]
luci-app-opkg: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
9 months agoluci-app-https-dns-proxy: i18n sync
Paul Donald [Tue, 13 Feb 2024 02:38:19 +0000 (03:38 +0100)]
luci-app-https-dns-proxy: i18n sync

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 22467ec732cca0f4f259597535bd304bb5983075)

9 months agobuild: i18n-sync script refinements
Paul Donald [Tue, 13 Feb 2024 03:11:41 +0000 (04:11 +0100)]
build: i18n-sync script refinements

add -P x to xargs for x number of processes.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e88294d7acd5002b4867aedd2f2e238eb39efb63)

9 months agoMerge pull request #6897 from stangri/master-luci-app-opkg
Stan Grishin [Mon, 12 Feb 2024 17:42:15 +0000 (10:42 -0700)]
Merge pull request #6897 from stangri/master-luci-app-opkg

luci-app-opkg: show disk space consistent with overview
(cherry picked from commit eb40b0bd576e256a0251279c53490043a070dedf)

9 months agoluci-app-tor: add config for tor
Sergey Ponomarev [Fri, 9 Feb 2024 01:07:22 +0000 (03:07 +0200)]
luci-app-tor: add config for tor

Currently the UCI for the Tor allows to set only a list of configs to include.
The only way to configure it for a user is to upload its own config and add it to list of included.
We can simplify this with the app.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit c170dfab9197f714c5e4483caad924631779122a)

9 months agoluci-app-tor: fix ACL for tor-hs-rpc
Sergey Ponomarev [Thu, 8 Feb 2024 23:19:40 +0000 (01:19 +0200)]
luci-app-tor: fix ACL for tor-hs-rpc

The ACL has old tor_rpcd.sh which was changed in the tor-hs v0.0.1-3 to tor-hs-rpc.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit a4e586397e9d5695b2c435b03fb5b5da27ac6aa0)

9 months agoluci-mod-network: DNS forwardings -> DNS Forwards
Paul Donald [Mon, 12 Feb 2024 00:20:54 +0000 (01:20 +0100)]
luci-mod-network: DNS forwardings -> DNS Forwards

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 1b18cea61d99ca75581dc09010b118a86ac8dc28)

9 months agoluci-mod-status: i18n refresh eb6b2bdaae9c6f8d6d8969b47e21895d6508f396
Paul Donald [Sun, 11 Feb 2024 22:08:22 +0000 (23:08 +0100)]
luci-mod-status: i18n refresh eb6b2bdaae9c6f8d6d8969b47e21895d6508f396

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 76ed6774b3cd73bc1318f7c9b976a6c98c1ad3ad)

9 months agoluci-mod-status: Adding scroll buttons on syslog and kernellog status pages
Ramon Van Gorkom [Sun, 11 Feb 2024 10:51:45 +0000 (11:51 +0100)]
luci-mod-status: Adding scroll buttons on syslog and kernellog status pages

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit eb6b2bdaae9c6f8d6d8969b47e21895d6508f396)

9 months agoRevert "luci-mod-network: add ppsk option (support for Private PSK)"
Paul Donald [Wed, 14 Feb 2024 19:38:14 +0000 (20:38 +0100)]
Revert "luci-mod-network: add ppsk option (support for Private PSK)"

This reverts commit 4d823900c5393f083754d388748dd09f2d2c5384.

9 months agoluci-base: update timezone data to 2024a
Hannu Nyman [Fri, 9 Feb 2024 19:39:13 +0000 (21:39 +0200)]
luci-base: update timezone data to 2024a

Update timezone data to 2024a.

https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html

Briefly:
* Kazakhstan unifies on UTC+5 beginning 2024-03-01.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 months agoluci-mod-network: put each IPv6 address on a separate line
David Härdeman [Wed, 7 Feb 2024 14:41:48 +0000 (15:41 +0100)]
luci-mod-network: put each IPv6 address on a separate line

Right now, when there's active DHCPv6 leases and more than one address per host
(e.g. because ULA is used together with GUA prefixes), the two IPv6 addresses
will be printed on one line (which may or may not get broken up depending on
the length of the addresses, which also looks inconsistent).

Putting each address on a separate line makes it much easier to read the
addresses (IMHO).

Signed-off-by: David Härdeman <david@hardeman.nu>
(cherry picked from commit 9116a93d4311f541efa026f9eb3309a5f7554fd4)

9 months agoluci-app-openvpn: add OpenVPN option disable-dco
Martin Schiller [Wed, 31 Jan 2024 07:40:35 +0000 (08:40 +0100)]
luci-app-openvpn: add OpenVPN option disable-dco

You maybe want to disable the DCO support, so let's add this option.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
(cherry picked from commit 5b2bc99c30b80c3a706de3133a8c05f852dc08d1)

9 months agoluci-app-cloudflared: simplify translation
Sergey Ponomarev [Wed, 7 Feb 2024 14:26:53 +0000 (16:26 +0200)]
luci-app-cloudflared: simplify translation

Rename "Debug level" with "Logging level".
Reuse similar messages "Log" and "Logs".
Remove now unused "Collecting data...".
Use "Cloudflare Zero Trust Tunnel" instead of just "Cloudflared".

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit ee632a18886fe8ac5000d4cb9c86aa2b17288874)

9 months agoluci-app-cloudflared: v1.1
Sergey Ponomarev [Sun, 4 Feb 2024 08:01:59 +0000 (10:01 +0200)]
luci-app-cloudflared: v1.1

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 766224d9aedd1c156dc57ea837145b3b41da53a5)

9 months agoluci-app-cloudflared: fix ACL for uploading a file
Sergey Ponomarev [Sun, 4 Feb 2024 13:16:47 +0000 (15:16 +0200)]
luci-app-cloudflared: fix ACL for uploading a file

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 9551c03f6830e5543f2ea5fa96f02fa86f2378bb)

9 months agoluci-app-cloudflared: simplify service status render
Sergey Ponomarev [Thu, 1 Feb 2024 21:41:10 +0000 (23:41 +0200)]
luci-app-cloudflared: simplify service status render

Instead of using poll use the o.cfgvalue to render a status.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit a5dfb9604c1b9eb7ac220ae83dc0478b0e3a58f0)

9 months agoluci-app-cloudflared: add Tunnels status page
Sergey Ponomarev [Sat, 3 Feb 2024 20:06:36 +0000 (22:06 +0200)]
luci-app-cloudflared: add Tunnels status page

The page allows to see if the tunnel has connections.
This can be used for a basic troubleshooting without opening the Cloudflare dashboard.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit b8a4328fcfa77621258d210dffc091353fcb1989)

9 months agoluci-app-usteer: retrieve SSIDs to be used in the config
Miguel Angel Mulero Martinez [Mon, 5 Feb 2024 18:35:00 +0000 (19:35 +0100)]
luci-app-usteer: retrieve SSIDs to be used in the config

This commit retrieves the list of SSIDs availables to prepopulate the ssid_list UI element of the config.

Signed-off-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
(cherry picked from commit 5b6a70575469affbff94229353a7f7e1c58a7a1b)

9 months agoRevert "luci-app-upup: Improve translation"
Paul Donald [Sat, 3 Feb 2024 15:39:38 +0000 (16:39 +0100)]
Revert "luci-app-upup: Improve translation"

This reverts commit ff8bb24a44505094396cea4509ecc690ef716c55.

9 months agoluci-app-smartdns: Fix The list has multiple headers.
Fanx [Fri, 2 Feb 2024 07:10:39 +0000 (15:10 +0800)]
luci-app-smartdns: Fix The list has multiple headers.
Signed-off-by: FanxJK <fanxjk@gmail.com>
(cherry picked from commit 16f4011644b8689fffb0866e2de4e821b2f52d9b)

9 months agoluci-app-cloudflared: configure Cloudflare Zero Trust Tunnel
Hilman Maulana [Sun, 14 Jan 2024 09:33:37 +0000 (16:33 +0700)]
luci-app-cloudflared: configure Cloudflare Zero Trust Tunnel

Configure a tunnel and see logs of the daemon.

Signed-off-by: Hilman Maulana <hilman0.0maulana@gmail.com>
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit faf6c4f0283f14f2fdc95f298d65f11566c1aefa)

9 months agoluci-base: Code quality fixes
Paul Donald [Wed, 31 Jan 2024 01:04:27 +0000 (02:04 +0100)]
luci-base: Code quality fixes

reduce backtracking in regex

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 2dc1fccbd1f46d3fa2689cc1eae3899e5a807a4f)

9 months agoluci-lib-nixio: Code quality fixes
Paul Donald [Sat, 3 Feb 2024 15:18:42 +0000 (16:18 +0100)]
luci-lib-nixio: Code quality fixes

future variants could use en/decodeURIComponent

ordering is important when handling "&"

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit d46da53bcd1f822d5b11772fc85b475b9d9174ff)

9 months agoluci-app-bmx7: Code quality fixes
Paul Donald [Tue, 30 Jan 2024 18:38:01 +0000 (19:38 +0100)]
luci-app-bmx7: Code quality fixes

Add integrity check for externally loaded d3 lib

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 74b89027d35a1d4024900451936747c45705f4fb)

9 months agoluci-base: Code quality fixes
Paul Donald [Tue, 30 Jan 2024 18:31:38 +0000 (19:31 +0100)]
luci-base: Code quality fixes

handle (possibly incorrect) comment variants
<!-- -->
<!-- --!>

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 4c2090afd865045e3693b84318de3b56f658e48a)

9 months agoluci-base: fix docs for TableSection
Paul Donald [Thu, 25 Jan 2024 02:18:12 +0000 (03:18 +0100)]
luci-base: fix docs for TableSection

There are repeated values (TableSection inherits identically named
values from TypedSection which do not make sense to recreate).

There seemed to be other errors. E.g. TypedSection for FlagValue
properties, which mean that TypedSection got tooltip + tooltipicon,
and by virtue of the above error, GridSection inherited this too.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 0617d301d9e9bb876621e61600673daef200b182)

9 months agoluci-app-upup: Improve translation
He Ping [Tue, 23 Jan 2024 14:58:37 +0000 (22:58 +0800)]
luci-app-upup: Improve translation

Signed-off-by: He Ping <pinghejk@gmail.com>
(cherry picked from commit 2bdf7c83e3c71f9ad4dfaec259c7fcce87e7d807)
(cherry picked from commit 4adc6a4285a763cac0f4a35c95f6ba42857f3d86)

9 months agotreewide: Backport translations from master and sync
Hannu Nyman [Sat, 3 Feb 2024 09:07:53 +0000 (11:07 +0200)]
treewide: Backport translations from master and sync

Backport from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 months agoluci-app-usteer: added nslookup/hosthint lookup of AP IP address
Ramon Van Gorkom [Tue, 16 Jan 2024 17:40:31 +0000 (18:40 +0100)]
luci-app-usteer: added nslookup/hosthint lookup of AP IP address

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 7a9ae6811fece6512a432af352b4e774fe4a05ed)

9 months agoluci-mod-network: add ppsk option (support for Private PSK)
Manuel Giganto [Mon, 12 Oct 2020 15:35:08 +0000 (15:35 +0000)]
luci-mod-network: add ppsk option (support for Private PSK)

Include support in luci to enable the Private PSK.
When Private PSK is enabled, clients can use a default password (common),
or have their own private password that is associated with the client MAC.

The password is retrieved from RADIUS server, asking for the client MAC,
and when such client MAC is not defined, RADIUS should return a default
password.

RADIUS can also return other parameters like VLANs, which can be used to
put clients dynamically in different VLANs based on their MAC, or the
default configuration.

Private PSK is not compatible yet with SAE encryption, therefore cannot
be used yet with WPA3 or WPA3-mixed.

It implements the UI for the PPSK already in master: https://github.com/openwrt/openwrt/pull/3509

Signed-off-by: Manuel Giganto <mgigantoregistros@gmail.com>
(cherry picked from commit 75a2fd233baabf6fa5bafcb13ccc6d7000a4604d)

9 months agoluci-app-v2raya: add zh-hans translation
Tianling Shen [Wed, 24 Jan 2024 17:08:13 +0000 (01:08 +0800)]
luci-app-v2raya: add zh-hans translation

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 21a518cb1adcaa8d8d23af38c86cb19527c54c5c)

9 months agoluci-app-v2raya: i18n house-keeping
Tianling Shen [Thu, 25 Jan 2024 03:33:54 +0000 (11:33 +0800)]
luci-app-v2raya: i18n house-keeping

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit daebac2acb9efb99e167132d0526ef912b7a0c63)

9 months agoluci-app-v2raya: add new package
Tianling Shen [Wed, 24 Jan 2024 17:03:44 +0000 (01:03 +0800)]
luci-app-v2raya: add new package

Add LuCI interface for the v2rayA package.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 80f67d3ea8525646f4811dcabb447995ea0fca2c)

9 months agoMerge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields
Paul Donald [Sun, 28 Jan 2024 14:55:13 +0000 (15:55 +0100)]
Merge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields

luci-mod-network: Fix 'instances' fields for dnsmasq dhcp config entries
(cherry picked from commit d353bc50cd45bd0863170a0fa2f4e474405f8354)

9 months agoluci-mod-network: Fixes for PXE/TFTP tab.
Paul Donald [Mon, 18 Dec 2023 18:45:12 +0000 (19:45 +0100)]
luci-mod-network: Fixes for PXE/TFTP tab.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 0c27557ab56926502ebb0189f9da0c9f866dc318)

9 months agoluci-mod-network: Restructure DHCP options
Paul Donald [Wed, 24 Jan 2024 22:32:04 +0000 (23:32 +0100)]
luci-mod-network: Restructure DHCP options

DHCP devices: add minport and maxport

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 60423d63f5d6f2f83aee1a56c31f214e78d4b86d)

9 months agoluci-mod-network: Restructure DHCP options
Paul Donald [Thu, 25 Jan 2024 01:14:33 +0000 (02:14 +0100)]
luci-mod-network: Restructure DHCP options

DHCP limits: add [min|max]_cache_ttl

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit a9744f00e18a8684fe912f49c707ba4af51494b9)

9 months agoluci-mod-network: Restructure DHCP options
Paul Donald [Mon, 18 Dec 2023 20:52:40 +0000 (21:52 +0100)]
luci-mod-network: Restructure DHCP options

DHCP logging: add logfacility

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 6666d32e1d871cf28d693d71f0e13922f7ab8ae5)

9 months agoluci-mod-network: Restructure DHCP options
Paul Donald [Sat, 18 Nov 2023 14:43:38 +0000 (15:43 +0100)]
luci-mod-network: Restructure DHCP options

DHCP logging: add logdhcp

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 6d425206d2c2ede97ccab7944046c76a158bb2e2)

9 months agoluci-mod-network: Restructure DHCP options
Paul Donald [Thu, 25 Jan 2024 23:57:09 +0000 (00:57 +0100)]
luci-mod-network: Restructure DHCP options

Multiple dnsmasq sections are now enabled (for those who want
e.g. separate dnsmasq options per interface).

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 09ab7641738c35b2f7bfbcfe62fc77fe1c77c3c9)

9 months agoluci-mod-network: Restructure DHCP options
Paul Donald [Sun, 28 Jan 2024 15:02:16 +0000 (16:02 +0100)]
luci-mod-network: Restructure DHCP options

DHCP options better structured according to the nature of
the option:

-Tab titles have been trimmed
-Some options moved into new tabs (filter, limits, logging, devices,etc)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 010c32010b20b8e159cfadaf58c20e775b119388)

9 months agoluci-app-upnp: fix name of access-control-list
Reidar Cederqvist [Thu, 25 Jan 2024 12:35:35 +0000 (13:35 +0100)]
luci-app-upnp: fix name of access-control-list

Signed-off-by: Reidar Cederqvist <reidar.cederqvist@genexis.eu>
(cherry picked from commit d048e40cb74cc4478beedabca55902a54a4965ad)

9 months agoluci-mod-network: let sourcefilter option available for most proto
Chen Minqiang [Mon, 22 Jan 2024 14:46:51 +0000 (22:46 +0800)]
luci-mod-network: let sourcefilter option available for most proto

sourcefilter option should be available for proto like:
'dhcpv6'
'directip'
'ppp'
'pppoe'
'pppoa'
'pptp'
'qmi'
'mbim'
'ncm'
'3g'

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 999f26e951e516ddb394ecf7b6b305e4a34810fa)

9 months agoluci-mod-network: add getHostHints to luci-rpc permissions
Paul Donald [Thu, 25 Jan 2024 00:36:57 +0000 (01:36 +0100)]
luci-mod-network: add getHostHints to luci-rpc permissions

it would seem that this was forgotten somewhere along the way

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e792e055e133c08c321b7606e4effc19421f81ef)

9 months agoluci-mod-network: improve static lease ip validation logic
Paul Donald [Thu, 25 Jan 2024 00:05:15 +0000 (01:05 +0100)]
luci-mod-network: improve static lease ip validation logic

m (mac) is an array, and is zero length or greater.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit f6cbda00e77afc26c12da3c31e5f5444cee17422)

9 months agoluci-mod-network: repair DHCP relay validation logic
Paul Donald [Wed, 24 Jan 2024 23:42:38 +0000 (00:42 +0100)]
luci-mod-network: repair DHCP relay validation logic

change && to || so as not to backtrace if only one was empty/null.

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 754b36d05ac26e1ddc68d8726e01faa38f9fe948)

9 months 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 <jo@mein.io>
(cherry picked from commit 88326b809ba9388a1b11b1c4226ccb07e5911261)

10 months agoluci-app-openvpn: Updates proto and mssfix params
Philippe Duveau [Sun, 15 May 2022 11:08:21 +0000 (13:08 +0200)]
luci-app-openvpn: Updates proto and mssfix params

- proto parameter is available in client or server mode in the network section.
- mssfix default value is set to openvpn.org default value

Signed-off-by: Philippe Duveau <philippe.duveau@free.fr>
(cherry picked from commit 9889d3f73524c5ef814ab37e5c9fac81f213046d)

10 months agoMerge pull request #6862 from jesferman/fix_11r_dependencies
Jo-Philipp Wich [Tue, 23 Jan 2024 16:36:29 +0000 (17:36 +0100)]
Merge pull request #6862 from jesferman/fix_11r_dependencies

luci-mod-network: wireless.js: fix 802.11r dependencies
(cherry picked from commit b0c135423370548e8198609309e64bf48fe1717b)

10 months agoluci-app-upup: Improve translation
He Ping [Tue, 23 Jan 2024 14:58:37 +0000 (22:58 +0800)]
luci-app-upup: Improve translation

Signed-off-by: He Ping <pinghejk@gmail.com>
(cherry picked from commit 2bdf7c83e3c71f9ad4dfaec259c7fcce87e7d807)

10 months agoMerge pull request #6851 from stangri/openwrt-22.03-luci-app-https-dns-proxy
Stan Grishin [Tue, 23 Jan 2024 10:06:32 +0000 (03:06 -0700)]
Merge pull request #6851 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: remove unnecessary translation call

10 months agoluci-app-ksmbd: update kmod from version to vermagic
Andrea Pesaresi [Fri, 19 Jan 2024 15:41:37 +0000 (16:41 +0100)]
luci-app-ksmbd: update kmod from version to vermagic

Now the kmod version on luci show "?", if we switch from version to vermagic it will show correct version of kmod.

Signed-off-by: Andrea Pesaresi <andreapesaresi82@gmail.com>
(cherry picked from commit fe543de80956405085997014fd347f869013953c)

10 months agotreewide: Backport translations, sync
Hannu Nyman [Sun, 21 Jan 2024 14:29:41 +0000 (16:29 +0200)]
treewide: Backport translations, sync

Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
10 months agoluci-app-https-dns-proxy: remove unnecessary translation call 6851/head
Stan Grishin [Sat, 20 Jan 2024 17:09:28 +0000 (17:09 +0000)]
luci-app-https-dns-proxy: remove unnecessary translation call

Thank you @hnyman!

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f162289fe4de00bf228ab66aaccff1235b41cfd9)

10 months agoMerge pull request #6826 from stangri/openwrt-22.03-luci-theme-openwrt-2020
Stan Grishin [Thu, 11 Jan 2024 22:32:54 +0000 (15:32 -0700)]
Merge pull request #6826 from stangri/openwrt-22.03-luci-theme-openwrt-2020

[22.03] luci-theme-openwrt-2020: fix anchor decorations

10 months agoluci-theme-openwrt-2020: fix anchor decorations 6826/head
Stan Grishin [Wed, 3 Jan 2024 07:20:21 +0000 (07:20 +0000)]
luci-theme-openwrt-2020: fix anchor decorations

* add the decorations for when the links are included in the field descriptions

Thanks @dibdot, @stokito!

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 525c5da356da2c642cd2ebea83a4e303e666c04f)

10 months agoMerge pull request #6822 from stangri/openwrt-22.03-luci-app-https-dns-proxy
Stan Grishin [Tue, 9 Jan 2024 10:43:13 +0000 (03:43 -0700)]
Merge pull request #6822 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: bugfix: editing providers with options

10 months agoluci-app-https-dns-proxy: bugfix: editing providers with options 6822/head
Stan Grishin [Tue, 9 Jan 2024 03:21:20 +0000 (03:21 +0000)]
luci-app-https-dns-proxy: bugfix: editing providers with options

* fixes https://github.com/openwrt/luci/issues/6811
* previously editing existing provider instance with options would not
  result in the correct saving of edited parameters

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit a83427fefe497fcda92a3f9b59701dc91a6f1df1)

10 months agotreewide: Backport translations from master and sync
Hannu Nyman [Sat, 6 Jan 2024 19:19:34 +0000 (21:19 +0200)]
treewide: Backport translations from master and sync

Backport translations from master and sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
10 months agotimezone data: update to 2023d
Hannu Nyman [Sat, 6 Jan 2024 19:08:31 +0000 (21:08 +0200)]
timezone data: update to 2023d

Update timezone data to 2023d.

https://mm.icann.org/pipermail/tz-announce/2023-December/000080.html

Summary:
* Ittoqqortoormiit, Greenland changes time zones on 2024-03-31.
* Vostok, Antarctica changed time zones on 2023-12-18.
* Casey, Antarctica changed time zones five times since 2020.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
10 months agoluci-app-usteer: Added tooltip while hovering over connected client showing mac,...
Ramon Van Gorkom [Sun, 24 Dec 2023 15:04:33 +0000 (16:04 +0100)]
luci-app-usteer: Added tooltip while hovering over connected client showing mac, IP(s), hostname in status page

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 0f794ac76c53b154694b8ee9be4772a501faa76f)

10 months agoluci-app-usteer: Removed save/apply button on status pages, and added "friendly"...
Ramon Van Gorkom [Sun, 17 Dec 2023 11:42:14 +0000 (12:42 +0100)]
luci-app-usteer: Removed save/apply button on status pages, and added "friendly" error message if usteer not running
Added refresh of status page

Add the template pot file that is needed to start translating the app.

Co-authored-by: Sergey Ponomarev <stokito@gmail.com>
Co-authored-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 0b2aad03599c4f5c7b513f9274b529e7dd3d7e29)

10 months agoluci-mod-network: DHCP tab IPsets ( add NFTsets properties )
Paul Donald [Sat, 18 Nov 2023 15:56:27 +0000 (16:56 +0100)]
luci-mod-network: DHCP tab IPsets ( add NFTsets properties )

See also:

https://github.com/openwrt/openwrt/commit/d7f378796f985c902ff7906767c275c40a15347f

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit f98ce31fdbdfc61c8ec7443c791a98d9ee93b6f2)

10 months agoluci-app-sshtunnel: sync .po files
Paul Donald [Thu, 28 Dec 2023 17:57:59 +0000 (17:57 +0000)]
luci-app-sshtunnel: sync .po files

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit c668d992e1a1a1aeb4f3b6e6807784f43bc1b7af)

10 months agoluci-app-sshtunnel: servers: ProxyCommand option
Sergey Ponomarev [Thu, 28 Dec 2023 17:39:51 +0000 (19:39 +0200)]
luci-app-sshtunnel: servers: ProxyCommand option

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 255aef1748309d065795f551b1994f2cd807b668)

10 months agoluci-app-sshtunnel: i18n
Sergey Ponomarev [Thu, 21 Dec 2023 02:20:48 +0000 (04:20 +0200)]
luci-app-sshtunnel: i18n

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit a1f5b6087f04c5e214a31c7201d12c77e65c58e7)

10 months agoluci-app-sshtunnel: hide Save and Apply buutons for non form pages
Sergey Ponomarev [Thu, 21 Dec 2023 01:37:52 +0000 (03:37 +0200)]
luci-app-sshtunnel: hide Save and Apply buutons for non form pages

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 61e166aa93b5aefbb362a9c438e7c70f41c57d4a)

10 months agoluci-app-sshtunnel: servers: make a link to man ssh_config
Sergey Ponomarev [Thu, 21 Dec 2023 01:33:37 +0000 (03:33 +0200)]
luci-app-sshtunnel: servers: make a link to man ssh_config

Use Debian man pages because it has many versions and languages.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 059850ba0cb4afbd0c4434f0ef4825326b7baa2f)

10 months agoluci-app-sshtunnel: extract a public key from a key if no .pub
Sergey Ponomarev [Sun, 17 Dec 2023 14:52:58 +0000 (16:52 +0200)]
luci-app-sshtunnel: extract a public key from a key if no .pub

For the Dropbear keys without a .pub we need to fall back and execute the -y command to extract a pubkey from a private.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 8755aa3a71bf47ba65706a39c72cd294923d9285)

10 months agoluci-app-sshtunnel: ssh_keys: list keys without a corresponding .pub
Sergey Ponomarev [Sun, 17 Dec 2023 12:34:32 +0000 (14:34 +0200)]
luci-app-sshtunnel: ssh_keys: list keys without a corresponding .pub

The private keys doesn't have any extension so the only way to clearly say that this file is a key is a presence of the corresponding .pub file.
Most of time key files have a prefix id_ e.g. id_rsa etc.

The dropbearkey generates a key without a corresponding .pub file e.g. id_dropbearkey.

So we need to detect a key files by both .pub file or id_ prefix.
Key files without the id_ prefix won't be listed, sorry.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 949e7cbcb33cc457bfcdd27aaf4da487bab89f30)

10 months agoluci-app-sshtunnel: generate a new key
Sergey Ponomarev [Sun, 17 Dec 2023 10:55:29 +0000 (12:55 +0200)]
luci-app-sshtunnel: generate a new key

Make the Generate a new key as a separate section and move to bottom.
Extend the key name pattern to be an email address so allow symbols @ - +.
Force the id_ prefix for key names.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 3933633dd0de84b1c13af5d8f62b6b2431bf1ca7)

11 months agoluci-base: comment fixes (sp)
Paul Donald [Sat, 23 Dec 2023 14:33:16 +0000 (14:33 +0000)]
luci-base: comment fixes (sp)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 5355b7b57604493909db3b472d6623a4b420d771)

11 months agotreewide: Backport and sync translations
Hannu Nyman [Sat, 23 Dec 2023 07:11:16 +0000 (09:11 +0200)]
treewide: Backport and sync translations

Backport from master, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
11 months agoluci-proto-ipv6: Add DHCPv6 norelease menu option (#6775)
Det [Thu, 21 Dec 2023 21:53:03 +0000 (21:53 +0000)]
luci-proto-ipv6: Add DHCPv6 norelease menu option (#6775)

Signed-off-by: Richard Patterson <richard@helix.net.nz>
(cherry picked from commit 4ad5f8111bc357d88390d914d82f0517ccbcf769)

11 months agoluci-app-statistics: lookup -> look up
Paul Donald [Tue, 19 Dec 2023 19:44:35 +0000 (20:44 +0100)]
luci-app-statistics: lookup -> look up

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 0a6618823656df7aefc7b958e187afd628248e90)

11 months agoluci-app-openvpn: Add multihome boolean.
Paul Donald [Tue, 19 Dec 2023 16:51:58 +0000 (17:51 +0100)]
luci-app-openvpn: Add multihome boolean.

Helps when you have multiple IP(v4|v6)

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit a5ed5976f4cf70a36863e69da8c055f855545f87)

11 months agoMerge pull request #6762 from stangri/openwrt-22.03-luci-app-https-dns-proxy
Stan Grishin [Mon, 11 Dec 2023 22:46:15 +0000 (15:46 -0700)]
Merge pull request #6762 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: update to 2023-10-25-5

11 months agoluci-app-https-dns-proxy: update to 2023-10-25-5 6762/head
Stan Grishin [Mon, 11 Dec 2023 13:06:12 +0000 (13:06 +0000)]
luci-app-https-dns-proxy: update to 2023-10-25-5

* no longer "require uci" in js files
* use L.resolveDefault when loading configs
* improve DNSMASQ config update selection user experience
* switch from uci.get to L.uci.get
* small code improvement of RPCD script

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 799280877fbe7a43dab9c3af1dd509519e2f542b)

11 months agoluci-mod-network: exclude alias to self from device picker
Jo-Philipp Wich [Fri, 8 Dec 2023 12:01:13 +0000 (13:01 +0100)]
luci-mod-network: exclude alias to self from device picker

Do not present alias to self as valid choice in the interface device picker.

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

11 months agoluci-mod-network: properly reflect config state in sysfs tristates
Jo-Philipp Wich [Fri, 8 Dec 2023 11:38:51 +0000 (12:38 +0100)]
luci-mod-network: properly reflect config state in sysfs tristates

When a boolean sysfs option is forcibly set to `0` or `1` in uci, then make
sure to properly reflect that choice state when rendering the widget.

Right now the dropdown incorrectly reverted to "automatic" after saving but
not applying the changes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4b6b00927b4a1076ed8bf23f3a0327a335ebece5)

11 months agoluci-mod-status: add ACL entry for storage index
Christian Marangi [Thu, 15 Jun 2023 16:52:55 +0000 (18:52 +0200)]
luci-mod-status: add ACL entry for storage index

Add missing ACL entry for storage index page.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
luci-mod-status: expand storage index page with mount points

Expand storage index page with mount points. For custom mounts point we
use the device name and we reference the mount point between ().

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
luci-mod-status: ensure each storage getMountPoints result is unique

Signed-off-by: Paul Donald <newtwen@gmail.com>
Closes #2767

(cherry picked from commit f1db42e67041d7c290fb2221ba5e787aa5e6b8bb)

11 months agoluci-app-vnstat2: fix configuration page when database is empty (#6746)
Jan Hoffmann [Wed, 6 Dec 2023 01:24:25 +0000 (02:24 +0100)]
luci-app-vnstat2: fix configuration page when database is empty (#6746)

The output of the command "vnstat --dbiflist 1" is empty when there are
no interfaces in the database. Add a check to avoid a "result.stdout is
undefined" error in that case.

Ref: https://forum.openwrt.org/t/error-in-luci-vnstat2-configuration-menu/179700
Fixes: 3ac4f567dfdf ("luci-app-vnstat2: use more efficient way to get database interfaces")
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit c0c37903f2276224c246c2a5ba0fb2732ba0e18a)