Skip to content

Support DNF5 UpdateVM for qvm-template #308

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

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Support DNF5 UpdateVM for qvm-template #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 37 additions & 0 deletions qubesadmin/tests/tools/qvm_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,43 @@ def test_120_qrexec_repoquery_success(self, mock_payload):
])
self.assertAllCalled()

@mock.patch('qubesadmin.tools.qvm_template.qrexec_payload')
def test_120_b_qrexec_repoquery_success_dnf5(self, mock_payload):
args = argparse.Namespace(updatevm='test-vm')
mock_payload.return_value = 'str1\nstr2'
self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = \
b'0\x00test-vm class=TemplateVM state=Halted\n'
self.app.expected_service_calls[
('test-vm', 'qubes.TemplateSearch')] = \
b'''qubes-template-debian-12-minimal|0|4.3.0|202405272135|qubes-templates-itl|228848654|1716847042|GPLv3+|http://www.qubes-os.org|Qubes OS template for debian-12-minimal|Qubes OS template for debian-12-minimal.|'''
# The above is actual data from Fedora 41 based UdpateVM (Sep-2024)
res = qubesadmin.tools.qvm_template.qrexec_repoquery(args, self.app,
'qubes-template-debian-12-minimal')
self.assertEqual(res, [
qubesadmin.tools.qvm_template.Template(
'debian-12-minimal',
'0',
'4.3.0',
'202405272135',
'qubes-templates-itl',
228848654,
datetime.datetime(2024, 5, 27, 21, 57, 22),
'GPLv3+',
'http://www.qubes-os.org',
'Qubes OS template for debian-12-minimal',
'Qubes OS template for debian-12-minimal.'
)
])
self.assertEqual(self.app.service_calls, [
('test-vm', 'qubes.TemplateSearch',
{'filter_esc': True, 'stdout': subprocess.PIPE}),
('test-vm', 'qubes.TemplateSearch', b'str1\nstr2')
])
self.assertEqual(mock_payload.mock_calls, [
mock.call(args, self.app, 'qubes-template-debian-12-minimal', False)
])
self.assertAllCalled()

@mock.patch('qubesadmin.tools.qvm_template.qrexec_payload')
def test_121_qrexec_repoquery_refresh_success(self, mock_payload):
args = argparse.Namespace(updatevm='test-vm')
Expand Down
12 changes: 10 additions & 2 deletions qubesadmin/tools/qvm_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,9 @@ def qrexec_repoquery(
# This is because if .strip() is used, the .split() will not work.
if line == '':
continue
# This is specific to DNF5:
if line.endswith('|'):
line = line[:-1]
entry = line.split('|')
try:
# If there is an incorrect number of entries, raise an error
Expand All @@ -573,9 +576,14 @@ def qrexec_repoquery(
raise ValueError
dlsize = int(dlsize)
# First verify that the date does not look weird, then parse it
if not re.fullmatch(date_re, buildtime):
if re.fullmatch(date_re, buildtime):
buildtime = datetime.datetime.strptime(buildtime, \
'%Y-%m-%d %H:%M')
elif buildtime.isnumeric():
# DNF5 provides seconds since epoch
buildtime = datetime.datetime.fromtimestamp(int(buildtime))
else:
raise ValueError
buildtime = datetime.datetime.strptime(buildtime, '%Y-%m-%d %H:%M')
# XXX: Perhaps whitelist licenses directly?
if not re.fullmatch(licence_re, licence):
raise ValueError
Expand Down