Commit graph

37 commits

Author SHA1 Message Date
Hannu Nyman
23ebdb3bf9 luci-base: update timezone data to 2024a
Update timezone data to 2024a.

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

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

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2024-02-09 21:34:37 +02:00
Hannu Nyman
8debeeb438 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>
2024-01-06 21:02:56 +02:00
Jo-Philipp Wich
b4594b3d11 luci-base: http.uc: fix eof detection in temporary upload files
Binary string comparisons in ucode are currently unsafe, so use the
`length()` function to determine the just read data chunk size in
order to test for end of file.

Fixes: #6530
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-08-21 16:37:11 +02:00
Jo-Philipp Wich
86f04d85fc luci-base: dispatcher.uc: improve error reporting for actionless nodes
In case a - potentially auto-created, intermediate - node is requested, reply
with a clean HTTP 404 error instead of an internal assertion about an unknown
action type.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-08-21 09:48:29 +02:00
Jo-Philipp Wich
ec8cf9e83c luci-base: dispatcher.uc: satisfy auto-created intermediate nodes
When we auto-create intermediate parent nodes, make sure that those nodes
are marked as satisfied, so that it is possible to dispatch their actual
child nodes.

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

Fixes: #6529
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-08-21 09:48:29 +02:00
Paul Dee
2c3018d426 luci-base: grammar fixes
Login (n) -> Log (v) in

Logout (n) -> Log (v) out

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
2023-08-11 13:17:04 +02:00
Jo-Philipp Wich
9763e3e9d3 luci-base: runtime.uc: fix error500() invocation on theme failure
In case no single theme could be loaded successfully, the runtime class
failed to properly invoke the `error500()` method, which is only available
through the passed environment at this point.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-08-07 23:36:36 +02:00
Jo-Philipp Wich
107ed061a8 luci-base: dispatcher.uc: fix N_() fallback implementation
The fallback implementation of `N_()` accessed the wrong variable, a
global `n` instead of the local `args`. Adjust the expression to reference
the correct variable.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-08-07 23:33:56 +02:00
Jo-Philipp Wich
a435d4e11a luci-base: dispatcher.uc: fix error500() reporting in fallback case
Fix the `error500()` fallback code path to properly output the given error
message in case rendering the error template failed.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-08-07 23:29:50 +02:00
Tianling Shen
588c6a1e4b luci-base: http.uc: fix reference error of undeclared variable err
The variable `err` was used without initialized.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2023-04-14 10:50:02 +03:00
Hannu Nyman
2145121d4c 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>
2023-04-03 18:49:17 +03:00
Jo-Philipp Wich
24d7da2416 luci-base: dispatcher.uc: prevent XSS through 404 error template
Make sure to escape the user controlled URL passed as part of the error
message into the error404 template in order to avoid XSS.

Reported-by: 40826d <40826d@posteo.de>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-03-10 15:36:09 +01:00
Jo-Philipp Wich
9634086efc luci-base: dispatcher.uc: urldecode URL components
In order to maintain compatibility with the old Lua runtime, ensure to URL
decode the request path segments since they might end up as arguments to
invoked action functions.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-01-13 21:18:09 +01:00
Hannu Nyman
5f14c47d0d timezone data: update to 2022g
Update timezone data to 2022g.

* https://mm.icann.org/pipermail/tz-announce/2022-November/000076.html

- In the Mexican state of Chihuahua, the border strip near the US
  will change to agree with nearby US locations on 2022-11-30.
  The strip's western part, represented by Ciudad Juárez, switches
  from -06 all year to -07/-06 with US DST rules, like El Paso, TX.
  The eastern part, represented by Ojinaga, will observe US DST next
  year, like Presidio, TX.
- A new Zone America/Ciudad_Juarez splits from America/Ojinaga.

- Much of Greenland, represented by America/Nuuk, stops observing
  winter time after March 2023, so its daylight saving time becomes
  standard time.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2022-12-01 21:50:43 +02:00
Jo-Philipp Wich
bed67dc000 luci-base: only render theme specific sysauth template when it exists
Avoid displaying non-fatal "File not found" exceptions when a theme is not
shipping an own sysauth template.

