Restore token forwarding in vnc_lite

This is a partial revert of commit 51f9f0098d
which intended to remove unnecessary options.

In OpenStack Nova, we use the vnc_lite (formerly vnc_auto)
functionality as a default in our novnc proxy [1] and the proxy relies
on token validation. We need to be able to access the token in the URL
in our websockify proxy server.

Websockify itself also offers a token plugin feature that requires
forwarding of the token [2]. Restoring token forwarding allows users to
continue using token plugins with vnc_lite.

[1]
https://docs.openstack.org/nova/latest/admin/remote-console-access.html#novnc-based-vnc-console
[2]
https://github.com/novnc/websockify/wiki/Token-based-target-selection
This commit is contained in:
melanie witt 2019-04-02 01:06:29 +00:00
parent dcc41bde61
commit 5b55114bbe
1 changed files with 8 additions and 0 deletions

View File

@ -154,6 +154,14 @@
const password = readQueryVariable('password', ''); const password = readQueryVariable('password', '');
const path = readQueryVariable('path', 'websockify'); const path = readQueryVariable('path', 'websockify');
// If a token variable is passed in, forward it in the URL so that it
// is accessible by a websockify token plugin
var token = WebUtil.getConfigVar('token', null);
if (token) {
// if token is already present in the path we should use it
path = WebUtil.injectParamIfMissing(path, "token", token);
}
// | | | | | | // | | | | | |
// | | | Connect | | | // | | | Connect | | |
// v v v v v v // v v v v v v