project/luci.git
4 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)

4 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)

4 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)

4 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)

4 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.

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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>
4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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)

4 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

4 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)

4 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>
4 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)

4 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

4 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)

4 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

5 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)

5 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>
5 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>
5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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)

5 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>
5 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)

5 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)

5 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)

5 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

5 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)

6 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)

6 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)

6 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)

6 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)

6 months agoluci-app-tinyproxy: support socks5 upstream (#6303)
[Tue, 5 Dec 2023 03:23:32 +0000 (11:23 +0800)]
luci-app-tinyproxy: support socks5 upstream (#6303)

Signed-off-by: Zhang Rui <rui.crater@gmail.com>
(cherry picked from commit fd2d2ac734429a81c9289e33635f28367a97fafe)

luci-app-tinyproxy: error check socks5 upstream (#6303)

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

6 months agoAdding a DNS option to the wireguard peer config generator.
Nicholaos Mouzourakis [Wed, 19 Apr 2023 04:24:00 +0000 (00:24 -0400)]
Adding a DNS option to the wireguard peer config generator.
Some clients like iOS require this explicitly, and so this change
adds the appropriate config with some sensible defaults.

Closes #6351

Signed-off-by: Nicholaos Mouzourakis <nevumx@gmail.com>
Signed-off-by: Paul Donald <newtwen@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 990696d73f982de015df7c7d552daef1a03f50c5)
(cherry picked from commit 5b26887c52097dc9364c9b4f4dfb2d6ba2f08818)

6 months agoMerge pull request #6352 from nevumx/add-wireguard-peer-addresses-config
Paul Donald [Mon, 4 Dec 2023 16:34:40 +0000 (17:34 +0100)]
Merge pull request #6352 from nevumx/add-wireguard-peer-addresses-config

luci-proto-wireguard: adding an Addresses option to the wireguard peer config generator
(cherry picked from commit 9d746c75f4023bf3c4bcfe77eaa394fbf0188d95)

6 months agoluci-proto-sstp: add support for custom port (#6634)
Vladislav Grigoryev [Mon, 4 Dec 2023 21:26:01 +0000 (00:26 +0300)]
luci-proto-sstp: add support for custom port (#6634)

Add support for connecting to a custom SSTP port.
See also: https://github.com/openwrt/packages/pull/22405

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

6 months agoluci-app-example: Update with more documentation, more examples (#6503)
Duncan Hill [Mon, 4 Dec 2023 21:12:28 +0000 (21:12 +0000)]
luci-app-example: Update with more documentation, more examples (#6503)

* luci-app-example: Update with more documentation, examples
* Update translations file
* Move more YAML support to .md file, improve README
* luci-app-example: Update with more documentation, examples
* luci-app-example: Fix missed call to load_sample_yaml
* Format with tabs by using jsbeautify

(cherry picked from commit 28f805b2e5f95e04515bd7d045a103cc3a366c2c)

6 months agoluci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)
Paul Donald [Mon, 4 Dec 2023 21:00:35 +0000 (22:00 +0100)]
luci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)

Quality of life improvements. Reduce click amounts.
LuCI batches all changes for user-review anyway.

Tested on 23.05.0

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

6 months agoluci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)
Xiang W [Mon, 4 Dec 2023 20:48:19 +0000 (04:48 +0800)]
luci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)

* luci-lib-nixio: Fix add_luci_conffiles adding duplicate files

add_luci_conffiles does not check whether the file already exists
when adding the file, which may result in redundant backups in the
sysupgrade backup.

Signed-off-by: Xiang W <wxjstz@126.com>
(cherry picked from commit c2f679962ddf7f6545adacfcf3068370825c43a9)

6 months agoluci-app-tor: Manage tor-hs onion services (#6476)
Sergey Ponomarev [Mon, 4 Dec 2023 19:09:55 +0000 (21:09 +0200)]
luci-app-tor: Manage tor-hs onion services (#6476)

* luci-app-tor: Manage Onion services (tor-hs)

The tor-hs packages provides Tor Onion (Hidden) Services.
This is a good option to bypass NAT and have stable access to a router.

Later once the main Tor package gains a support of a Proxy/Bridge configuration.
We can add this to the same luci app as a different view.

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

6 months agoNew app: luci-app-sshtunnel for SSH tunnels (#6424)
Sergey Ponomarev [Mon, 4 Dec 2023 18:27:53 +0000 (20:27 +0200)]
New app: luci-app-sshtunnel for SSH tunnels (#6424)

* luci-app-sshtunnel: SSH tunnels

The app helps to configure SSH tunnels.
You can also generate an SSH key and see known hosts.

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

6 months agoluci-app-statistics: regenerate graphs on window resize
Rani Hod [Mon, 2 Oct 2023 15:01:54 +0000 (18:01 +0300)]
luci-app-statistics: regenerate graphs on window resize

Currently graphs are redrawn only based on the refresh interval
(never or every 5/30/60 seconds).
Since the image size is calculated based on the window size,
redraw graphs (once) also after resizing the window.
This also captures window resize due to orientation change
(e.g., for mobile).
Since multiple resize events are fired when dragging the window
border, there is a 250ms delay for debouncing.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 8fcd52f5130acd1a0738ff47f9bba2c9cc42e662)

6 months agoMerge pull request #6642 from vgaetera/dnsmasq-network-select
Paul Donald [Mon, 4 Dec 2023 15:04:24 +0000 (16:04 +0100)]
Merge pull request #6642 from vgaetera/dnsmasq-network-select

luci-mod-network: use network selector for dnsmasq instances
(cherry picked from commit aa1e049f3600f68cf2f52d8a1eb092155bfe8d8a)

6 months agoMerge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview
Paul Donald [Mon, 4 Dec 2023 14:06:17 +0000 (15:06 +0100)]
Merge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview

luci-app-dockerman: hide config buttons in overview page
(cherry picked from commit 568b44edb3bf545e424e7c1a3f162e753b190113)

6 months agoMerge pull request #6525 from hingbong/issue-6524
Paul Donald [Mon, 4 Dec 2023 13:27:41 +0000 (14:27 +0100)]
Merge pull request #6525 from hingbong/issue-6524

luci-app-unbound: dns assist in zone-detail add 'unprotected-loop' option #6524
(cherry picked from commit e3466bd83be36bc1d62257fac3e1635fe18133ba)

6 months agoMerge pull request #6734 from felagund/patch-1
Paul Donald [Mon, 4 Dec 2023 13:05:36 +0000 (14:05 +0100)]
Merge pull request #6734 from felagund/patch-1

 luci-mod-network: Update wireless.js to clarify Distance Optimization

(cherry picked from commit 647019cc160c394800db32ce82895245adc302ee)

6 months agoMerge pull request #6712 from systemcrash/discard_text
Paul Donald [Mon, 4 Dec 2023 04:16:23 +0000 (05:16 +0100)]
Merge pull request #6712 from systemcrash/discard_text

luci-mod-network: Extend helptext for RFC1918 rebind_protection
(cherry picked from commit d75626efcdf322a2c16559c11d5a53bab6dbd8a3)

6 months agoMerge pull request #6400 from vintas/patch-2
Paul Donald [Mon, 4 Dec 2023 02:56:59 +0000 (03:56 +0100)]
Merge pull request #6400 from vintas/patch-2

docs: fix Client side JS API docs link
(cherry picked from commit 6ddbb30ac360393a69bfc4c0566b32bd23d9bcd0)

6 months agoMerge pull request #6386 from egc112/egc112-openvpn-advanced-lua
Paul Donald [Mon, 4 Dec 2023 02:55:27 +0000 (03:55 +0100)]
Merge pull request #6386 from egc112/egc112-openvpn-advanced-lua

openvpn-advanced.lua request to add OpenVPN data-ciphers

(cherry picked from commit 1c5ebc2a0c635130bd4f86f65dce29a686eb24c4)

6 months agoMerge pull request #6296 from jjm2473/patch-2
Paul Donald [Mon, 4 Dec 2023 02:44:24 +0000 (03:44 +0100)]
Merge pull request #6296 from jjm2473/patch-2

luci-theme-bootstrap: set scroll-margin-top for all elements
(cherry picked from commit 16470a0ab89c7bcde66e9ce7334d8e4d0a4265d0)

6 months agoMerge pull request #6295 from jjm2473/patch-1
Paul Donald [Mon, 4 Dec 2023 02:44:10 +0000 (03:44 +0100)]
Merge pull request #6295 from jjm2473/patch-1

luci-mod-status: fix iptables jump on argon theme
(cherry picked from commit 706668243b8617d5c5529ac76e54f84dc57203e3)

6 months agoMerge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer
Paul Donald [Mon, 4 Dec 2023 02:36:08 +0000 (03:36 +0100)]
Merge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer

luci-app-crowdsec-firewall-bouncer: new app
(cherry picked from commit dd3f5c65470c62ae977de047e975138195bf45e6)

luci-app-crowdsec-firewall-bouncer: add newline correction

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

6 months agoMerge pull request #5631 from coudu/luci-app-nut-fixes
Paul Donald [Mon, 4 Dec 2023 01:47:50 +0000 (02:47 +0100)]
Merge pull request #5631 from coudu/luci-app-nut-fixes

luci-app-nut: nut-monitor fixes
(cherry picked from commit 51a7e0b8e8db3709feccfa83176ae77372b2b1e7)

6 months agoMerge pull request #5520 from acooler15/luci-lib-docker
Paul Donald [Mon, 4 Dec 2023 01:38:32 +0000 (02:38 +0100)]
Merge pull request #5520 from acooler15/luci-lib-docker

luci-lib-docker: fix chunked decode
(cherry picked from commit 4ade6bd04c6fb29203ade9cb44ecd37ab465a2d6)

6 months agoluci-proto-modemmanager: Added logging level option and debugmode
Paul Donald [Mon, 4 Dec 2023 00:16:15 +0000 (01:16 +0100)]
luci-proto-modemmanager: Added logging level option and debugmode

Merge github.com:valexi7/luci PR #4328

Signed-off-by: Paul Donald <newtwen@gmail.com>
Signed-off-by: valexi7 <44439515+valexi7@users.noreply.github.com>
(cherry picked from commit 1731fe12b512e10b9c061114d348cd4872422c7a)

6 months agoLuci-app-usteer: First version of luci-app-usteer
Ramon00 [Thu, 30 Nov 2023 15:43:34 +0000 (17:43 +0200)]
Luci-app-usteer: First version of luci-app-usteer

Signed-off-by: Ramon Van Gorkom <github@flightfoil.com>
[most trailing whitespace errors removed]
(cherry picked from commit a6753d44e7bcff305f789e182031fb5f089a8836)

6 months agoMerge pull request #6707 from ElbertMai/fix_vxlan6_ui
Jo-Philipp Wich [Sun, 19 Nov 2023 11:54:52 +0000 (12:54 +0100)]
Merge pull request #6707 from ElbertMai/fix_vxlan6_ui

(cherry picked from commit 41cee29f3bc832bbadc24786f082fddfb78c009d)

6 months agoMerge pull request #6698 from vgaetera/route-defaults-fix
Jo-Philipp Wich [Sun, 19 Nov 2023 00:10:33 +0000 (01:10 +0100)]
Merge pull request #6698 from vgaetera/route-defaults-fix

luci-mod-network: fix route defaults
(cherry picked from commit a9849edf23a2993737c9d5f2f6a95d79b03a2eda)

6 months agotreewide: Backport translations, sync
Hannu Nyman [Mon, 4 Dec 2023 20:36:23 +0000 (22:36 +0200)]
treewide: Backport translations, sync

Backport from master and sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 months agoluci-app-vnstat2: use more efficient way to get database interfaces
Jan Hoffmann [Sat, 18 Nov 2023 08:52:45 +0000 (09:52 +0100)]
luci-app-vnstat2: use more efficient way to get database interfaces

The currently used command "vnstat --json f 1" can be very slow when the
database contains many entries. This can result in an XHR timeout error
on the configuration page.

Use the "--dbiflist" option instead, which was added in vnStat 2.7.

Fixes: #6702
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 3ac4f567dfdfd6ee989ceffb025241e605790b6d)

7 months agoluci-lib-ip: fix creating address instances from integers
Jo-Philipp Wich [Tue, 7 Nov 2023 21:59:08 +0000 (22:59 +0100)]
luci-lib-ip: fix creating address instances from integers

Ensure that the proper byte order is used when creating IPv4/IPv6/MAC
instances from integer values on big endian systems.

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

7 months agoMerge pull request #6654 from stangri/openwrt-22.03-luci-app-https-dns-proxy
Stan Grishin [Thu, 26 Oct 2023 22:08:57 +0000 (16:08 -0600)]
Merge pull request #6654 from stangri/openwrt-22.03-luci-app-https-dns-proxy

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

7 months agoluci-app-https-dns-proxy: add status->overview include file 6654/head
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 <stangri@melmac.ca>
(cherry picked from commit dea2f135d7c915d46940e95a49891b945037be29)

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