Skip to content

Do not set timezone for VMs with anon-timezone feature #646

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
marmarek merged 1 commit into from
Jan 8, 2025
Merged

Do not set timezone for VMs with anon-timezone feature #646

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
52 changes: 28 additions & 24 deletions qubes/tests/vm/qubesvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,31 +2160,35 @@ def test_620_qdb_standalone(
"-A FORWARD -i vif+ -o vif+ -j DROP\n"
"COMMIT\n".format(datetime.datetime.now().ctime())
)
data = {
"/name": "test-inst-test",
"/type": "StandaloneVM",
"/default-user": "user",
"/qubes-vm-type": "AppVM",
"/qubes-debug-mode": "0",
"/qubes-base-template": "",
"/qubes-timezone": "UTC",
"/qubes-random-seed": base64.b64encode(b"A" * 64),
"/qubes-vm-persistence": "full",
"/qubes-vm-updateable": "True",
"/qubes-block-devices": "",
"/qubes-usb-devices": "",
"/qubes-iptables": "reload",
"/qubes-iptables-error": "",
"/qubes-iptables-header": iptables_header,
"/qubes-service/qubes-update-check": "0",
"/qubes-service/meminfo-writer": "1",
"/connected-ips": "",
"/connected-ips6": "",
}

self.assertEqual(
test_qubesdb.data,
{
"/name": "test-inst-test",
"/type": "StandaloneVM",
"/default-user": "user",
"/qubes-vm-type": "AppVM",
"/qubes-debug-mode": "0",
"/qubes-base-template": "",
"/qubes-timezone": "UTC",
"/qubes-random-seed": base64.b64encode(b"A" * 64),
"/qubes-vm-persistence": "full",
"/qubes-vm-updateable": "True",
"/qubes-block-devices": "",
"/qubes-usb-devices": "",
"/qubes-iptables": "reload",
"/qubes-iptables-error": "",
"/qubes-iptables-header": iptables_header,
"/qubes-service/qubes-update-check": "0",
"/qubes-service/meminfo-writer": "1",
"/connected-ips": "",
"/connected-ips6": "",
},
)
self.assertEqual(test_qubesdb.data, data)

test_qubesdb.data.clear()
vm.features["anon-timezone"] = "1"
vm.create_qdb_entries()
del data["/qubes-timezone"]
self.assertEqual(test_qubesdb.data, data)

@unittest.mock.patch("datetime.datetime")
@unittest.mock.patch("qubes.utils.get_timezone")
Expand Down
6 changes: 5 additions & 1 deletion qubes/vm/qubesvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2612,8 +2612,12 @@ def create_qdb_entries(self):
)

tzname = qubes.utils.get_timezone()
if tzname:
if tzname and not self.features.check_with_template(
"anon-timezone", False
):
self.untrusted_qdb.write("/qubes-timezone", tzname)
else:
self.untrusted_qdb.rm("/qubes-timezone")

self.untrusted_qdb.write("/qubes-block-devices", "")
self.untrusted_qdb.write("/qubes-usb-devices", "")
Expand Down