mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-10 12:16:49 +00:00
feat(instances): a VM's access in one strip, its console password kept to its rule
The Access tab hid the console, the root password, the SSH key and the remote viewer behind four sub-tabs. The owner chose a compact layout from three rendered options: the state, a strip with the console and the remote viewer, then two rows for root's password and key, each saying why it waits when it does. Codex reviewed access end to end; these are fixed: - console.vv carries the console password only for users with the passwordless console permission, as the console page passes it; it gave it to every user who may open the console. - The root password field is a labelled password input, not plain text with a 24-character limit. - Without a saved public key the key row is disabled and points to the profile, instead of offering "None". - A paused VM's console opens, as the console view allows. - The remote viewer address and console.vv show only for a VNC or SPICE console that listens beyond the host's loopback; a viewer on the user's computer cannot reach the others, and a serial console gave a pty://…:None address.
This commit is contained in:
parent
efb77dd866
commit
60f12cefa1
6 changed files with 152 additions and 115 deletions
50
instances/tests/test_access_tab.py
Normal file
50
instances/tests/test_access_tab.py
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
"""The Access tab: the console of a running or paused VM, a remote viewer
|
||||
only where it can reach the console, and root's password and keys when the
|
||||
VM can take them."""
|
||||
|
||||
from types import SimpleNamespace
|
||||
|
||||
from django.template.loader import render_to_string
|
||||
from django.test import SimpleTestCase
|
||||
from lxml import html
|
||||
|
||||
UUID = "abcdabcd-0000-0000-0000-000000000000"
|
||||
|
||||
|
||||
def tab(status=1, vdi_reachable=True, guest_access_ready=True, publickeys=("laptop",)):
|
||||
instance = SimpleNamespace(id=1, uuid=UUID, status=status, console_type="vnc")
|
||||
page = render_to_string("instances/access_tab.html", {
|
||||
"instance": instance, "compute": SimpleNamespace(id=1), "can_open_console": True, "can_change": True,
|
||||
"app_settings": SimpleNamespace(SHOW_ACCESS_ROOT_PASSWORD="True", SHOW_ACCESS_SSH_KEYS="True"),
|
||||
"publickeys": [SimpleNamespace(id=n, keyname=name) for n, name in enumerate(publickeys, 1)],
|
||||
"vdi_reachable": vdi_reachable, "guest_access_ready": guest_access_ready,
|
||||
})
|
||||
return html.fromstring(page)
|
||||
|
||||
|
||||
class AccessTabTests(SimpleTestCase):
|
||||
def test_a_running_or_paused_vm_opens_its_console(self):
|
||||
for status, console in ((1, True), (3, True), (5, False)):
|
||||
with self.subTest(status=status):
|
||||
self.assertEqual(bool(tab(status=status).xpath("//button[@id='console_button']")), console)
|
||||
|
||||
def test_a_remote_viewer_is_offered_only_where_it_reaches_the_console(self):
|
||||
for reachable in (True, False):
|
||||
with self.subTest(reachable=reachable):
|
||||
doc = tab(vdi_reachable=reachable)
|
||||
self.assertEqual(bool(doc.xpath("//a[@id='vdi_url'] | //input[@id='vdi_url_input']")), reachable)
|
||||
self.assertEqual(bool(doc.xpath("//a[contains(@href, 'getvvfile')]")), reachable)
|
||||
|
||||
def test_root_s_password_is_hidden_and_waits_for_a_vm_that_can_take_it(self):
|
||||
for ready in (True, False):
|
||||
with self.subTest(ready=ready):
|
||||
doc = tab(guest_access_ready=ready)
|
||||
(field,) = doc.xpath("//input[@name='passwd']")
|
||||
self.assertEqual((field.get("type"), field.get("autocomplete")), ("password", "new-password"))
|
||||
self.assertEqual(field.xpath("ancestor::fieldset")[0].get("disabled") is not None, not ready)
|
||||
|
||||
def test_without_a_saved_key_the_tab_points_to_the_profile(self):
|
||||
doc = tab(publickeys=())
|
||||
self.assertIsNotNone(doc.xpath("//select[@name='sshkeyid']/ancestor::fieldset")[0].get("disabled"))
|
||||
self.assertEqual(doc.xpath("//select[@name='sshkeyid']/option"), [])
|
||||
self.assertEqual(doc.xpath("//a[text()='Add one in your profile.']/@href"), ["/accounts/profile/"])
|
||||
|
|
@ -64,8 +64,16 @@ class CanOpenConsoleTestCase(TestCase):
|
|||
self.assertEqual(res.status_code, 200)
|
||||
self.assertIn(b"[virt-viewer]", res.content)
|
||||
# the VM found by its UUID; a console on all addresses is reached through the host
|
||||
for line in (b"type=vnc", b"host=192.0.2.7", b"port=5900", b"title=cons-vm", b"password=secret"):
|
||||
for line in (b"type=vnc", b"host=192.0.2.7", b"port=5900", b"title=cons-vm"):
|
||||
self.assertIn(line + b"\n", res.content)
|
||||
# the password only with the permission the console page asks for, as there
|
||||
self.assertNotIn(b"password=", res.content)
|
||||
self.owner.user_permissions.add(Permission.objects.get(codename="passwordless_console"))
|
||||
with patch("instances.models.wvmInstance") as wvm:
|
||||
proxy = wvm.return_value.cached_reads.return_value.__enter__.return_value
|
||||
proxy.get_console_passwd.return_value = "secret"
|
||||
res = self.client.get(reverse("instances:getvvfile", args=[self.instance.id]))
|
||||
self.assertIn(b"password=secret\n", res.content)
|
||||
|
||||
def test_owner_can_get_vdi_url(self):
|
||||
self.client.force_login(self.owner)
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class PageControls:
|
|||
found = {
|
||||
"console": bool(doc.xpath("//button[@id='console_button']")),
|
||||
"vv file": bool(doc.xpath("//a[@href=$a]", a=reverse("instances:getvvfile", args=[pk]))),
|
||||
"vdi": bool(doc.xpath("//*[@id='vdiconsole']")),
|
||||
"vdi": bool(doc.xpath("//*[@id='vdi_url']")),
|
||||
"power": form("poweron") or bool(doc.xpath("//button[@formaction=$a]", a=reverse("instances:poweroff", args=[pk]))),
|
||||
"root password": form("rootpasswd"),
|
||||
"ssh key": form("add_public_key"),
|
||||
|
|
@ -197,6 +197,14 @@ class PageControlsTestCase(PageControls, TestCase):
|
|||
)
|
||||
self.assertEqual(bool(buttons), enabled)
|
||||
|
||||
def test_a_remote_viewer_only_for_a_console_beyond_the_host_s_loopback(self):
|
||||
admin = get_user_model().objects.create_superuser("vdi_admin", "vdi@example.com", "x")
|
||||
for listen, shown in (("0.0.0.0", True), ("192.0.2.5", True), ("127.0.0.2", False), ("::1", False)):
|
||||
with self.subTest(listen=listen), patch("instances.models.Instance.console_listener_address",
|
||||
new_callable=PropertyMock, return_value=listen):
|
||||
self.controls(admin)
|
||||
self.assertEqual('id="vdi_url"' in self.last_page, shown)
|
||||
|
||||
def test_the_power_tab_offers_the_state_s_actions_and_confirms_a_power_cut(self):
|
||||
admin = get_user_model().objects.create_superuser("power_admin", "pa@example.com", "x")
|
||||
owner = self.user("power_owner", owner={})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue