Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better error message if new VM Name starts with illegal characters #606

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Better error message if new VM Name starts with illegal characters #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c07a5e7
Better error message if new VM Name starts with illegal characters
alimirjamali Jul 5, 2024
51a425b
Updating Unit Test for new VM Names validation
alimirjamali Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions qubes/tests/api_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,18 @@ def test_334_vm_create_invalid_name(self, storage_mock):
self.assertNotIn('test-###', self.app.domains)
self.assertFalse(self.app.save.called)

with self.assertRaises(qubes.exc.QubesValueError):
self.call_mgmt_func(b'admin.vm.Create.AppVM',
b'dom0', b'test-template', b'name=--helpVM')
self.assertNotIn('--helpVM', self.app.domains)
self.assertFalse(self.app.save.called)

with self.assertRaises(qubes.exc.QubesValueError):
self.call_mgmt_func(b'admin.vm.Create.AppVM',
b'dom0', b'test-template', b'name=1stVM')
self.assertNotIn('1stVM', self.app.domains)
self.assertFalse(self.app.save.called)

@unittest.mock.patch('qubes.storage.Storage.create')
def test_335_vm_create_missing_name(self, storage_mock):
storage_mock.side_effect = self.dummy_coro
Expand Down
8 changes: 8 additions & 0 deletions qubes/vm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
raise qubes.exc.QubesValueError(
'VM name must be shorter than 32 characters')

if re.match(r"\A[0-9_-].*\Z", value) is not None:
if holder is not None and prop is not None:
raise qubes.exc.QubesPropertyValueError(holder, prop, value,

Check warning on line 57 in qubes/vm/__init__.py

View check run for this annotation

Codecov / codecov/patch

qubes/vm/__init__.py#L57 

Added line #L57 was not covered by tests
'{} cannot start with hyphen, underscore or numbers'.format(
prop.__name__))
raise qubes.exc.QubesValueError(
'VM name cannot start with hyphen, underscore or numbers')

# this regexp does not contain '+'; if it had it, we should specifically
# disallow 'lost+found' #1440
if re.match(r"\A[a-zA-Z][a-zA-Z0-9_-]*\Z", value) is None:
Expand Down