mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-11 04:36:48 +00:00
feat(console): a working serial console
The xterm console never connected: socketiod expected a different token format, its worker had no compute credentials, one global console was shared by every client and its output broadcast to all of them, and the Docker image did not run socketiod at all. - console/tokens.py: one authorize() for noVNC and socketiod; the signed token is the only credential, checked at connect time. - socketiod: one pty worker per client (consolecallback with the instance id), one session per VM, a session cap, input and resize checked; the parent never opens libvirt. The engine.io same-origin check is on. - consolecallback: opens the console with the compute's credentials and exits with a message when it cannot. - Docker runs socketiod as a runit service; nginx proxies /socket.io/ with Host and the scheme for the origin check. Supervisor and systemd start it as well; WEBVIRTCLOUD_SERIAL_CONSOLE=1 enables it. - Tests: token and session unit tests, socketiod as a process, and a live test that reads SeaBIOS from a wvc-test VM on the TCP and SSH hosts.
This commit is contained in:
parent
9b0c6e2d8e
commit
d37aa42392
20 changed files with 592 additions and 569 deletions
|
|
@ -2,8 +2,9 @@
|
|||
import re
|
||||
|
||||
from appsettings.settings import app_settings
|
||||
from console import tokens
|
||||
from django.conf import settings
|
||||
from django.core.signing import BadSignature, SignatureExpired, TimestampSigner
|
||||
from django.core.signing import BadSignature, SignatureExpired
|
||||
from django.http.response import HttpResponseForbidden
|
||||
from django.shortcuts import render
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
|
@ -52,7 +53,7 @@ def console(request):
|
|||
request.GET.get("clip_viewport"), default=clip_viewport
|
||||
)
|
||||
|
||||
signer = TimestampSigner(salt="console.novnc")
|
||||
signer = tokens.SIGNER
|
||||
host = None
|
||||
uuid = None
|
||||
|
||||
|
|
@ -126,30 +127,13 @@ def console(request):
|
|||
if console_type == "vnc":
|
||||
console_page = "console-vnc-" + view_type + ".html"
|
||||
response = render(request, console_page, locals())
|
||||
elif console_type == "pty" and not getattr(
|
||||
settings, "SERIAL_CONSOLE_ENABLED", False
|
||||
):
|
||||
# socketiod does not authenticate connections yet, so
|
||||
# the serial console stays off unless an admin explicitly enables it.
|
||||
elif console_type == "pty" and not settings.SERIAL_CONSOLE_ENABLED:
|
||||
console_error = _(
|
||||
"Serial console is disabled on this server. "
|
||||
"Please switch VM graphics to VNC or ask an administrator."
|
||||
)
|
||||
response = render(request, "console-vnc-lite.html", locals())
|
||||
elif console_type == "pty":
|
||||
socketio_public_host = getattr(settings, "SOCKETIO_PUBLIC_HOST", None)
|
||||
socketio_public_port = getattr(settings, "SOCKETIO_PUBLIC_PORT", 6081)
|
||||
socketio_public_path = getattr(settings, "SOCKETIO_PUBLIC_PATH", "socket.io/")
|
||||
|
||||
socketio_host = (
|
||||
socketio_public_host if socketio_public_host else request.get_host()
|
||||
)
|
||||
socketio_port = socketio_public_port if socketio_public_port else 6081
|
||||
socketio_path = socketio_public_path if socketio_public_path else "/"
|
||||
|
||||
if ":" in socketio_host:
|
||||
socketio_host = re.sub(":[0-9]+", "", socketio_host)
|
||||
|
||||
response = render(request, "console-xterm.html", locals())
|
||||
else:
|
||||
if console_type is None:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue