Upstream patch

Author: jobselko

.ci/assets/keys/test-key-private.pem

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDLYCPSdloA94Te
++68CLqtHJ3qTKttyWyM1uHkcb+AEAExtQGLoKtysmE2QQz8xwpiBKsByAlPTAHZZ
+pYIGzof45xEwiRzBqKxE4um1Uhtq+WCth96UeUkjz2G0xMxkFycjHDdpQQ92Hlg+
+mvU8VOrs4Xi7PvG5E+lTY7zez89QQ2ZY3OcbFSHVkC1b0COjYqJ7m5TmVWaRyNbW
+Nn+00/uZ+hFzcsxAuKa9B9s4ngWELLA1TnWp5yi4q2Pkold4prI3PwF7IfGWtrfo
+TgyzCKji12QLLjbd5KiKecGqx9zaV8xs7GnCif47JmOFAEDW5dtUstepH8ysy8wC
+IXoZYvOSOsOv2mVz99JikyaWeV0rjNk7p9UPrhiaGKOfzfn+g6bzCJYBlo425pmJ
+S/d1EoBoqgeCGniyLkFByQ9zDmzr1NlCkNKtNII1qNoRSMyqJY0qKPAd2bNMHUfT
+FB3Eb/AvcOjb4fa5kkxl4gMQwasNaFmDgusqt1JjHK4XcL8UIcvzGPj8LsDrx5iT
+HCFSF1gJvAXiLG0o6KFgrHfTBw2V3mxaKZNGr2NA5IMTs2UeGud590VmSvsKhr6R
+tekHHGLCrZT9kPxbicBq6OZOhSb0usSpclSvwMzMSIOFNzACXq33nPYqlY0r1vGN
+5Gi2P9W2CxAYbnOGgqpzHbt4YoLVrQIDAQABAoICAA2SR3xZPtL8XCGFKhM7NLLK
+2k3NI60TPTDt3nxx+sD0RCVbkT4XniI7skauNh6xSFFWSQFSpnADgoz46R8LKTJd
+jl1uyOcjb7DTyO9l9e5tixtetbuysZlyJ/2oJFDe5VMHzwAhwfu1NVj4KOVIcA+J
+UZqCg3RA9TuwrCnc3uNm8VgnZZn+ZFjxW2raY4ZuTpQbuGlRHvHGNTqWPcS+C0wl
+zoRQZNDs1t5GZ+/0m5RLvHZ82zKQpRGts5IjmIgJ7QVCxGvdwqwMBWRl0PMhi3jt
+EVVYVXuj2/C3BKAg4NwGf93E6PR9FjoG6x00/HQFYrLZkbVM1JuzUynRPL9KRcvz
+It1vxbmW71oWAXXkWcW7MHWR3n7LoQ8x0zcuf2A1PRuAG4zb8hTDyWud9d10NmSd
+eVrNjRix54kW54n39o82dR2heKSYkaM59Z/9NMAHevaZwyQvXwoXLJO4V4iL1GXJ
+JmDHd7yUtLTde/5H1jxUsNVvtkYqX4ePbqmw2cpcpu4dVMc4ivweValv6j3Ezokl
+J0LdU9pRhpUdA72pbyoij7+5mvdrBm87XM3el9Nf+RhhGAdRVx7jR1FjdWQXfcyW
+0LzuHafPL3ns9qQYaOt7LbgVyH08wRupcGKS9iPZM3Wmo7BYLy8fMT3YReum5+xq
+bIVvWv7eTUFRUir4thABAoIBAQDvdDd9gscmAtEMfZMFyowZw4K2NvlQ3l5TT0bH
+Gu9u4auratK5cGFJ/SQiBZqvyPT6E6q8HwxA6pVoagrGk+RYV0UiZDYdmBAvhQuG
+msEiInVn8RYZs+0LnGhOVOdJccvc/CyMnBRb7i3EHEycpV5NaOUxGKfbb0/oDDxS
+LcTLZ0L7ds7S4m9DY5AowJXCt/OQidpRidfgl5QbbTsKy+Gay2JjZ9vzee72guG0
+JBpSDlGKeJs/1u0MBM1clMLvEt9H1hR6Ru+KA28bSsJeRZfFvwTRB3Sz40izKAaJ
+u86wQitquryAnzdvigT2vaJB7ZeWxliU/Y/KYff/WNG5sipdAoIBAQDZbbg1XSHG
+rDsL6oCdHUWPIdqGS/DuuAn2g+YJ6+9HgN1hcFsRoJpDbem6F5W8tz9TCYXLJ/So
+pGQKIZwiWnt8QSBS5z3jCZytkzD87CPtO11f9SkB/oFb5NkAcWWx6WCZdNhbaWTL
+1Yq4Y0SLeFPt1mz1+dDerPO8EqYTH/N8t7nbJ1/HcoGXJZI7521mowQopqTuyZTG
+bLBCKYAcmTjYl3fZ1iC0i1+Poz7BGx+84Rknx+4V2Nze46PfzPS/7t5xw/+iQ7+K
+PRMdLydeUEbdEaCtwYCs2lkhw7Bu0SZLpt6mIluXdGUzjwt+TnBGcFqSDEFW8CLR
+zD/ijVOaZMORAoIBABKmCmxL8xaSwZUncnvQ+nhHMbbfMSuLJe13DxwSjPMlwCjp
+eN/YULtia536scFe9TVEstdT07B6lIg9OfmdKvt2UHwNMem8HgaVZgBlrQTrihk+
+PWpjCOMOm1D+a8Tch/P977pDrZI7SnUrfwv0FRQSR0c7lFcSpDZ+PXRo/BqbQCw1
+ZIYn/GJTLrb9yKwRh3aKReZzxcxIAdDhAOgmWLule1Qiko6zwFiSeOF+rk4Vr2QJ
+YI3oPy3gcd3z9/qGjb0afx3GyIEHI3AMsnaFFPzhk45z9jLMUK0jQN8ZMU+o15jI
+UkXyIG8fYKOWwTxBNL0ZVWzFEp3AY4APesXrikECggEAcZihZUADJYlWUCN0jqF8
+dgt54DBM8Gu2yNSgmw5pNTJed0n8SnleH1yNgGxSDwauTvPqsvltGa7JlYF50Xj0
+izZ7bNTjwHqFISqFrZ6yJn+diUTM5/3QF/K4bULRnuIPVh117ExkHRq0HyG97iAv
+uVMOGnUqayxxKxGTMuq+i6pxr84ifFGW4yD+Bc4jmjwRMCvgf+FRmVmvvOFxzX8/
+8+ku9OCqtakbhDAF2V4SdtwkCGSsPz3OJ6VHOOYb+SsTjNyZ8mzy5YaDNfws1Vmb
+rGRJTn6Ke8SYTMuwojUjjOLh8GqC794gAY/6sULJ5gNNToCYopNTncjYl8S+qSt8
+AQKCAQEAgWaRzjuVO4YJ/SAisaItnNov73PgdTM82fkB2uWip/zykdMPu4UKivOe
+5/OVKsDgKOdfCI3kP2I+/h//4aiW6JyHtXJkPojD9QLwPC887cmcc2A0726nhmoj
+VV5vZpJyTFPktxNc/snVID3uKT0uk4xfBAUNejRjlFFpC3fyxk3rB/0cG2UJWb0A
+VapDSXTg+S3kySS4uZbwW19jofDMqFfsVwlIFlMRSkE4jj5+Qs6/P1xnpAceIJVJ
+orG/DhLTqAwcRSjmNw/FpKNUbrFZ8NtUVU4XIEzvWmoqDMKrkiHMGOvfzU9jza1f
+Y3acysRQ2KI9Ero+Ga3hDfaohueVFg==
+-----END PRIVATE KEY-----

