Cleanup code

Author: daviddavis

pulp_deb/app/models/signing_service.py

@@ -7,7 +7,7 @@
 import tempfile
 
 from pulpcore.plugin.models import SigningService
-from importlib_resources import files
+from importlib.resources import files
 
 
 def prepare_gpg(temp_directory_name, public_key, pubkey_fingerprint):
@@ -215,11 +215,14 @@ def validate(self):
             # Prepare GPG:
             gpg = prepare_gpg(temp_directory_name, self.public_key, self.pubkey_fingerprint)
 
-            self._validate_deb_package(signed_deb, self.pubkey_fingerprint, temp_directory_name, gpg)
+            self._validate_deb_package(
+                signed_deb, self.pubkey_fingerprint, temp_directory_name, gpg
+            )
 
-            
     @staticmethod
-    def _validate_deb_package(deb_package_path: str, pubkey_fingerprint: str, temp_directory_name: str, gpg: gnupg.GPG):
+    def _validate_deb_package(
+        deb_package_path: str, pubkey_fingerprint: str, temp_directory_name: str, gpg: gnupg.GPG
+    ):
         """
         Validate that the deb package at @deb_package_path is correctly signed.
 
@@ -245,8 +248,10 @@ def _validate_deb_package(deb_package_path: str, pubkey_fingerprint: str, temp_d
         with (temp_dir / "_gpgorigin").open("rb") as gpgorigin:
             verified = gpg.verify_file(gpgorigin, str(temp_dir / "combined"))
             if not verified.valid:
-                raise Exception(f"GPG Verification of the signed package {deb_package_path} failed!")
+                raise Exception(
+                    f"GPG Verification of the signed package {deb_package_path} failed!"
+                )
             if verified.pubkey_fingerprint != pubkey_fingerprint:
                 raise Exception(
                     f"'{deb_package_path}' appears to have been signed using the wrong key!"
-                )
+                )

pulp_deb/app/viewsets/content.py

@@ -1,8 +1,8 @@
 from gettext import gettext as _  # noqa
 
 from django_filters import Filter
-from pulpcore.app.serializers import AsyncOperationResponseSerializer
 from pulpcore.plugin.models import Repository, RepositoryVersion, PulpTemporaryFile
+from pulpcore.plugin.serializers import AsyncOperationResponseSerializer
 from pulpcore.plugin.serializers.content import ValidationError
 from pulpcore.plugin.tasking import dispatch
 from pulpcore.plugin.viewsets import (

pulp_deb/tests/functional/api/test_package_signing.py

@@ -2,21 +2,22 @@
 import hashlib
 import shutil
 import uuid
-from importlib_resources import files
 
 from pulp_deb.app.models import AptPackageSigningService
 import requests
 from pulp_deb.tests.functional.utils import get_local_package_absolute_path
 import pytest
 
+
 @pytest.mark.parallel
 def test_register_rpm_package_signing_service(deb_package_signing_service):
     """
     Register a sample rpmsign-based signing service and validate it works.
     """
     service = deb_package_signing_service
     assert "/api/v3/signing-services/" in service.pulp_href
-    
+
+
 @dataclass
 class GPGMetadata:
     pubkey: str
@@ -45,7 +46,8 @@ def signing_gpg_extra(signing_gpg_metadata):
         GPGMetadata(pubkey_a, fingerprint_a, fingerprint_a[-8:]),
         GPGMetadata(pubkey_b, fingerprint_b, fingerprint_b[-8:]),
     )
-    
+
+
 @pytest.mark.parallel
 def test_sign_package_on_upload(
     tmp_path,
@@ -73,7 +75,9 @@ def test_sign_package_on_upload(
         tmp_path,
     )
     with pytest.raises(Exception, match="No such file or directory:.*"):
-        AptPackageSigningService._validate_deb_package(file_to_upload, gpg_metadata_a.fingerprint, str(tmp_path), gpg)
+        AptPackageSigningService._validate_deb_package(
+            file_to_upload, gpg_metadata_a.fingerprint, str(tmp_path), gpg
+        )
 
     # Upload Package to Repository
     # The same file is uploaded, but signed with different keys each time
@@ -95,44 +99,38 @@ def test_sign_package_on_upload(
         downloaded_package.write_bytes(
             download_content_unit(distribution.base_path, "pool/upload/f/frigg/frigg_1.0_ppc64.deb")
         )
-        AptPackageSigningService._validate_deb_package(str(downloaded_package), fingerprint, str(tmp_path), gpg)
-    
+        AptPackageSigningService._validate_deb_package(
+            str(downloaded_package), fingerprint, str(tmp_path), gpg
+        )
+
     # Test release override
     repository = deb_repository_factory(
         package_signing_service=deb_package_signing_service.pulp_href,
         package_signing_fingerprint=gpg_metadata_a.fingerprint,
-        package_signing_fingerprint_release_overrides={"test": gpg_metadata_b.fingerprint}
-    )
-    
-    deb_release_factory(
-        "test", "test", "test", repository=repository.pulp_href
-    )
-    deb_release_factory(
-        "test2", "test2", "test2", repository=repository.pulp_href
+        package_signing_fingerprint_release_overrides={"test": gpg_metadata_b.fingerprint},
     )
-    
+
+    deb_release_factory("test", "test", "test", repository=repository.pulp_href)
+    deb_release_factory("test2", "test2", "test2", repository=repository.pulp_href)
+
     deb_package_factory(
         file=file_to_upload,
         repository=repository.pulp_href,
         distribution="test",
     )
-    # uncommenting this line causes a failure since it overrides the existing package with a version signed with fingerprint_a
-    # deb_package_factory(
-    #     file=file_to_upload,
-    #     repository=repository.pulp_href,
-    #     distribution="test2",
-    # )
-    
+
     # Verify that the final served package is signed
     publication = deb_publication_factory(repository)
     distribution = deb_distribution_factory(publication=publication)
     downloaded_package = tmp_path / "package.deb"
     downloaded_package.write_bytes(
         download_content_unit(distribution.base_path, "pool/upload/f/frigg/frigg_1.0_ppc64.deb")
     )
-    AptPackageSigningService._validate_deb_package(str(downloaded_package), gpg_metadata_b.fingerprint, str(tmp_path), gpg)
-    
-    
+    AptPackageSigningService._validate_deb_package(
+        str(downloaded_package), gpg_metadata_b.fingerprint, str(tmp_path), gpg
+    )
+
+
 @pytest.fixture
 def pulpcore_chunked_file_factory(tmp_path):
     """Returns a function to create chunks from file to be uploaded."""
@@ -189,7 +187,8 @@ def _upload_chunks(size, chunks, sha256, include_chunk_sha256=False):
         return upload
 
     yield _upload_chunks
-    
+
+
 def test_sign_chunked_package_on_upload(
     tmp_path,
     download_content_unit,
@@ -217,7 +216,9 @@ def test_sign_chunked_package_on_upload(
         tmp_path,
     )
     with pytest.raises(Exception, match="No such file or directory:.*"):
-        AptPackageSigningService._validate_deb_package(file_to_upload, gpg_metadata_a.fingerprint, str(tmp_path), gpg)
+        AptPackageSigningService._validate_deb_package(
+            file_to_upload, gpg_metadata_a.fingerprint, str(tmp_path), gpg
+        )
 
     # Upload Package to Repository
     # The same file is uploaded, but signed with different keys each time
@@ -244,4 +245,6 @@ def test_sign_chunked_package_on_upload(
         downloaded_package.write_bytes(
             download_content_unit(distribution.base_path, "pool/upload/f/frigg/frigg_1.0_ppc64.deb")
         )
-        AptPackageSigningService._validate_deb_package(str(downloaded_package), fingerprint, str(tmp_path), gpg)
+        AptPackageSigningService._validate_deb_package(
+            str(downloaded_package), fingerprint, str(tmp_path), gpg
+        )

pulp_deb/tests/functional/conftest.py

@@ -8,7 +8,10 @@
 import subprocess
 import uuid
 
-from pulp_deb.tests.functional.constants import DEB_SIGNING_SCRIPT_STRING, DEB_PACKAGE_SIGNING_SCRIPT_STRING
+from pulp_deb.tests.functional.constants import (
+    DEB_SIGNING_SCRIPT_STRING,
+    DEB_PACKAGE_SIGNING_SCRIPT_STRING,
+)
 from pulpcore.client.pulp_deb import (
     ContentGenericContentsApi,
     ContentPackagesApi,
@@ -689,8 +692,6 @@ def _deb_domain_factory(name=None):
     return _deb_domain_factory
 
 
-
-
 @pytest.fixture(scope="session")
 def package_signing_script_path(signing_script_temp_dir, signing_gpg_homedir_path):
     signing_script_file = signing_script_temp_dir / "sign-deb-package.sh"
@@ -702,6 +703,7 @@ def package_signing_script_path(signing_script_temp_dir, signing_gpg_homedir_pat
 
     return signing_script_file
 
+
 @pytest.fixture(scope="session")
 def signing_script_temp_dir(tmp_path_factory):
     return tmp_path_factory.mktemp("sigining_script_dir")
@@ -740,6 +742,7 @@ def _sign_with_deb_package_signing_service(filename):
 
     return _sign_with_deb_package_signing_service
 
+
 @pytest.fixture(scope="session")
 def _deb_package_signing_service_name(
     bindings_cfg,
@@ -767,7 +770,7 @@ def _deb_package_signing_service_name(
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )
-    
+
     assert completed_process.returncode == 0
 
     yield service_name
@@ -785,9 +788,9 @@ def _deb_package_signing_service_name(
         stderr=subprocess.PIPE,
     )
 
+
 @pytest.fixture
 def deb_package_signing_service(_deb_package_signing_service_name, pulpcore_bindings):
     return pulpcore_bindings.SigningServicesApi.list(
         name=_deb_package_signing_service_name
     ).results[0]
-

pulp_deb/tests/functional/constants.py

@@ -451,12 +451,12 @@ def _clean_dict(d):
 export GNUPGHOME="HOMEDIRHERE"
 GPG_NAME="${PULP_SIGNING_KEY_FINGERPRINT}"
 
-
 # Sign the package
 tmpdir=$(mktemp -d)
 ctrl=$(ar t "$1" | grep -m1 '^control\.tar\.')
 data=$(ar t "$1" | grep -m1 '^data\.tar\.')
-ar p "$1" debian-binary "$ctrl" "$data" | gpg --openpgp --detach-sign --default-key "$GPG_NAME" > "$tmpdir/_gpgorigin"
+ar p "$1" debian-binary "$ctrl" "$data" | \
+    gpg --openpgp --detach-sign --default-key "$GPG_NAME" > "$tmpdir/_gpgorigin"
 ar r "$1" "$tmpdir/_gpgorigin" >/dev/null
 
 # Check the exit status