project/luci.git
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 [Thu, 25 Jan 2024 23:56:48 +0000 (00:56 +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)

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

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

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

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

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

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 #6852 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Tue, 23 Jan 2024 10:06:15 +0000 (03:06 -0700)]
Merge pull request #6852 from stangri/openwrt-23.05-luci-app-https-dns-proxy

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

10 months agoMerge pull request #6850 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Tue, 23 Jan 2024 10:05:54 +0000 (03:05 -0700)]
Merge pull request #6850 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: remove unnecessary translation calls

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 and sync
Hannu Nyman [Sun, 21 Jan 2024 14:26:04 +0000 (16:26 +0200)]
treewide: Backport translations and sync

Backport from master, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
10 months agoluci-app-https-dns-proxy: remove unnecessary translation call 6852/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 agoluci-app-adblock-fast: remove unnecessary translation calls 6850/head
Stan Grishin [Sat, 20 Jan 2024 17:09:08 +0000 (17:09 +0000)]
luci-app-adblock-fast: remove unnecessary translation calls

Thank you @hnyman!

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

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

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

10 months agoluci-theme-openwrt-2020: fix anchor decorations 6827/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 #6823 from stangri/openwrt-23.05-luci-app-https-dns-proxy
Stan Grishin [Tue, 9 Jan 2024 10:43:17 +0000 (03:43 -0700)]
Merge pull request #6823 from stangri/openwrt-23.05-luci-app-https-dns-proxy

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

10 months agoluci-app-https-dns-proxy: bugfix: editing providers with options 6823/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 agoluci-app-firewall: add ICMPv6 MLD rules
Jonathan G. Underwood [Tue, 16 May 2023 19:34:55 +0000 (20:34 +0100)]
luci-app-firewall: add ICMPv6 MLD rules

This adds entries for ICMPv6 MLD types. This fixes the ICMPv6 MLD types to be consistent with fw4.

These types were added to fw4 in this commit:

    -  https://github.com/openwrt/firewall4/commit/e6e82a55206cf7017f26b92f7097f779161b5cac

But were omitted from the corresponding luci-app-firewall commit:

    - https://github.com/openwrt/luci/commit/88a016cbff7eacf3a8248bc4949904abacef6685

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
(cherry picked from commit 73abc0ee6d64bab49889b1d5fbca09f9a8e64745)

10 months agoluci-app-travelmate: sync with travelmate 2.1.2-1
Dirk Brenken [Sat, 6 Jan 2024 18:57:52 +0000 (19:57 +0100)]
luci-app-travelmate: sync with travelmate 2.1.2-1

* fix a station scanning issue on single radio units (mainly a LuCI/JS issue) reported in the forum by multiple users

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 465cea44e3a4af9903a6eedb621a56de5ce0d057)

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

Backport translations from master. Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
10 months agotimezone data: update to 2023d
Hannu Nyman [Sat, 6 Jan 2024 18:54:11 +0000 (20:54 +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>
(cherry picked from commit 8debeeb43875b9e4ba4e0136d0dbcbc4504f53f4)

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: Rework the (multi) mac for static leases
Paul Donald [Thu, 7 Dec 2023 00:06:16 +0000 (01:06 +0100)]
luci-mod-network: Rework the (multi) mac for static leases

+i18n

Removed Jows widget which hindered management of multi mac entries.

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

10 months agoluci-mod-network: Make MAC check functions generic.
Paul Donald [Thu, 23 Nov 2023 03:51:51 +0000 (04:51 +0100)]
luci-mod-network: Make MAC check functions generic.

Also remove a reassigned so.validate function (dead code).

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

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-banip: sync with banIP-0.9.3-1
Dirk Brenken [Thu, 28 Dec 2023 17:12:20 +0000 (18:12 +0100)]
luci-app-banip: sync with banIP-0.9.3-1

* expose the new remote logging/cgi options

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 6dff72b1cd20bd878e24f9b2fc05b4ecc858d607)
Signed-off-by: Dirk Brenken <dev@brenken.org>
11 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)

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

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

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

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

11 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 from master and sync translations
Hannu Nyman [Sat, 23 Dec 2023 07:06:20 +0000 (09:06 +0200)]
treewide: Backport from master and sync translations