.ci/assets/keys/test-key.pem

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAy2Aj0nZaAPeE3vuvAi6r
+Ryd6kyrbclsjNbh5HG/gBABMbUBi6CrcrJhNkEM/McKYgSrAcgJT0wB2WaWCBs6H
++OcRMIkcwaisROLptVIbavlgrYfelHlJI89htMTMZBcnIxw3aUEPdh5YPpr1PFTq
+7OF4uz7xuRPpU2O83s/PUENmWNznGxUh1ZAtW9Ajo2Kie5uU5lVmkcjW1jZ/tNP7
+mfoRc3LMQLimvQfbOJ4FhCywNU51qecouKtj5KJXeKayNz8BeyHxlra36E4Mswio
+4tdkCy423eSoinnBqsfc2lfMbOxpwon+OyZjhQBA1uXbVLLXqR/MrMvMAiF6GWLz
+kjrDr9plc/fSYpMmlnldK4zZO6fVD64Ymhijn835/oOm8wiWAZaONuaZiUv3dRKA
+aKoHghp4si5BQckPcw5s69TZQpDSrTSCNajaEUjMqiWNKijwHdmzTB1H0xQdxG/w
+L3Do2+H2uZJMZeIDEMGrDWhZg4LrKrdSYxyuF3C/FCHL8xj4/C7A68eYkxwhUhdY
+CbwF4ixtKOihYKx30wcNld5sWimTRq9jQOSDE7NlHhrnefdFZkr7Coa+kbXpBxxi
+wq2U/ZD8W4nAaujmToUm9LrEqXJUr8DMzEiDhTcwAl6t95z2KpWNK9bxjeRotj/V
+tgsQGG5zhoKqcx27eGKC1a0CAwEAAQ==
+-----END PUBLIC KEY-----

