mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-10 20:26:48 +00:00
fix(console): keep socketiod behind nginx and off by default there too
- Comment out the nginx /socket.io/ location: a firewall on 6081 does not protect a console that nginx proxies on 80/443. - Default SOCKETIO_HOST to 127.0.0.1. - README: short enable steps and the changes existing installs need. - test_socketiod_disabled writes its settings module to a temporary directory instead of the source tree.
This commit is contained in:
parent
1547e58e55
commit
4252ad9280
4 changed files with 28 additions and 31 deletions
|
|
@ -2,6 +2,7 @@ import os
|
|||
import signal
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
|
|
@ -13,11 +14,10 @@ class SocketiodDisabledTestCase(unittest.TestCase):
|
|||
"""ROADMAP S-01: socketiod must refuse to start unless explicitly enabled."""
|
||||
|
||||
def test_socketiod_exits_when_serial_console_disabled(self):
|
||||
settings_dir = ROOT / "console" / "_test_settings"
|
||||
settings_dir.mkdir(exist_ok=True)
|
||||
try:
|
||||
(settings_dir / "__init__.py").write_text("")
|
||||
(settings_dir / "disabled.py").write_text(
|
||||
# The settings module lives in a temporary directory, so the test does
|
||||
# not write into the source tree (read-only checkouts, --parallel).
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
(Path(tmp) / "socketiod_disabled_settings.py").write_text(
|
||||
"from webvirtcloud.settings import * # noqa\n"
|
||||
"SERIAL_CONSOLE_ENABLED = False\n"
|
||||
"SOCKETIO_HOST = '127.0.0.1'\n"
|
||||
|
|
@ -25,8 +25,8 @@ class SocketiodDisabledTestCase(unittest.TestCase):
|
|||
)
|
||||
env = dict(
|
||||
os.environ,
|
||||
DJANGO_SETTINGS_MODULE="console._test_settings.disabled",
|
||||
PYTHONPATH=str(ROOT),
|
||||
DJANGO_SETTINGS_MODULE="socketiod_disabled_settings",
|
||||
PYTHONPATH=os.pathsep.join([tmp, str(ROOT)]),
|
||||
)
|
||||
# Other test modules import novncd, which sets SIGCHLD to SIG_IGN in
|
||||
# this process; with that, the child's exit status is lost (always 0).
|
||||
|
|
@ -44,14 +44,5 @@ class SocketiodDisabledTestCase(unittest.TestCase):
|
|||
self.fail("socketiod kept running although SERIAL_CONSOLE_ENABLED=False")
|
||||
finally:
|
||||
signal.signal(signal.SIGCHLD, previous_sigchld)
|
||||
self.assertNotEqual(result.returncode, 0, result.stdout + result.stderr)
|
||||
self.assertIn("SERIAL_CONSOLE_ENABLED", result.stderr)
|
||||
finally:
|
||||
for f in settings_dir.glob("*"):
|
||||
if f.is_file():
|
||||
f.unlink()
|
||||
for d in settings_dir.glob("__pycache__"):
|
||||
for f in d.glob("*"):
|
||||
f.unlink()
|
||||
d.rmdir()
|
||||
settings_dir.rmdir()
|
||||
self.assertNotEqual(result.returncode, 0, result.stdout + result.stderr)
|
||||
self.assertIn("SERIAL_CONSOLE_ENABLED", result.stderr)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue