Merge dce91eaa26 into 83be5fb151

Reference Docker rather than Podman in the error, otherwise it can be misleading.

Dockerfile

@@ -35,7 +35,7 @@ RUN \
   apt-get update && \
   apt-get install -y --no-install-recommends \
       python3 python3-fitz libreoffice-nogui libreoffice-java-common \
-      python3 python3-magic default-jre-headless fonts-noto-cjk fonts-dejavu \
+      python3-magic default-jre-headless fonts-noto-cjk fonts-dejavu \
       runsc unzip wget && \
   : "Clean up for improving reproducibility (optional)" && \
   rm -rf /var/cache/fontconfig/ && \

Dockerfile.in

@@ -35,7 +35,7 @@ RUN \
   apt-get update && \
   apt-get install -y --no-install-recommends \
       python3 python3-fitz libreoffice-nogui libreoffice-java-common \
-      python3 python3-magic default-jre-headless fonts-noto-cjk fonts-dejavu \
+      python3-magic default-jre-headless fonts-noto-cjk fonts-dejavu \
       runsc unzip wget && \
   : "Clean up for improving reproducibility (optional)" && \
   rm -rf /var/cache/fontconfig/ && \

dangerzone/container_utils.py

@@ -11,7 +11,7 @@ from .settings import Settings
 from .util import get_resource_path, get_subprocess_startupinfo
 
 OLD_CONTAINER_NAME = "dangerzone.rocks/dangerzone"
-CONTAINER_NAME = "ghcr.io/almet/dangerzone/dangerzone"  # FIXME: Change this to the correct container name
+CONTAINER_NAME = "ghcr.io/freedomofpress/dangerzone/dangerzone"
 
 log = logging.getLogger(__name__)
 

dangerzone/updater/signatures.py

@@ -181,6 +181,7 @@ def verify_signatures(
 
     for signature in signatures:
         verify_signature(signature, image_digest, pubkey)
+
     return True
 
 
@@ -357,12 +358,21 @@ def load_and_verify_signatures(
     pubkey_signatures = signatures_path / get_file_digest(pubkey)
     if not pubkey_signatures.exists():
         msg = (
-            f"Cannot find a '{pubkey_signatures}' folder."
+            f"Cannot find a '{pubkey_signatures}' folder. "
             "You might need to download the image signatures first."
         )
         raise errors.SignaturesFolderDoesNotExist(msg)
 
-    with open(pubkey_signatures / f"{image_digest}.json") as f:
+    signatures_file = pubkey_signatures / f"{image_digest}.json"
+
+    if not signatures_file.exists():
+        msg = (
+            f"Cannot find a '{signatures_file}' file. "
+            "You might need to download the image signatures first."
+        )
+        raise errors.LocalSignatureNotFound(msg)
+
+    with open(signatures_file) as f:
         log.debug("Loading signatures from %s", f.name)
         signatures = json.load(f)
 

dev_scripts/repro-build.py

@@ -156,7 +156,7 @@ def parse_buildkit_args(args, runtime: str) -> str:
         return []
 
     if runtime != "podman":
-        raise RuntimeError("Cannot specify BuildKit arguments using the Podman runtime")
+        raise RuntimeError("Cannot specify BuildKit arguments using the Docker runtime")
 
     return shlex.split(args.buildkit_args)
 

install/common/build-image.py

@@ -6,7 +6,7 @@ import sys
 from pathlib import Path
 
 BUILD_CONTEXT = "dangerzone"
-IMAGE_NAME = "dangerzone.rocks/dangerzone"
+IMAGE_NAME = "ghcr.io/freedomofpress/dangerzone/dangerzone"
 if platform.system() in ["Darwin", "Windows"]:
     CONTAINER_RUNTIME = "docker"
 elif platform.system() == "Linux":

tests/conftest.py

@@ -14,6 +14,13 @@ from dangerzone.isolation_provider import container
 sys.dangerzone_dev = True  # type: ignore[attr-defined]
 
 
+ASSETS_PATH = Path(__file__).parent / "assets"
+TEST_PUBKEY_PATH = ASSETS_PATH / "test.pub.key"
+INVALID_SIGNATURES_PATH = ASSETS_PATH / "signatures" / "invalid"
+VALID_SIGNATURES_PATH = ASSETS_PATH / "signatures" / "valid"
+TEMPERED_SIGNATURES_PATH = ASSETS_PATH / "signatures" / "tempered"
+
+
 # Use this fixture to make `pytest-qt` invoke our custom QApplication.
 # See https://pytest-qt.readthedocs.io/en/latest/qapplication.html#testing-custom-qapplications
 @pytest.fixture(scope="session")

tests/isolation_provider/test_container.py

@@ -22,7 +22,7 @@ elif os.environ.get("DUMMY_CONVERSION", False):
 
 
 @pytest.fixture
-def provider() -> Container:
+def provider(skip_image_verification: None) -> Container:
     return Container()
 
 

tests/test_signatures.py

@@ -209,6 +209,19 @@ def test_get_remote_signatures_cosign_error(mocker, fp: FakeProcess):
         get_remote_signatures(image, digest)
 
 
+def test_get_remote_signatures_cosign_error(mocker, fp: FakeProcess):
+    image = "ghcr.io/freedomofpress/dangerzone/dangerzone"
+    digest = "123456"
+    mocker.patch("dangerzone.updater.cosign.ensure_installed", return_value=True)
+    fp.register_subprocess(
+        ["cosign", "download", "signature", f"{image}@sha256:{digest}"],
+        returncode=1,
+        stderr="Error: no signatures associated",
+    )
+    with pytest.raises(errors.NoRemoteSignatures):
+        get_remote_signatures(image, digest)
+
+
 def test_store_signatures_with_different_digests(
     valid_signature, signature_other_digest, mocker, tmp_path
 ):
@@ -240,7 +253,7 @@ def test_store_signatures_with_different_digests(
     # Verify that the signatures file was not created
     assert not (signatures_path / f"{image_digest}.json").exists()
 
-    # Verify that the log index file was not updated
+    # Verify that the log index file was not created
     assert not (signatures_path / "last_log_index").exists()
 
 
@@ -370,3 +383,7 @@ def test_verify_signature_tempered(tempered_signature):
 def test_verify_signatures_empty_list():
     with pytest.raises(errors.SignatureVerificationError):
         verify_signatures([], "1234", TEST_PUBKEY_PATH)
+
+
+def test_verify_signatures_not_0():
+    pass