.github/workflows/scripts/before_install.sh

@@ -50,7 +50,7 @@ legacy_component_name: "pulp_python"
 component_name: "python"
 component_version: "${COMPONENT_VERSION}"
 pulp_env: {}
-pulp_settings: {"allowed_export_paths": "/tmp", "allowed_import_paths": "/tmp", "api_root": "/pulp/", "orphan_protection_time": 0, "pypi_api_hostname": "https://pulp:443"}
+pulp_settings: {"allowed_export_paths": "/tmp", "allowed_import_paths": "/tmp", "api_root": "/pulp/", "attestation_verification_key": "/etc/pki/attestation/test-key.pem", "orphan_protection_time": 0, "pypi_api_hostname": "https://pulp:443"}
 pulp_scheme: "https"
 image:
   name: "pulp"
@@ -64,6 +64,10 @@ image:
 extra_files:
   - origin: "pulp_python"
     destination: "pulp_python"
+  - origin: "pulp_python/.ci/assets/keys/test-key.pem"
+    destination: "/etc/pki/attestation/test-key.pem"
+  - origin: "pulp_python/.ci/assets/keys/test-key-private.pem"
+    destination: "/etc/pki/attestation/test-key-private.pem"
 services:
   - name: "pulp"
     image: "pulp:ci_build"

CHANGES/1340.feature

@@ -0,0 +1 @@
+Added support for verifying SLSA attestations with a configured public key.

pulp_python/app/provenance.py

