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>
This commit is contained in:
parent
6f470e0d76
commit
767acf32d4
1 changed files with 8 additions and 0 deletions
|
@ -925,6 +925,14 @@ dispatch = function(_http, path) {
|
||||||
resolved.ctx.authtoken ??= session.data?.token;
|
resolved.ctx.authtoken ??= session.data?.token;
|
||||||
resolved.ctx.authuser ??= session.data?.username;
|
resolved.ctx.authuser ??= session.data?.username;
|
||||||
resolved.ctx.authacl ??= session.acls;
|
resolved.ctx.authacl ??= session.acls;
|
||||||
|
|
||||||
|
/* In case the Lua runtime was already initialized, e.g. by probing legacy
|
||||||
|
* theme header templates, make sure to update the session ID of the uci
|
||||||
|
* module. */
|
||||||
|
if (runtime.L) {
|
||||||
|
runtime.L.invoke('require', 'luci.model.uci');
|
||||||
|
runtime.L.get('luci', 'model', 'uci').invoke('set_session_id', session.sid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (length(resolved.ctx.acls)) {
|
if (length(resolved.ctx.acls)) {
|
||||||
|
|
Loading…
Reference in a new issue