Fixes: #6118
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-25 15:30:20 +01:00
Jo-Philipp Wich
d8e3b35c88 luci-base: fix passing dispatched node details to templates
Fixes: #6111
Fixes: 08ae8d40a9 ("luci-base, luci-lua-runtime: fix "dispatched" and "requested" properties")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-22 17:31:37 +01:00
Jo-Philipp Wich
9d10c2e671 luci-base: fix (again) rendering ucode templates in template target
Fixes: #6111
Fixes: a5d21dadbd ("luci-base: fix rendering ucode templates from `template` target")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-22 15:01:32 +01:00
Jo-Philipp Wich
a5d21dadbd luci-base: fix rendering ucode templates from template target
A previous commit inadvertently broke support for rendering ucode templates
from the `template` dispatcher target.

Fixes: #6111
Fixes: fa17c1573f ("luci-base, luci-lua-runtime: adjust Lua template environment")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-22 09:41:31 +01:00
Jo-Philipp Wich
fa17c1573f luci-base, luci-lua-runtime: adjust Lua template environment
To maintain full compatibility with the old Lua runtime, templates
rendered from a menu `template()` action must implicitly inherit the
`luci.dispatcher` namespace as scope while other indirectly included
templates must not.

Fixes: #6105
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-21 12:27:28 +01:00
Jo-Philipp Wich
08ae8d40a9 luci-base, luci-lua-runtime: fix "dispatched" and "requested" properties
Ensure to properly emulate the "dispatched" and "requested" properties
which refer to the executed and initially resolved menu node respectivey.

Also stop exposing a `node` property in Lua context to maintain full
compatibility with the old Lua runtime.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-21 12:24:31 +01:00
Jo-Philipp Wich
c4d86c9f67 luci-base: expose sysauth rendering errors
In case a theme shipped sysauth.htm failed to render/execute, expose the
exception error details in the ui theme fallback indicator.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-21 12:20:58 +01:00
Jo-Philipp Wich
0dd0114a9d luci-base: fix empty reply format in ubus gateway fallback code
The ubus gateway fallback code incorrectly formatted ubus replies
containing no payload data when forwarding them via HTTP, leading
to `TypeError: Unexpected reply data format` errors in at least
the `luci.fs` class when receiving replies without payload.

Fix this issue by ensuring that the result array never contains
a `null` value for the payload, send an one-element array containing
just the status code in this case instead.

Fixes: #6074
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-03 11:27:52 +01:00
Jo-Philipp Wich
4b1a074c95 luci-base: dispatcher.uc: only flush HTTP headers after rendering output
Ensure to first completely render the action function before flushing HTTP
headers since the invoked action logic might modify the HTTP headers itself.

Fixes: e7afd0d327 ("luci-base: fix luci.http.close()")
Ref: e7afd0d327 (commitcomment-88736854)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-03 11:17:55 +01:00
Jo-Philipp Wich
e7afd0d327 luci-base: fix luci.http.close()
Ensure that `http.write()` or template rendering operations after a call
to `http.close()` do not produce additional output. This is required for
certain legacy Lua apps which invoke write and close operations in the
middle of a server side cbi rendering process.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-03 00:38:00 +01:00
Jo-Philipp Wich
815028ef93 luci-base: runtime.uc: avoid Lua not installed exeption from trycompile()
Make sure to request loading the Lua bridge as optional when initializing
the Lua VM context from trycompile() in order to not raise a fatal exception
in case the Lua runtime support is not present.

Ref: https://forum.openwrt.org/t/x/141426
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-02 10:21:05 +01:00
Jo-Philipp Wich
c99602e4ac luci-base: dispatcher.uc: apply ACLs to menu tree JSON
Add menu tree annotations for node readonly and dependency satisfied state
in order to ensure that unreachable menu nodes are hidden from view.

