When a menu JSON describes an endpoint like
"admin/app/edit/*" : { ...
and the user navigates to
admin/app/edit/
instead of the URI which supplies an ID to edit, like
admin/app/edit/myfoobarthing
we now can use 'alias' and 'rewrite' to redirect
transparently for more generic endpoints.
Without this, it's possible to navigate to
admin/app/edit/
and the corresponding view does not receive a suitable
path/ID to derive data from, when views use anything
derived via L.env.requestpath.
This menu JSON
"admin/app/entry/*": {
"action": {
"type": "view",
"path": "app/entry"
}
},
"admin/app/entries": {
"title": "entries",
"order": 5,
"action": {
"type": "view",
"path": "app/entries"
}
},
"admin/app/entry": {
"action": {
"type": "alias",
"path": "admin/app/entries"
}
},
Produces JSON with a wildcardaction element
"entry":
{
"satisfied": true,
"wildcard": true,
"action":
{
"type": "alias",
"path": "admin/app/entries"
},
"wildcardaction":
{
"type": "view",
"path": "app/entry"
}
},
"entries":
{
"satisfied": true,
"action":
{
"type": "view",
"path": "app/entries"
},
"order": 5,
"title": "entries"
},
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Update sys.uc so that ubus luci->getConntrackList method is optionally
populated by /usr/sbin/conntrack application if /proc/net/nf_conntrack
is not available.
Signed-off-by: James <jpfox156@yahoo.com.au>
Previously we might see:
... daemon.err uhttpd[5153]: [info] luci: accepted login on / for root from x.x.x.x
Now:
... authpriv.info dispatcher.uc: luci: accepted login on / for root from x.x.x.x
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Clear, crisp, resolution independent vector graphics replace the trusty
microscopic PNG. Some minor CSS changes were needed to constrain images
in some locations to make sure they don't consume too much space.
Iconography taken from Mate desktop theme with minor adjustments:
https://github.com/mate-desktop/mate-icon-theme/
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Problem:
After updating the JS-part of any package, the user is forced to clear
the browser cache.
Fix:
Each time a package is removed or installed, the contents of the
"/lib/apk/db/installed" file are changed.
This fix add the modification time of the "/lib/apk/db/installed" file
to the version of the main LuCI package (for each js-file).
Signed-off-by: Oleg S <remittor@gmail.com>
Subsequent commits will modernize LuCI JavaScript code to use ES6 features,
so drop the Promise polyfill as we're dropping support for non-ES6 browsers.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
When resolving eligible child nodes during evaluation of the "firstchild"
dispatch action, do not consider nodes allowing a login as allowed when
there already is an established session.
This fixes cases where restricted sessions are redirected to nodes they
have insufficent ACLs for, just because those nodes allow logins.
Fixes: #7218
Ref: https://forum.openwrt.org/t/x/174687
Suggested-by: @mikma
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This reverts commit 97ebdcbddb.
The commit seems to cause errors already before the login screen.
Discussion in https://github.com/openwrt/luci/commit/97ebdcbddb9cad76dc551086fcb887e55886a069#commitcomment-139871175
Errors like:
In error(), file [C]
called from function [anonymous function] (/usr/lib/lua/luci/ucodebridge.lua:23)
called from function ((tail call))
In [anonymous function](), file /usr/share/ucode/luci/runtime.uc, line 148, byte 45:
called from function build_pagetree (/usr/share/ucode/luci/dispatcher.uc:382:73)
called from function menu_json (/usr/share/ucode/luci/dispatcher.uc:439:26)
called from function [anonymous function] (/usr/share/ucode/luci/dispatcher.uc:898:24)
called from anonymous function (/www/cgi-bin/luci:39:13)
` return lcall.call(modname, method, ...args);`
Near here ----------------------------------------^
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Because the menu JSON can have 'depends' in them, uci changes
should force the menu to regenerate.
Closes#6423
Signed-off-by: James Haggerty <james.haggerty@morsemicro.com>
Signed-off-by: Paul Donald <newtwen@gmail.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Paul Donald
Stan Grishin
Oleg S
Hannu Nyman
Mustafa Can Elmacı
Jo-Philipp Wich
James Haggerty
Paul Dee
Tianling Shen