@@ -10,9 +10,10 @@
 from django.conf import settings
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic.alias_generators import to_snake
+from pypi_attestations import Attestation as _UpstreamAttestation
 from pypi_attestations import (
     Distribution,
-    Envelope,
+    Envelope,  # noqa - needed in module namespace for Pydantic model rebuild
     Publisher,
     VerificationError,
     VerificationMaterial,
@@ -57,24 +58,20 @@ def _as_policy(self):
 ExtendedPublisher = Annotated[_ExtendedPublisherUnion, Field(union_mode="left_to_right")]
 
 
-class Attestation(BaseModel):
-    """Attestation object as defined in PEP 740."""
-
-    version: Literal[1]
+class Attestation(_UpstreamAttestation):
     """
-    The attestation format's version, which is always 1.
+    Attestation object as defined in PEP 740.
+
+    Inherits from the upstream pypi_attestations.Attestation to keep Sigstore
+    verification methods (to_bundle, verify), but makes verification_material
+    optional to support attestations signed with a custom key instead of Sigstore.
     """
 
     verification_material: VerificationMaterial | None = None
     """
     Cryptographic materials used to verify `message_signature`.
     """
 
-    envelope: Envelope
-    """
-    The enveloped attestation statement and signature.
-    """
-
 
 class AttestationBundle(BaseModel):
     """
@@ -184,7 +181,14 @@ def _verify_signature(attestation, public_key):
 
 
 def verify_provenance(filename, sha256, provenance, offline=True):
-    """Verify the provenance object is valid for the package."""
+    """Verify the provenance object is valid for the package.
+
+    Attestations with valid Sigstore certificates are verified through the
+    standard Sigstore path. Attestations without certificates are verified
+    against a custom public key configured via ATTESTATION_VERIFICATION_KEY.
+    Currently, it supports RSA PKCS1v15 signatures and SLSA v0.2 provenance
+    publisher enrichment.
+    """
     dist = Distribution(name=filename, digest=sha256)
     verification_key = _load_verification_key()
     for bundle in provenance.attestation_bundles:
@@ -202,7 +206,7 @@ def verify_provenance(filename, sha256, provenance, offline=True):
                 if verification_key:
                     _verify_signature(attestation, verification_key)
                 else:
-                    log.warning(
-                        "Attestation without valid certificate accepted without "
-                        "signature verification (ATTESTATION_VERIFICATION_KEY not set)"
+                    raise VerificationError(
+                        "Attestation has no Sigstore certificate and no custom "
+                        "verification key is configured (ATTESTATION_VERIFICATION_KEY)"
                     )

…ctional/api/test_konflux_attestations.py …functional/api/test_slsa_attestations.pypulp_python/tests/functional/api/test_konflux_attestations.py renamed to pulp_python/tests/functional/api/test_slsa_attestations.py pulp_python/tests/functional/api/test_konflux_attestations.py renamed to pulp_python/tests/functional/api/test_slsa_attestations.py

@@ -1,10 +1,9 @@
-"""Functional tests for Konflux-style attestation verification.
+"""Functional tests for SLSA provenance attestation verification.
 
 These tests exercise the attestation / provenance upload paths with
-attestations that carry an RSA signature instead of a Sigstore certificate,
-mirroring the format produced by Konflux / Calunga builds.
+attestations that carry an RSA signature instead of a Sigstore certificate.
 
-The test signing key is generated at image build time and the matching
+A static test keypair is shipped in .ci/assets/keys/ and the matching
 public key is configured as PULP_ATTESTATION_VERIFICATION_KEY so that
 signature verification is fully exercised end-to-end.
 """
@@ -31,7 +30,7 @@
 
 
 def _build_statement(filename, sha256):
-    """Build a minimal in-toto statement for a Konflux attestation."""
+    """Build a minimal in-toto statement for an SLSA attestation."""
     return json.dumps(
         {
             "_type": "https://in-toto.io/Statement/v0.1",
@@ -69,7 +68,7 @@ def _b64(data: bytes) -> str:
 
 
 def _make_attestation(statement_bytes, signature_bytes):
-    """Return a single PEP-740 Attestation dict (Konflux flavour)."""
+    """Return a single PEP-740 Attestation dict (SLSA flavour)."""
     return {
         "version": 1,
         "verification_material": None,
@@ -128,10 +127,10 @@ def _write(provenance_dict):
 # ---------------------------------------------------------------------------
 
 
-def test_konflux_provenance_stored(
+def test_slsa_provenance_stored(
     python_bindings, python_content_factory, monitor_task, test_private_key, _provenance_file
 ):
-    """A Konflux-style provenance is accepted and stored when verify=True."""
+    """An SLSA provenance is accepted and stored when verify=True."""
     content = python_content_factory()
 
     stmt = _build_statement(content.filename, content.sha256)
@@ -155,10 +154,10 @@ def test_konflux_provenance_stored(
     assert publisher["kind"] == "Konflux"
 
 
-def test_konflux_wrong_subject_name_rejected(
+def test_slsa_wrong_subject_name_rejected(
     python_bindings, python_content_factory, monitor_task, test_private_key, _provenance_file
 ):
-    """Verification rejects a Konflux attestation whose subject name does not match."""
+    """Verification rejects an SLSA attestation whose subject name does not match."""
     content = python_content_factory()
 
     wrong_name = "wrong-package-0.1.tar.gz"
@@ -177,10 +176,10 @@ def test_konflux_wrong_subject_name_rejected(
     assert "subject does not match distribution name" in exc_info.value.task.error["description"]
 
 
-def test_konflux_wrong_digest_rejected(
+def test_slsa_wrong_digest_rejected(
     python_bindings, python_content_factory, monitor_task, test_private_key, _provenance_file
 ):
-    """Verification rejects a Konflux attestation whose digest does not match."""
+    """Verification rejects an SLSA attestation whose digest does not match."""
     content = python_content_factory()
 
     bad_digest = "0" * 64
@@ -199,10 +198,10 @@ def test_konflux_wrong_digest_rejected(
     assert "subject does not match distribution digest" in exc_info.value.task.error["description"]
 
 
-def test_konflux_bad_signature_rejected(
+def test_slsa_bad_signature_rejected(
     python_bindings, python_content_factory, monitor_task, test_private_key, _provenance_file
 ):
-    """An attestation with a valid subject but tampered signature is rejected."""
+    """An SLSA attestation with a valid subject but tampered signature is rejected."""
     content = python_content_factory()
 
     stmt = _build_statement(content.filename, content.sha256)
@@ -221,10 +220,10 @@ def test_konflux_bad_signature_rejected(
     assert "signature verification failed" in exc_info.value.task.error["description"]
 
 
-def test_konflux_attestation_via_content_upload(
+def test_slsa_attestation_via_content_upload(
     python_bindings, python_content_factory, monitor_task, test_private_key
 ):
-    """Konflux-style attestations can be uploaded alongside a package via the content API."""
+    """SLSA attestations can be uploaded alongside a package via the content API."""
     content = python_content_factory()
 
     stmt = _build_statement(content.filename, content.sha256)

template_config.yml

@@ -20,7 +20,11 @@ deploy_client_to_rubygems: true
 deploy_to_pypi: true
 disabled_redis_runners: []
 docker_fixtures: false
-extra_files: []
+extra_files:
+  - origin: "pulp_python/.ci/assets/keys/test-key.pem"
+    destination: "/etc/pki/attestation/test-key.pem"
+  - origin: "pulp_python/.ci/assets/keys/test-key-private.pem"
+    destination: "/etc/pki/attestation/test-key-private.pem"
 github_org: "pulp"
 latest_release_branch: "3.33"
 lint_ignore: []
@@ -43,6 +47,7 @@ pulp_settings:
   allowed_import_paths: "/tmp"
   api_root: "/pulp/"
   orphan_protection_time: 0
+  attestation_verification_key: "/etc/pki/attestation/test-key.pem"
   pypi_api_hostname: "https://pulp:443"
 pulp_settings_azure:
   MEDIA_ROOT: ""