Fixes: ded8ccf93e ("luci-base-ucode: add initial ucode based LuCI runtime")
Ref: https://forum.openwrt.org/t/x/141426/10
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-02 10:13:41 +01:00
Jo-Philipp Wich
d967bbaa92 luci-base: http.uc: fix invoking Lua file upload callbacks
In case a callback is installed from Lua code, the received callback
argument is not a callable function but a resource object with a call
method. Attempts to call it will leading to a `Type error: left-hand
side is not a function` error.

To solve this issue, invoke the internally set filehandler instead
which wraps the resource if needed.

Fixes: #6067
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-11-02 09:08:16 +01:00
Hannu Nyman
da41c11971 timezone data: update to 2022f
Update timezone data to 2022f.
* http://mm.icann.org/pipermail/tz-announce/2022-October/000075.html

 -   Mexico will no longer observe DST after 2022, except for areas
     near the US border that continue to observe US DST rules.
     On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves
     from -07 (-06 with DST) to year-round -06.
 -   Fiji will not observe DST in 2022/3.
     For now, assume DST is suspended indefinitely.
 -   Simplify four Ontario zones.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2022-10-31 20:04:10 +02:00
Jo-Philipp Wich
1eea6c0ce8 luci-base: add ui indicator when fallback theme is used
Add a ui indicator displaying error details when the configured theme
failed to load and the next available one is being used instead.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-27 11:14:52 +02:00
Jo-Philipp Wich
767acf32d4 luci-base: dispatcher.uc: update uci session ID in Lua context
Make sure that the uci session ID of the `luci.model.uci` module within
the Lua context is updated once we acquire the login session information.

In case legacy themes are used, the probing of the theme header template
might indirectly load the Lua runtime and the Lua side `luci.dispatcher`
module which in turn will load the `luci.model.uci` and set the session
ID there which is not yet initialized at this point in time.

This results in broken uci change handling within legacy Lua applications
when a legacy theme is loaded.

Fixes: #6060
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-27 11:14:52 +02:00
Jo-Philipp Wich
70e32f0cb1 luci-base: dispatcher.uc: ensure usage of dashes in language tags
The LuCI uci configuration requires language tags with underscores due
limitations of uci option names but the language catalogs themselves
are designated with dash separated language tags.

Make sure to substitute underscores with dashes when determining the
desired request language in order to fix loading of languages such as
`pt-br` or `zh-cn`.

Ref: https://github.com/openwrt/luci/pull/5976#issuecomment-1290352951
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 13:01:31 +02:00
Jo-Philipp Wich
adc4ca65bc luci-base: dispatcher.uc: reintroduce support for 'absent' fs depends
The ability to require certain paths to be absent for a menu entry to show
up was lost during the ucode conversion.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 12:50:37 +02:00
Jo-Philipp Wich
21dacf2db7 luci-base: sys.uc: reliably skip TIME_WAIT connections in conntrack list
The TIME_WAIT indicator might not appear at the beginning of the tuple
string in some cases, so match it anywhere.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
[add commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 01:03:37 +02:00
Jo-Philipp Wich
791a71d225 luci-base: sys.uc: fix parsing conntrack list
Ensure that the extracted tuple string starts with a space to fully match
all contained key-value pairs.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 01:03:37 +02:00
Jo-Philipp Wich
60a9f01978 luci-base: sys.uc: increase init script START/STOP search space
Some init scripts, such as the sysfsutils one, declare their START or
STOP variables very late in the file. Duplicate the search buffer to
2048 byte in order to catch these cases.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 01:03:37 +02:00
Jo-Philipp Wich
d9dcefd2aa luci-base: dispatcher.uc: support cbi and form action types
Some existing LuCI apps ship menu.d JSON files with `cbi` and `form` typed
dispatch targets, support those as well.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 01:03:37 +02:00
Jo-Philipp Wich
673f38246a treewide: separate Lua runtime resources
Move classes required for Lua runtime support into a new `luci-lua-runtime`
package. Also replace the `luci.http` and `luci.util` classes in
`luci-lib-base` with stubbed versions interacting with the ucode based
runtime environment.

Finally merge `luci-base-ucode` into the remainders of `luci-base`.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2022-10-25 01:03:37 +02:00