Backport translations 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-olsr: fix null pointer exception (#6778)
Andi Bräu [Thu, 21 Dec 2023 21:48:59 +0000 (22:48 +0100)]
luci-app-olsr: fix null pointer exception (#6778)

for some 'virtual' interfaces, there don't seem to be network status information

Signed-off-by: Andreas Bräu <ab@andi95.de>
(cherry picked from commit 87da3275eaf7a388e77ad137e09b3bf6d3cf97f3)

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 agoluci-mod-network: reword some help-strings
Paul Donald [Tue, 19 Dec 2023 03:18:22 +0000 (04:18 +0100)]
luci-mod-network: reword some help-strings

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

11 months agoluci-mod-network: reword some help-strings
Paul Donald [Tue, 19 Dec 2023 02:13:52 +0000 (03:13 +0100)]
luci-mod-network: reword some help-strings

also unburden translators from some static strings.

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

11 months agoluci-mod-network: reword some help-strings
Paul Donald [Tue, 19 Dec 2023 03:02:50 +0000 (04:02 +0100)]
luci-mod-network: reword some help-strings

also unburden translators from some static strings.

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

11 months agoRevert "Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan"
Paul Donald [Mon, 18 Dec 2023 18:12:15 +0000 (19:12 +0100)]
Revert "Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan"

This reverts commit 6fb71d48a051467c5cc54453cd74df992e9c9e65.

(Not yet ready)

11 months agotreewide: Backport and sync i18n translations
Hannu Nyman [Mon, 18 Dec 2023 16:45:51 +0000 (18:45 +0200)]
treewide: Backport and sync i18n translations

Backport from master and sync i18n translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
11 months agoMerge pull request #6755 from EvanTheB/modemaster
Paul Donald [Sun, 17 Dec 2023 23:44:00 +0000 (00:44 +0100)]
Merge pull request #6755 from EvanTheB/modemaster

Signed-off-by: Evan Benn <evan.benn@morsemicro.com>
luci-base: Display 'Access Point' in the wireless page instead of 'Master'
(cherry picked from commit c3fc80c92a2ed30214ed039c6189e2c06023117a)

11 months agoMerge pull request #6723 from knarrff/channel_analysis__base-channel
Paul Donald [Sun, 17 Dec 2023 23:43:24 +0000 (00:43 +0100)]
Merge pull request #6723 from knarrff/channel_analysis__base-channel

Signed-off-by: Frank Löffler <frank.loeffler@uni-jena.de>
luci-mod-status: highlight primary 20 MHz channel
(cherry picked from commit 8b651996ff25cff94cf37608d775f0cbf7fd177a)

11 months agoMerge pull request #6724 from erikrk/channel-analysis-permissions
Paul Donald [Sun, 17 Dec 2023 23:42:51 +0000 (00:42 +0100)]
Merge pull request #6724 from erikrk/channel-analysis-permissions

Signed-off-by: Erik Karlsson <erik.karlsson@genexis.eu>
luci-mod-status: fix ACL for channel analysis
(cherry picked from commit 8be149c4adddc05354b009e1d0597b2ae6fd7532)

11 months agoMerge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan
Paul Donald [Sun, 17 Dec 2023 23:42:13 +0000 (00:42 +0100)]
Merge pull request #6700 from lvoegl/pr/20231021-luci-app-strongswan

Signed-off-by: Lukas Voegl <lvoegl@tdt.de>
luci-app-strongswan-swanctl: initial commit
(cherry picked from commit 828716ad73be81079ffdaa1592f637efa1747f31)

11 months agoMerge pull request #6770 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 15 Dec 2023 21:48:27 +0000 (14:48 -0700)]
Merge pull request #6770 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: remove instance selection

11 months agoluci-app-adblock-fast: bugfix: remove instance selection for some smartdns options 6770/head
Stan Grishin [Fri, 15 Dec 2023 13:35:35 +0000 (13:35 +0000)]
luci-app-adblock-fast: bugfix: remove instance selection for some smartdns options

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

11 months agoMerge pull request #6768 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Fri, 15 Dec 2023 06:04:19 +0000 (23:04 -0700)]
Merge pull request #6768 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.1-1

11 months agoluci-app-adblock-fast: update to 1.1.1-1 6768/head
Stan Grishin [Fri, 15 Dec 2023 02:47:28 +0000 (02:47 +0000)]
luci-app-adblock-fast: update to 1.1.1-1

* Final (hopefully) attempt to avoid errors if dhcp/smartdns configs are
  missing
* New user experience for picking dnsmasq/smartdns instances to enable the
  adblocking on
* use function from init script to set up output paths
* update paths to run-time files in ACL

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

11 months agoluci-app-ddns: rename retry_count -> retry_max_count
Paul Donald [Tue, 12 Dec 2023 14:32:56 +0000 (15:32 +0100)]
luci-app-ddns: rename retry_count -> retry_max_count

syncs with openwrt/packages@e3292e4

Also fixes some i18n strings

Closes issue #6752

(cherry picked from commit d349181aaef50e7a545d784176e55f5dc70fabff)

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

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

11 months agoluci-app-https-dns-proxy: update to 2023-10-25-5 6763/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 agoMerge pull request #6760 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Mon, 11 Dec 2023 10:40:59 +0000 (03:40 -0700)]
Merge pull request #6760 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

11 months agoluci-app-adblock-fast: improve dnsmasq/smartdns instances selection 6760/head
Stan Grishin [Mon, 11 Dec 2023 01:03:00 +0000 (01:03 +0000)]
luci-app-adblock-fast: improve dnsmasq/smartdns instances selection

* create UI elements with an option to pick multiple instances for
  dnsmasq and smartdns

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

11 months agoMerge pull request #6757 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Sat, 9 Dec 2023 21:50:44 +0000 (14:50 -0700)]
Merge pull request #6757 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: bugfix: L.uci.load

11 months agoluci-app-adblock-fast: bugfix: L.uci.load 6757/head
Stan Grishin [Sat, 9 Dec 2023 13:43:05 +0000 (13:43 +0000)]
luci-app-adblock-fast: bugfix: L.uci.load

* fix app not working on systems without smartdns
* fix smartdns instances selection dependencies

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

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-network: Rework the (multi) mac for static leases text
Paul Donald [Thu, 7 Dec 2023 00:06:16 +0000 (01:06 +0100)]
luci-mod-network: Rework the (multi) mac for static leases text

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

11 months agoluci-mod-network: Remove spurious linefeed
Paul Donald [Fri, 8 Dec 2023 01:50:35 +0000 (02:50 +0100)]
luci-mod-network: Remove spurious linefeed

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

11 months agoluci-mod-network: Rework address helptext for DHCP
Paul Donald [Thu, 7 Dec 2023 03:09:39 +0000 (04:09 +0100)]
luci-mod-network: Rework address helptext for DHCP

Ease translators lives.

This introduces the function customi18n for positional string variables.

Word and grammatical ordering of some languages breaks guarantees for
positional string arguments.

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

11 months agoluci-mod-network: Rework match_tag helptext for static leases
Paul Donald [Thu, 7 Dec 2023 00:29:17 +0000 (01:29 +0100)]
luci-mod-network: Rework match_tag helptext for static leases

Evidently, not all translators get it right.

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

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 agoMerge pull request #6749 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Wed, 6 Dec 2023 15:40:50 +0000 (08:40 -0700)]
Merge pull request #6749 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync with principal package

11 months agoluci-app-adblock-fast: sync with principal package 6749/head
Stan Grishin [Wed, 6 Dec 2023 10:27:01 +0000 (10:27 +0000)]
luci-app-adblock-fast: sync with principal package

* add support for smartdns ipset/nftset-based blocking

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

11 months agoMerge pull request #6743 from stangri/openwrt-23.05-luci-app-adblock-fast
Stan Grishin [Wed, 6 Dec 2023 10:08:13 +0000 (03:08 -0700)]
Merge pull request #6743 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: update to 1.1.0-1

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)

11 months ago[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" (#6623)
Mathew McBride [Tue, 5 Dec 2023 14:12:03 +0000 (01:12 +1100)]
[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" (#6623)

* luci-app-attendedsysupgrade: add x86 efi/bios case

x86 is the only target that allows you to install either EFI or BIOS
images, thereby add an extra check for that.

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

* luci-app-attendedsysupgrade: fix search for x86 target

The conditional is wrong. IndexOf returns a number and not true/false,
so it does not work.

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

---------

Co-authored-by: Paul Spooren <mail@aparcar.org>
Co-authored-by: Miguel Angel Mulero Martinez <migmul@gmail.com>
11 months agoluci-app-adblock-fast: update to 1.1.0-1 6743/head
Stan Grishin [Tue, 5 Dec 2023 08:26:34 +0000 (08:26 +0000)]
luci-app-adblock-fast: update to 1.1.0-1

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

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

11 months agoMerge pull request #6574 from innovara/patch-1
Paul Donald [Mon, 4 Dec 2023 15:16:04 +0000 (16:16 +0100)]
Merge pull request #6574 from innovara/patch-1

Fix ATM HEC label on stats.js

(cherry picked from commit 1e84a03932455e79880e10abc88b92343db8d811)

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

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

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

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

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

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

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

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

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

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

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

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

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

11 months agoMerge pull request #6711 from systemcrash/dns_nitpick
Paul Donald [Mon, 4 Dec 2023 04:16:40 +0000 (05:16 +0100)]
Merge pull request #6711 from systemcrash/dns_nitpick

luci-mod-network: nitpick of CNAME, MX, SRV syntax formatting
(cherry picked from commit d179d789e5f0542fd17eb2fd591909754c200d86)

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

11 months agoMerge pull request #6706 from vgaetera/fw-redirect-any
Paul Donald [Mon, 4 Dec 2023 04:13:33 +0000 (05:13 +0100)]
Merge pull request #6706 from vgaetera/fw-redirect-any

luci-app-firewall: allow redirects using ip family any
(cherry picked from commit 3633bea613d47a04053f0ed4d117629d8d7b7fbe)

11 months agoMerge pull request #6579 from systemcrash/fix_dnsmasq_instance_fields
Paul Donald [Mon, 4 Dec 2023 03:51:03 +0000 (04:51 +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)

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

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

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

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