Make Qubes conversion work after the dangerzone-image split

[apyrgio]

Update the Dangerzone Qubes logic and build instructions to work with the new server-side component (see also freedomofpress/dangerzone-image#7).

[almet]

I've added a few notes. I think we're almost good to go with this. Mainly a few changes related to how we do the teleport, and that's it!

[apyrgio]

I've squashed the fixups in this branch, and tested the Qubes tests locally. I think it's ready to merge once the CI turns green.

[almet]

The linter reports this:

dangerzone/isolation_provider/qubes.py:94: error: Value of type variable "AnyStr" of "walk" cannot be "str | None"  [type-var]
dangerzone/isolation_provider/qubes.py:96: error: Item "None" of "str | None" has no attribute "endswith"  [union-attr]
dangerzone/isolation_provider/qubes.py:97: error: Argument 1 to "join" has incompatible type "str | None"; expected "str"  [arg-type]
dangerzone/isolation_provider/qubes.py:97: error: Argument 2 to "join" has incompatible type "str | None"; expected "str"  [arg-type]
Found 4 errors in 1 file (checked 69 source files)

Otherwise, it's good! Since this targets the dangerzone-split branch, if you don't have the time to fix it before I get another look at it, I'll merge and fix in this other branch :-)

Thanks a lot 👍

[apyrgio]

Fixed it:

diff --git a/dangerzone/isolation_provider/qubes.py b/dangerzone/isolation_provider/qubes.py
index 2f99e892..4fd8f49d 100644
--- a/dangerzone/isolation_provider/qubes.py
+++ b/dangerzone/isolation_provider/qubes.py
@@ -5,7 +5,7 @@ import subprocess
 import sys
 import zipfile
 from pathlib import Path
-from typing import IO, Callable, Optional
+from typing import IO

 from ..document import Document
 from ..updater.signatures import is_container_tar_bundled
@@ -49,6 +49,7 @@ class Qubes(IsolationProvider):

         if dev_mode:
             assert p.stdin is not None
+            assert conv_mod_path is not None
             # Send the dangerzone module first.
             self.teleport_dz_module(conv_mod_path, p.stdin)

@@ -84,7 +85,7 @@ class Qubes(IsolationProvider):
         if p.stdout:
             p.stdout.close()

-    def teleport_dz_module(self, conv_path: Optional[str], wpipe: IO[bytes]) -> None:
+    def teleport_dz_module(self, conv_path: str, wpipe: IO[bytes]) -> None:
         """Send the dangerzone module to another qube, as a zipfile."""
         # Grab the absolute file path of the dangerzone module.
         temp_file = io.BytesIO()