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)
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)
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>
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)
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)
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
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)
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)
Jo-Philipp Wich [Thu, 19 Oct 2023 21:44:53 +0000 (23:44 +0200)]
luci-mod-status: persist sorting of DHCP lease status tables
Add an ID attribute to the dynamically generated lease status tables to
persist row ordering choice across reloads.
Fixes: #6640
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
603992560c5ca4b5929047e8e8c70f901f75d7f7)
Jo-Philipp Wich [Thu, 19 Oct 2023 21:42:13 +0000 (23:42 +0200)]
luci-base: ui.js: sorting fixes for tables initialized from markup
- Populate id option from table id attribute
- Update column head sort indicator in UITable.update()
- Don't store sort state for tables without id
Ref: https://github.com/openwrt/luci/issues/6640
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
ee6a4da00b70949eccb5a0a7b69d2c5b98ef1f89)
Hannu Nyman [Sun, 8 Oct 2023 15:07:50 +0000 (18:07 +0300)]
treewide: Backport translations from master
Backport from master and sync translations.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Sat, 9 Sep 2023 07:25:06 +0000 (10:25 +0300)]
treewide: Backport from master and sync translations
Backport, sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan Grishin [Mon, 4 Sep 2023 01:03:48 +0000 (18:03 -0700)]
Merge pull request #6559 from stangri/openwrt-22.03-luci-app-https-dns-proxy
[22.03] luci-app-https-dns-proxy: rewrite in javascript
Stan Grishin [Tue, 29 Aug 2023 18:42:10 +0000 (18:42 +0000)]
luci-app-https-dns-proxy: rewrite in javascript
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
6df7b92a50485d7a7c61c38c5abeaf96ad69a28c)
Hannu Nyman [Thu, 10 Aug 2023 17:16:13 +0000 (20:16 +0300)]
treewide: Backport translations from master
Backport translations from master, sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Stan Grishin [Sat, 29 Jul 2023 15:09:55 +0000 (08:09 -0700)]
Merge pull request #6488 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: bugfix: unsupported DNS options display
Stan Grishin [Fri, 28 Jul 2023 23:26:59 +0000 (23:26 +0000)]
luci-app-simple-adblock: bugfix: unsupported DNS options display
* bugfix: move the break tag in front of the unsupported DNS options to pretty up
the output
* use pkg.Name in RPCD calls
* slightly change the version display in WebUI to make it consistent with other
packages
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
8001cc5f2fce4b54fccca46157d42cbfca9f5894)
Dirk Brenken [Mon, 17 Jul 2023 14:09:45 +0000 (16:09 +0200)]
luci-app-banip: fix URL regex in custom feed editor
- accept special chars for BASIC AUTH in URL
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
ceb490df59d23664e409af991e578122e259a65d)
Dirk Brenken [Sun, 16 Jul 2023 14:42:22 +0000 (16:42 +0200)]
luci-app-banip: sync with banIP 0.9.0-1
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
56bbacbeca5dcd7e71d4e2bd22c15f338f878506)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Fri, 7 Jul 2023 06:44:07 +0000 (08:44 +0200)]
luci-app-travelmate: remove unneeded dependency
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
537a1e4f49d1e6bf167be76b606d8bdf2199e9ee)
Dirk Brenken [Fri, 7 Jul 2023 06:42:41 +0000 (08:42 +0200)]
luci-app-banip: remove unneeded dependency
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
3dac65643cf48067bb61bb131d7206937ae6c3ad)
Dirk Brenken [Fri, 7 Jul 2023 06:41:25 +0000 (08:41 +0200)]
luci-app-adblock: remove unneeded dependency
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
e6ff6826884ecd6912bb488c21eebd500030dd47)
Hannu Nyman [Sun, 2 Jul 2023 12:43:13 +0000 (15:43 +0300)]
treewide: Backport/sync translations
Backport translations from master.
Sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Dirk Brenken [Sat, 24 Jun 2023 20:34:57 +0000 (22:34 +0200)]
luci-app-banip: sync with banIP 0.8.8-1
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
6a4831f5844ef64ebc9ba66af5cfcc9787364599)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Sat, 24 Jun 2023 20:31:33 +0000 (22:31 +0200)]
luci-app-banip: sync with banIP 0.8.7-1
* make new option 'ban_autoblocksubnet' available
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
e245c9c280ad53f0b796614a0b259c9551a620b3)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Jo-Philipp Wich [Mon, 19 Jun 2023 22:31:21 +0000 (00:31 +0200)]
luci-mod-network: fix incorrectly reverting vlan device name
Fixes: #6435
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b2546c26b5b33bf3f740149dc1a52a7ad3d6ee30)
Christian Marangi [Fri, 23 Dec 2022 18:28:07 +0000 (19:28 +0100)]
luci-mod-status: handle HE channel width for channel_analysis
Handle HE channel width for channel analysis status page and correctly
draw local interface band width.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit
307e385ba19fff36e335d048c45fc8f667129bd8)
Hannu Nyman [Sat, 3 Jun 2023 11:24:23 +0000 (14:24 +0300)]
treewide: Backport translations from master
Backport from master, sync.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Tue, 30 May 2023 16:27:47 +0000 (19:27 +0300)]
luci-app-statistics: enhance tcpconns plugin
Modernize tcpconns plugin to match the features in collectd:
* Support summary of all ports
* 'All listening ports' can be concurrent to specified ports,
not just alternative
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
c9c395920e424cd188a663a6c3f4acfdf8d65012)
Jo-Philipp Wich [Tue, 30 May 2023 07:19:20 +0000 (09:19 +0200)]
luci-mod-network: fix dropdown clipping on diagnostics page
The default overflow hidden style for table cell elements breaks action
dropdowns on the diagnostics page.
Fixes: #6379
Fixes: 5f2d305476 ("luci-mod-network: convert diagnostic page to LuCI look and feel")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
9b12a48c3f14beafae09eca99cca5e323ae72893)
Stan Grishin [Sat, 20 May 2023 07:17:14 +0000 (01:17 -0600)]
Merge pull request #6394 from stangri/openwrt-22.03-luci-app-https-dns-proxy
[22.03] luci-app-https-dns-proxy: fix curl-related error in logs
Stan Grishin [Thu, 18 May 2023 23:29:51 +0000 (23:29 +0000)]
luci-app-https-dns-proxy: fix curl-related error in logs
* if curl is not installed, there used to be an error in logs from uhttpd that
curl is not found, this commit addresses it
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
5553a66903a1889b52aeb2d36e3d9de455e45c2e)
Dirk Brenken [Sat, 13 May 2023 04:28:42 +0000 (06:28 +0200)]
luci-app-banip: sync with banIP 0.8.6-1
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
e6c3364a73001a7fda42d5504aabeb20fca12dbc)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Stan Grishin [Thu, 11 May 2023 23:05:02 +0000 (17:05 -0600)]
Merge pull request #6384 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: opkg_get_version bugfix
Stan Grishin [Tue, 9 May 2023 01:42:55 +0000 (01:42 +0000)]
luci-app-pbr: opkg_get_version bugfix
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
f45a91013c85e8e0b21f9ba0f2f507b034152aab)
Stan Grishin [Tue, 9 May 2023 01:42:05 +0000 (19:42 -0600)]
Merge pull request #6375 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: update to 1.1.1-5
Dirk Brenken [Mon, 8 May 2023 07:41:45 +0000 (09:41 +0200)]
luci-app-banip: sync with banIP 0.8.5-1
* make new options available
* restructure some existing config options
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
7b75148fe5c786ff7b368c80f8808cb070712db5)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Stan Grishin [Fri, 5 May 2023 01:53:20 +0000 (01:53 +0000)]
luci-app-pbr: update to 1.1.1-5
* Artificial version bump as WebUI compares version number to the principal package
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
831d05163448a7dabb016caa4c07fa3c122ffe60)
Stan Grishin [Fri, 5 May 2023 01:41:09 +0000 (19:41 -0600)]
Merge pull request #6368 from stangri/openwrt-22.03-luci-app-pbr
[22.03] luci-app-pbr: update to 1.1.1-1
Dirk Brenken [Thu, 4 May 2023 10:28:50 +0000 (12:28 +0200)]
luci-app-banip: sync with banIP 0.8.4-4
* small changes
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
0632f167d8008e5d013418644596e79249826362)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Tue, 2 May 2023 19:46:33 +0000 (21:46 +0200)]
luci-app-banip: sync with banIP 0.8.4-3
* add new option 'ban_autoallowuplink'
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
483229c8cf090f66605ded9c87a41a90b993d452)
Stan Grishin [Tue, 2 May 2023 01:36:27 +0000 (19:36 -0600)]
Merge pull request #6328 from stangri/openwrt-22.03-luci-app-simple-adblock
[22.03] luci-app-simple-adblock: update to 1.9.5
Stan Grishin [Mon, 1 May 2023 01:17:59 +0000 (01:17 +0000)]
luci-app-pbr: update to 1.1.1-1
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
dfa792148a71f88f26ac66abd1a2d2d57c924b5e)
Jo-Philipp Wich [Sat, 29 Apr 2023 22:19:35 +0000 (00:19 +0200)]
luci-lua-runtime: fix legacy luci-mod-rpc authentication
The split of the former `sysauth` cookie into `sysauth_http` and
`sysauth_https` ones was also imposed upon the RPC module, without
leaving the option to use just `sysauth` in place, so allow this cookie
name again for the legacy RPC logins.
Fixes: #6333
Fixes: e1932592c3 ("luci-base: use different cookie names for HTTP and HTTPS")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
2a9c3a3173e0cec686fb8d9fafb8c063f80958e4)
Jo-Philipp Wich [Sat, 29 Apr 2023 21:47:27 +0000 (23:47 +0200)]
treewide: sync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Sat, 29 Apr 2023 21:42:55 +0000 (23:42 +0200)]
luci-app-nlbwmon: fix row sorting
Add raw cell values to support proper numerical row sorting.
Fixes: #6366
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
4f4ad9bff5482211695bf564543e4d34de4808d8)
Jo-Philipp Wich [Fri, 28 Apr 2023 22:23:56 +0000 (00:23 +0200)]
luci-app-babeld: use table markup for overview tables
Fixes: #6337
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
70fb460c00d6c641a39f0cf97eb7eb846bee51e2)
Jo-Philipp Wich [Fri, 28 Apr 2023 22:04:13 +0000 (00:04 +0200)]
luci-app-ddns: order list of DDNS service providers
Fixes: #6200
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
d9dcf98778f46f51d56d3df2a19a4245a0903b7c)
Jo-Philipp Wich [Fri, 28 Apr 2023 21:56:46 +0000 (23:56 +0200)]
luci-base: ui.js: make upload cancellation message translatable
Resync base translation templates as well.
Fixes: #6364
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
6fb185f956bdda0e6fa72b2beb77a9138279f9d0)
Jo-Philipp Wich [Fri, 28 Apr 2023 21:52:45 +0000 (23:52 +0200)]
luci-mod-system: uhttpd.js: remove flag option overrides
Use standard 0/1 values for the `redirect_https` option.
Supersedes: #6332
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
58f7b27adf0087721dcb509f16745203513e15e8)
Jo-Philipp Wich [Fri, 28 Apr 2023 21:43:31 +0000 (23:43 +0200)]
luci-app-dockerman: gracefully handle empty registry mirror setting
Fixes: #6300
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
39d387f34c083afab9589952c6bcc9a0028cc9da)
Jo-Philipp Wich [Fri, 28 Apr 2023 20:42:24 +0000 (22:42 +0200)]
luci-mod-network: expose peerdns option for dhcpv6
Ref: https://github.com/openwrt/luci/commit/
2be01cbfcb34746d9713173a60c3f8a69c554a68#commitcomment-
111035308
Fixes: 2be01cbfcb ("luci-mod-network: restrict peerdns option to protocols that implemenent it")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b2476ba71de964828def0967793556bdb141d7e2)
Jo-Philipp Wich [Fri, 28 Apr 2023 13:04:43 +0000 (15:04 +0200)]
luci-base: rpcd: handle swap entries in getBlockDevices
Add entries from `/proc/swaps` to the result array as well in order to
let the ui properly deal with swap files.
Fixes: #6350
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit
ad3509bf3bb5dfa79af634c841d584408068fb0a)
Dirk Brenken [Fri, 28 Apr 2023 10:46:23 +0000 (12:46 +0200)]
luci-app-banip: more feed editor improvements
* add more 'upload' and 'save' safeguards
* save only keys with values in exported JSON structure/file
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
d25d5c28b7daddd9cfdf650b15642f1e89b2c2e5)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Fri, 28 Apr 2023 10:43:05 +0000 (12:43 +0200)]
luci-app-banip: more feed editor improvements
* add upload safeguards
* beautify JSON output
* small translation fix
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
7ce43d20cb51ff0e002e5fda4267c876bd4a44ce)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Fri, 28 Apr 2023 10:41:36 +0000 (12:41 +0200)]
luci-app-banip: feed editor improvements
* add the ability to up-/download a local/remote JSON feed file
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
ee3f56bd02aec46fd73f81e7470f213579534a9c)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Fri, 28 Apr 2023 10:39:50 +0000 (12:39 +0200)]
luci-app-banip: sync with banIP-0.8.4-1
* add a custom feed editor (req. >= banIP-0.8.4-1)
* various small fixes and enhancements
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
876c9b292d0a5d3915dd6e085a0a3c0dbe3f16ac)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Dirk Brenken [Wed, 12 Apr 2023 17:37:37 +0000 (19:37 +0200)]
luci-app-banip: sync with banIP 0.8.3-1
* requires the latest banIP backend (>= 0.8.3-1)
* sync translations
Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit
31def1846db019f66c432b043ca9cac5111bf578)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Stan Grishin [Mon, 3 Apr 2023 21:27:48 +0000 (21:27 +0000)]
luci-app-simple-adblock: update to 1.9.5
* update to support corresponding principal package
Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit
b7be432ba79e1320661a7a92d2203358bcbde88c)
Hannu Nyman [Mon, 3 Apr 2023 15:51:44 +0000 (18:51 +0300)]
timezone data: update to 2023c
Update timezone data to 2023a, 2023b, 2023c.
(2023c reverts 2023b.)
https://mm.icann.org/pipermail/tz-announce/2023-March/000077.html
https://mm.icann.org/pipermail/tz-announce/2023-March/000078.html
https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html
Summary:
* Egypt now uses DST again, from April through October.
* Much of Greenland still uses DST from 2024 on.
* America/Yellowknife now links to America/Edmonton. (removed here)
* Europe/Kirov and Europe/Volgograd now use the abbreviations MSK/MSD
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Jo-Philipp Wich [Mon, 3 Apr 2023 12:08:51 +0000 (14:08 +0200)]
treewide: sync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Thu, 30 Mar 2023 18:12:49 +0000 (20:12 +0200)]
luci-app-omcproxy: relax menu dependencies
The uci configuration may be completely empty, so adjust the menu dependency
to check the existence of the configuration file itself instead.
Fixes: #6301
Supersedes: #6304
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
e1fa41ec15c66d1d26913b4394af48f5809d6d86)
Jo-Philipp Wich [Wed, 29 Mar 2023 13:32:44 +0000 (15:32 +0200)]
luci-proto-openconnect: relax key checking
Valid keys may begin/end with `-----BEGIN PRIVATE KEY-----` and
`-----END PRIVATE KEY-----` so make the `RSA` keyword optional.
Fixes: #6319
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b8ee30589bd3e9037e7c7a8a5a1e8c1048afaf2f)
Santiago Kozak [Sun, 26 Mar 2023 09:31:10 +0000 (06:31 -0300)]
luci-theme-bootstrap: File input background color
Remove the white background color for the file input elements, this way it'll use the default color defined for input elements, matching the light/dark theme.
Signed-off-by: Santiago Kozak <santikzk1406@gmail.com>
(cherry picked from commit
d94a7285e57eba268764490ab8317d12e24ecd5f)
Florian Eckert [Fri, 3 Feb 2023 08:56:00 +0000 (09:56 +0100)]
luci-proto-modemmanager: fix acl regex to support more then 9 modem objects
If a modem is restarted often, the modem manager object number is
increased by one. Currently, the regex is set so that the modem can no
longer be selected if the object number is greater than 9. This change
fixes that.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
[replace wildcard with rule duplication to disallow option injection]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
71b7ecb7770e11168f02e53b00195c94cee9b28e)
Glenn Washburn [Thu, 2 Mar 2023 05:39:48 +0000 (23:39 -0600)]
luci-mod-network: add stricter wireless interface name validation
Linux wireless interface names have the following restrictions:
* It must not be an empty string
* It must not be '.' or '..'
* It must not contain any /, : or space character ( , \t, \n, ...)
* It must be less than 16 chars
* It likely must not contain any % either
Fixes: 8673aef8db ("luci-mod-network: remove uciname validation from wireless interface")
Signed-off-by: Glenn Washburn <development@efficientek.com>
[reword validation error messages, remove extended description text as it would be
shown as part of the validation errors]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
6ad6a241c32ebd4d62f6021a2e3cbe4e1bc192c2)
Jo-Philipp Wich [Thu, 30 Mar 2023 18:05:44 +0000 (20:05 +0200)]
application/luci-app-firewall: fix null access
Fixes: 48086e1c7b ("luci-app-firewall: Add ipset field to snats")
Fixes: d0d891c23e ("luci-app-firewall: Add ipset field to forwards (redirects)")
Fixes: f407a013ba ("luci-app-firewall: Add ipset field to rules")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
7a4afdcb05ad69fd9c0e39de9b44a59ad31130a7)
Tianling Shen [Tue, 28 Mar 2023 16:56:55 +0000 (00:56 +0800)]
luci-app-firewall: add masq6 option for zones
Allow configure Masquerading6 via LuCI interface.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit
ef288b791d4455478f6244f2d41c3aac55271226)
Paul Dee [Fri, 17 Feb 2023 11:50:00 +0000 (12:50 +0100)]
luci-app-firewall: Add ipset field to snats
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
48086e1c7b3e7094b6fbe61335209189b1006bfb)
Paul Dee [Fri, 17 Feb 2023 12:56:40 +0000 (13:56 +0100)]
luci-app-firewall: Add ipset field to forwards (redirects)
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
d0d891c23eb65da42ae6c1b8f0156e971abea5b3)
Paul Dee [Fri, 17 Feb 2023 13:07:44 +0000 (14:07 +0100)]
luci-app-firewall: Add ipset field to rules
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
f407a013ba1e889ba4cd09eaf456724cb41e1537)
Paul Dee [Fri, 17 Feb 2023 13:44:00 +0000 (14:44 +0100)]
luci-app-firewall: implement IPsets GUI
Enable it and place it between snats and custom tabs
Tested on 22.03.2, 22.03.3
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
0484343903e9c284766044c2542fed1bc89b34e3)
Chen Minqiang [Wed, 19 Oct 2022 10:01:15 +0000 (18:01 +0800)]
luci-app-firewall: allow ipv6 setup
Allow setup ipv6 for Port Forwards and NAT Rules if firewall4 is
used.
Add 'Restrict to address family' option for NAT Rules, if family is
any/empty , assume it is ipv4. this allow setup NAT6 rules in web ui
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit
9c55500fe8efa309d55f34c21d5ae2bf69fabf06)
Jo-Philipp Wich [Wed, 15 Mar 2023 22:33:56 +0000 (23:33 +0100)]
luci-app-firewall: suppress lengthy masq description in zone table
Ensure that the description of the masquerade option does not end up in
the grid section overview as it messes up the table layout.
Fixes: c54efde717 ("luci-app-firewall: Add clarification to masquerading option")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c0d4c0172529e060926e8fa00714bd9e8b567cb4)
Paul Dee [Thu, 9 Feb 2023 22:47:15 +0000 (23:47 +0100)]
luci-app-firewall: extend icmpv6 types available
luci complement to https://github.com/openwrt/firewall4/commit/
e6e82a55206cf7017f26b92f7097f779161b5cac
Tested on 22.03.3
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
88a016cbff7eacf3a8248bc4949904abacef6685)
Paul Dee [Fri, 10 Feb 2023 20:15:00 +0000 (21:15 +0100)]
luci-app-firewall: remove the '', 'any' mapping in icmpv6 entries
This prevents its inconsistent checked/unchecked behaviour when exiting
and re-entering the dialogue.
Tested on 22.03.3
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
7bf1c2daa02c070e6c8b76eadadd1648ed592851)
BCoverstone [Tue, 10 Jan 2023 03:28:28 +0000 (22:28 -0500)]
luci-app-dawn: fix crash issue when viewing hearing map
When viewing the hearing map, sometimes a crash will happen when one of the
routers suddenly cannot view a client. This PR simply checks that the radio
frequency in data2 is not 0, and skips the entry if it is a 0.
Submitted-by: Brian Coverstone <brian@mainsequence.net>
[fix commit subject, add commit description]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
2221110c17c2799948209463590618190cce8808)
S. Brusch [Thu, 9 Feb 2023 12:40:45 +0000 (13:40 +0100)]
luci-app-bcp38: migration to JavaScript
- One to one migration of lua based package to JavaSript.
Signed-off-by: S. Brusch <ne20002@gmx.ch>
(cherry picked from commit
a159d98f97b56f80d3211c56f19d8b3db0adaec4)
Jo-Philipp Wich [Tue, 7 Feb 2023 09:01:25 +0000 (10:01 +0100)]
luci-mod-network: handle dynamic device configuration defaults
Most uci network device configuration settings have no specific default
value which means that netifd will only alter the related sysfs parameters
if an explicit value is specified in uci. When omitted from the
configuration, the related sysfs setting is left untouched.
This behaviour collides with LuCI's approach of purging boolean options
from the configuration if they match their default value, leading to the
inability to disable or enable certain settings as described in #6219.
Solve this issue by replacing flag widgets with tri-state selects offering
an "automatic" (default) as well as an explicit "enabled" and "disabled"
choice. Also query sysfs on load and preset the automatic choice with an
indication whether the underlying sysfs settings is currently active or not.
Fixes: #6219
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
276046c8e973ab0a02a4a17fdc5aea65786a0058)
Jo-Philipp Wich [Tue, 7 Feb 2023 08:57:51 +0000 (09:57 +0100)]
luci-theme-bootstrap: minor style fixes
- Apply CSS reset to before/after pseudo elements as well and fix
resulting shifted offsets
- Apply focus highlight to select elements too
- Improve radio button styling
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
f416c27b90a88000c0d0786decc514c044d2e3d1)
Jo-Philipp Wich [Sun, 5 Feb 2023 19:00:26 +0000 (20:00 +0100)]
luci-theme-bootstrap: add focus indication for tabs
Underline the link text if a tab has keyboard focus in order to give a
visual indication of the focus state.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
56a737ec53323052be9d2178fc655b2c1442601d)
Jo-Philipp Wich [Sun, 5 Feb 2023 18:41:20 +0000 (19:41 +0100)]
luci-base: ui.js: modal dialog tweaks
- Automatically focus modal dialog frame
- Close modal dialog on pressing escape key
Fixes: #4609, #6205
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c9939a83e72beb32dd1e11b07139714e2ae91623)
Jo-Philipp Wich [Sun, 5 Feb 2023 18:39:13 +0000 (19:39 +0100)]
luci-base: ui.js: improve ui.Dropdown event handling
Improve overall event and focus handling, avoid registering a global
mouseover event listener, stop propagating escape keypress on closing
dropdown and avoid `Element.blur()` to prevent de-focusing open modals.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
8db3e0e70fe0986a7c4c60f998c583e28bd0e2f0)
Jo-Philipp Wich [Sun, 5 Feb 2023 18:35:00 +0000 (19:35 +0100)]
luci-mod-network: interfaces.js: avoid stray empty device uci sections
Ensure that just created uci device sections are removed if the edit
option modal is cancelled without saving. This prevents empty, but
harmless `config device` sections from being created on a subsequent
Save & Apply operation.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
c13ef9406c9c2e12c28d2065b342444af5e27c0b)
Martijn Staal [Fri, 20 Jan 2023 10:41:53 +0000 (11:41 +0100)]
luci-app-firewall: Add clarification to masquerading option
Signed-off-by: Martijn Staal <27222398+mastaal@users.noreply.github.com>
(cherry picked from commit
c54efde71718f6a05b7832f5092e7a7da83d22eb)
Florian Eckert [Thu, 26 Jan 2023 09:24:38 +0000 (10:24 +0100)]
luci-mod-status: add missing cbi-section class to routing view
With the material theme, there is a gap between the tab view and the
content. The css class 'cbi-section' is missing here in the data-tab div.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
025d8e79ba4cd1ad6807c763caf9e3e68f7c4770)
Vincent Tremblay [Tue, 17 Jan 2023 22:02:08 +0000 (17:02 -0500)]
luci-app-advanced-reboot: add support for Linksys WHW03 v2
Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
(cherry picked from commit
10e438fabf755d24a0ed6eade897da52eef8c568)
Paul Dee [Tue, 17 Jan 2023 20:24:44 +0000 (21:24 +0100)]
luci-base: help-text spell fix
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
3c2b35cf903378fc7dfa54fa4bc6c7a64b3bb471)
Hannu Nyman [Sun, 15 Jan 2023 08:09:30 +0000 (10:09 +0200)]
luci-mod-network: remove uciname validation from wireless interface
Remove the 'uciname' validation rule, as it prevents using '-' that
is a valid character.
Fixes: 0c1be9ae5 luci-mod-network: Add length restriction to wireless
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
8673aef8db90b2ae276b9323f23d078cc68f4189)
Hannu Nyman [Sat, 14 Jan 2023 08:40:43 +0000 (10:40 +0200)]
luci-mod-network: Add length restriction to wireless interface name
Based on issue #6101, add a maxlength of 15 chars to the wireless
interface's optional name field. Also validate it as uciname.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
0c1be9ae5380d0ac11cccfe152a158eee5bd7125)
Florian Eckert [Mon, 23 Jan 2023 07:37:28 +0000 (08:37 +0100)]
luci-app-xinetd: update redirect help
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
2925a8bfbe0d8647af6ca1f75654c8758ec07441)
Helge Mader [Wed, 11 Jan 2023 12:06:58 +0000 (13:06 +0100)]
luci-app-xinetd: add processing of redirect option
Signed-off-by: Helge Mader <ma@dev.tdt.de>
(cherry picked from commit
2947b4507302524128569df604e08c03c81c8749)
Uwe Kleine-König [Fri, 16 Dec 2022 22:22:04 +0000 (23:22 +0100)]
luci-app-statistics: Generate graphs for humidity sensors
This fixes graph generation for sensors that provide humidity data.
Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
(cherry picked from commit
9f321b831f41b73554819ac54e308dfa3677ab45)
Florian Eckert [Tue, 12 Apr 2022 11:38:15 +0000 (13:38 +0200)]
luci-theme-: add postrm script
Remove uci theme config section on uninstall.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit
21b40652d9b40210075ae1b00a548520a211c862)
Zuev Aleksandr [Thu, 5 Jan 2023 21:14:21 +0000 (01:14 +0400)]
luci-app-https-dns-proxy: Change files names and replace bootstrap_dns
Signed-off-by: Zuev Aleksandr <A.Zuev@stdev.su>
(cherry picked from commit
1bf53a1b9a0e5178db2be7fc86877b0713f35577)
Zuev Aleksandr [Sun, 31 Jul 2022 14:58:01 +0000 (18:58 +0400)]
luci-app-https-dns-proxy: Add new and update adguard dns server
Add adguard unsecured dns provider and update ips on existents based on https://adguard-dns.io/en/public-dns.html info. Also added ipv6 bootstrap_dns ips.
Signed-off-by: Zuev Aleksandr <A.Zuev@stdev.su>
(cherry picked from commit
a2fef4a3269e27c695b5e99c3fea776e05fe2da3)
Paul Dee [Wed, 4 Jan 2023 16:36:27 +0000 (16:36 +0000)]
luci-mod-network: disambiguate DHCP IP set help text
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(backported from commit
8414f916bab61b661062bf20c5e1a789893100b4)
Hannu Nyman [Wed, 21 Dec 2022 18:44:52 +0000 (20:44 +0200)]
luci-mod-network: place wlan roaming related options to a tab
Collectd all WLAN roaming related options to a new dedicated tab.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
45a91156d55a1514870bb84aafc07d0852c4fe6a)
Jo-Philipp Wich [Tue, 13 Dec 2022 22:49:11 +0000 (23:49 +0100)]
luci-mid-status: nftables.js: minor cleanups and enhancements
- Recognize `log` expression as action
- Recognize `meta time` expression
- Remove debug tooltip from `reject` targets
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
bad783a6d2484489ea07ac786a03e729f089c244)
Paul Dee [Thu, 2 Dec 2021 19:37:39 +0000 (20:37 +0100)]
luci-mod-network: (wireless) Expose WPA Enterprise RADIUS VLAN settings.
Tested on: 21.02.1
Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit
107791e9d8f31cf0297900cfe48d621041fedf9d)