1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-11 12:46:49 +00:00

feat(console): the VNC console uses the panel's own address

The console pages connect to /novncd/ on the address, scheme and port the
page itself was loaded from; nginx proxies it to novncd, which listens on
the loopback only. There is nothing to configure: the console works on
HTTPS (wss), behind another proxy and on any published port.

Before, the page connected to WS_PUBLIC_HOST/PORT/PATH, port 6080 by
default: straight to novncd, past nginx and without TLS, so an HTTPS panel
and a Docker container published on another port had no console until the
public port was set by hand, and novncd listened on every interface.

Gone: WS_PUBLIC_PORT, WS_PUBLIC_HOST, WS_PUBLIC_PATH and WS_CERT, the
installer's two public console questions and its 6080 firewall rule, the
Docker image's WS_PUBLIC_PORT and its init script lines, the manual
install's firewall rule for 6080 and nginx's unused /websockify location.
WS_HOST defaults to 127.0.0.1. A VM with a QEMU websocket port is still
reached on that port of the panel's host name (left for a separate
decision).
This commit is contained in:
catborise 2026-10-26 19:51:35 +03:00
parent 82af555d45
commit 68b104dfe4
14 changed files with 43 additions and 164 deletions

View file

@ -176,10 +176,9 @@
bindKeyAction('ctrlaltf' + (i + 1), () => sendCtrlAltFN(i));
}
let fullPath = '{{ ws_path|escapejs }}';
if (fullPath.startsWith('/')) {
fullPath = fullPath.substring(1);
}
// novncd behind the panel's own address (nginx's /novncd/); a VM with a
// QEMU websocket port is reached on that port of the panel's host name
let fullPath = 'novncd/';
const token = '{{ token|escapejs }}';
if (token) {
fullPath += (fullPath.includes('?') ? '&' : '?') + 'token=' + encodeURIComponent(token);
@ -195,10 +194,12 @@
{% endif %}
};
const https = window.location.protocol === 'https:';
const mandatory = {
host: '{{ ws_host|escapejs }}',
port: {{ ws_port|default:6080 }},
host: window.location.hostname,
port: Number('{{ console_websocket_port|default_if_none:""|escapejs }}' || window.location.port || (https ? 443 : 80)),
path: fullPath,
encrypt: https,
};
UI.start({ settings: { defaults, mandatory } });
@ -345,16 +346,16 @@
</li>
<li>
<label for="noVNC_setting_host">Host:</label>
<input id="noVNC_setting_host" type="text" value="{{ ws_host }}">
<input id="noVNC_setting_host" type="text">
</li>
<li>
<label for="noVNC_setting_port">Port:</label>
<input id="noVNC_setting_port" type="number" value="{{ ws_port }}">
<input id="noVNC_setting_port" type="number">
</li>
<li>
<label for="noVNC_setting_path">Path:</label>
<!-- <input id="noVNC_setting_path" type="text" value="websockify"> -->
<input id="noVNC_setting_path" type="text" value="{{ ws_path }}">
<input id="noVNC_setting_path" type="text">
</li>
</ul></div>
</li>

View file

@ -265,10 +265,11 @@
bindKeyAction('ctrlaltf' + (i + 1), () => sendCtrlAltFN(i));
}
// The proxy the server names, never one from the link: the page sends
// it a console token
const host = '{{ ws_host|escapejs }}';
let port = '{{ ws_port|escapejs }}';
// novncd behind the panel's own address (nginx's /novncd/), never a host
// from the link: the page sends it a console token. A VM with a QEMU
// websocket port is reached on that port of the panel's host name.
const host = window.location.hostname;
let port = '{{ console_websocket_port|default_if_none:""|escapejs }}' || window.location.port;
{% if perms.instances.passwordless_console and console_passwd %}
const password = '{{ console_passwd|escapejs }}';
@ -276,7 +277,7 @@
const password = readQueryVariable('password');
{% endif %}
const path = '{{ ws_path|escapejs }}';
const path = 'novncd/';
// | | | | | |
// | | | Connect | | |