Key alias support [RHELDST-35396]

For PQC signed RPMs (not only), Errata tool API will provide a string called
"key alias" on `sig_key` field in format "name1,name2,...". In order support
this following changes are now implemented:
* For Errata source:
** replace `,` with `+` in string provided from `sig_key` field, this is
   later provided to Koji source as a signing key argument.
* For Koji source:
** keep backwards compatible behavior for parsing `signing_key` argument
** replace `+` with `,` for each value in `signing_key` (later used for
   path to RPM file)
** extract signing key ID from RPM headers every time as we don't know
   whether caller passed alias or actual key ID, as the alias can be
   formed as one name only ("sig_key":"alias_name")

Author: rbikar

src/pushsource/_impl/backend/errata_source/errata_source.py

@@ -415,6 +415,11 @@ def _filter_rpms_by_arch(self, erratum, rpm_filenames):
     def _rpm_push_items_from_build(self, erratum, build_nvr, build_info):
         rpms = build_info.get("rpms") or {}
         signing_key = build_info.get("sig_key") or None
+        if signing_key:
+            # Errata Tool API may return key alias in sig_key field in format "name1,name2,...", but 
+            # we need to convert "," into "+" otherwise it would be used as multiple keys for Koji 
+            # source which would result in incorrect processing.
+            signing_key = signing_key.replace(",", "+")
         sha256sums = (build_info.get("checksums") or {}).get("sha256") or {}
         md5sums = (build_info.get("checksums") or {}).get("md5") or {}
 

src/pushsource/_impl/backend/koji_source.py

@@ -10,6 +10,15 @@
 import koji
 from more_executors import Executors
 from more_executors.futures import f_map
+try:
+    from kobo import rpmlib
+except Exception as ex:  # pragma: no cover, pylint: disable=broad-except
+    # If kobo.rpmlib is unavailable, let's not immediately crash.
+    # We will hold this exception and re-raise it only if there's an
+    # attempt to use the related functionality.
+    from .. import broken_rpmlib as rpmlib
+
+    rpmlib.CAUSE = ex
 
 from ..source import Source
 from ..model import (
@@ -181,7 +190,9 @@ def __init__(
             signing_key (list[str])
                 GPG signing key ID(s). If provided, content must be signed
                 using one of the provided keys. Include ``None`` if unsigned
-                should also be permitted.
+                should also be permitted. 
+                
+                Supports also key alias in the format ``name1+name2+...``
 
                 Keys should be listed in the order of preference.
 
@@ -216,7 +227,7 @@ def __init__(
         )
         self._container_build = [try_int(x) for x in list_argument(container_build)]
         self._vmi_build = [try_int(x) for x in list_argument(vmi_build)]
-        self._signing_key = list_argument(signing_key)
+        self._signing_key = self._parse_signing_key(list_argument(signing_key))
         self._dest = list_argument(dest)
         self._timeout = timeout
         self._pathinfo = koji.PathInfo(basedir)
@@ -251,6 +262,15 @@ def _koji_session(self):
                 tls.koji_session = koji.ClientSession(self._url, {"anon_retry": True})
         return tls.koji_session
 
+    def _parse_signing_key(self, keys):
+        out = []
+        for key in keys:
+            if key:
+                out.append(key.replace("+", ",")) # adjust alias to comma separated names of keys
+            else:
+                out.append(key)
+        return out
+
     def _koji_check(self):
         # Do a basic connection check with koji.
         # If this succeeds, we can be reasonably sure that the koji connection is
@@ -309,7 +329,7 @@ def _push_items_from_rpm_meta(self, rpm, meta):
             candidate = unsigned_path
 
         wait_exist(candidate, timeout, poll_rate)
-
+        #import pdb; pdb.set_trace()
         # If signing keys requested, try them in order of preference
         # Some key should be present at this stage, let's try them all
         for key in self._signing_key:
@@ -321,7 +341,10 @@ def _push_items_from_rpm_meta(self, rpm, meta):
             candidate_paths.append(candidate)
             if os.path.exists(candidate):
                 rpm_path = candidate
-                rpm_signing_key = key
+                # we may only get key alias as input, let's extract actual key ID from RPM header in all cases
+                # as we don't know if the provided data are alias or actual key ID
+                header = rpmlib.get_rpm_header(candidate)
+                rpm_signing_key = rpmlib.get_keys_from_header(header)
                 break
 
         if self._signing_key:

tests/errata/data/RHSA-2020:0509-sig-key-alias.yaml

@@ -0,0 +1,185 @@
+advisory_id: RHSA-2020:0509-sig-key-alias
+cdn_file_list:
+  sudo-1.8.25p1-4.el8_0.3:
+    checksums:
+      md5:
+        sudo-1.8.25p1-4.el8_0.3.ppc64le.rpm: 0d56f302617696d3511e71e1669e62c0
+        sudo-1.8.25p1-4.el8_0.3.src.rpm: f94ab3724b498e3faeab643fe2a67c9c
+        sudo-1.8.25p1-4.el8_0.3.x86_64.rpm: 25e9470c4fe96034fe1d7525c04b5d8e
+        sudo-debuginfo-1.8.25p1-4.el8_0.3.ppc64le.rpm: e242826fb38f487502cdc1f1a06991d2
+        sudo-debuginfo-1.8.25p1-4.el8_0.3.x86_64.rpm: 91126f02975c06015880d6ea99cb2760
+        sudo-debugsource-1.8.25p1-4.el8_0.3.ppc64le.rpm: d6da7e2e3d9efe050fef2e8d047682be
+        sudo-debugsource-1.8.25p1-4.el8_0.3.x86_64.rpm: 6b0967941c0caf626c073dc7da0272b6
+      sha256:
+        sudo-1.8.25p1-4.el8_0.3.ppc64le.rpm: 31c4f73af90c6d267cc5281c59e4a93ae3557b2253d9a8e3fef55f3cafca6e54
+        sudo-1.8.25p1-4.el8_0.3.src.rpm: 10d7724302a60d0d2ca890fc7834b8143df55ba1ce0176469ea634ac4ab7aa28
+        sudo-1.8.25p1-4.el8_0.3.x86_64.rpm: 593f872c1869f7beb963c8df2945fc691a1d999945c8c45c6bc7e02731fa016f
+        sudo-debuginfo-1.8.25p1-4.el8_0.3.ppc64le.rpm: 04db0c39efb31518ff79bf98d1c27256d46cdc72b967a5b2094a6efec3166df2
+        sudo-debuginfo-1.8.25p1-4.el8_0.3.x86_64.rpm: 1b7d3a7613236ffea7c4553eb9dea69fc19557005ac3a059d7e83efc08c5b754
+        sudo-debugsource-1.8.25p1-4.el8_0.3.ppc64le.rpm: 355cbb9dc348b17782cff57120391685d6a1f6884facc54fac4b7fb54abeffba
+        sudo-debugsource-1.8.25p1-4.el8_0.3.x86_64.rpm: 43e318fa49e4df685ea0d5f0925a00a336236b2e20f27f9365c39a48102c2cf6
+    rpms:
+      sudo-1.8.25p1-4.el8_0.3.ppc64le.rpm:
+      - rhel-8-for-ppc64le-baseos-e4s-rpms__8_DOT_0
+      sudo-1.8.25p1-4.el8_0.3.src.rpm:
+      - rhel-8-for-ppc64le-baseos-e4s-source-rpms__8_DOT_0
+      - rhel-8-for-x86_64-baseos-e4s-source-rpms__8_DOT_0
+      sudo-1.8.25p1-4.el8_0.3.x86_64.rpm:
+      - rhel-8-for-x86_64-baseos-e4s-rpms__8_DOT_0
+      sudo-debuginfo-1.8.25p1-4.el8_0.3.ppc64le.rpm:
+      - rhel-8-for-ppc64le-baseos-e4s-debug-rpms__8_DOT_0
+      sudo-debuginfo-1.8.25p1-4.el8_0.3.x86_64.rpm:
+      - rhel-8-for-x86_64-baseos-e4s-debug-rpms__8_DOT_0
+      sudo-debugsource-1.8.25p1-4.el8_0.3.ppc64le.rpm:
+      - rhel-8-for-ppc64le-baseos-e4s-debug-rpms__8_DOT_0
+      sudo-debugsource-1.8.25p1-4.el8_0.3.x86_64.rpm:
+      - rhel-8-for-x86_64-baseos-e4s-debug-rpms__8_DOT_0
+    sig_key: foo,bar,baz
+cdn_metadata:
+  description: 'The sudo packages contain the sudo utility which allows system administrators
+    to provide certain users with the permission to execute privileged commands, which
+    are used for system management purposes, without having to log in as root.
+
+
+    Security Fix(es):
+
+
+    * sudo: Stack based buffer overflow when pwfeedback is enabled (CVE-2019-18634)
+
+
+    For more details about the security issue(s), including the impact, a CVSS score,
+    acknowledgments, and other related information, refer to the CVE page(s) listed
+    in the References section.'
+  from: [email protected]
+  id: RHSA-2020:0509
+  issued: 2020-02-13 19:00:11 UTC
+  pkglist:
+  - packages:
+    - arch: ppc64le
+      epoch: '0'
+      filename: sudo-1.8.25p1-4.el8_0.3.ppc64le.rpm
+      name: sudo
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      sum:
+      - md5
+      - 0d56f302617696d3511e71e1669e62c0
+      - sha256
+      - 31c4f73af90c6d267cc5281c59e4a93ae3557b2253d9a8e3fef55f3cafca6e54
+      version: 1.8.25p1
+    - arch: SRPMS
+      epoch: '0'
+      filename: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      name: sudo
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      sum:
+      - md5
+      - f94ab3724b498e3faeab643fe2a67c9c
+      - sha256
+      - 10d7724302a60d0d2ca890fc7834b8143df55ba1ce0176469ea634ac4ab7aa28
+      version: 1.8.25p1
+    - arch: x86_64
+      epoch: '0'
+      filename: sudo-1.8.25p1-4.el8_0.3.x86_64.rpm
+      name: sudo
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      sum:
+      - md5
+      - 25e9470c4fe96034fe1d7525c04b5d8e
+      - sha256
+      - 593f872c1869f7beb963c8df2945fc691a1d999945c8c45c6bc7e02731fa016f
+      version: 1.8.25p1
+    - arch: ppc64le
+      epoch: '0'
+      filename: sudo-debuginfo-1.8.25p1-4.el8_0.3.ppc64le.rpm
+      name: sudo-debuginfo
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      sum:
+      - md5
+      - e242826fb38f487502cdc1f1a06991d2
+      - sha256
+      - 04db0c39efb31518ff79bf98d1c27256d46cdc72b967a5b2094a6efec3166df2
+      version: 1.8.25p1
+    - arch: x86_64
+      epoch: '0'
+      filename: sudo-debuginfo-1.8.25p1-4.el8_0.3.x86_64.rpm
+      name: sudo-debuginfo
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      sum:
+      - md5
+      - 91126f02975c06015880d6ea99cb2760
+      - sha256
+      - 1b7d3a7613236ffea7c4553eb9dea69fc19557005ac3a059d7e83efc08c5b754
+      version: 1.8.25p1
+    - arch: ppc64le
+      epoch: '0'
+      filename: sudo-debugsource-1.8.25p1-4.el8_0.3.ppc64le.rpm
+      name: sudo-debugsource
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      reboot_suggested: true
+      sum:
+      - md5
+      - d6da7e2e3d9efe050fef2e8d047682be
+      - sha256
+      - 355cbb9dc348b17782cff57120391685d6a1f6884facc54fac4b7fb54abeffba
+      version: 1.8.25p1
+    - arch: x86_64
+      epoch: '0'
+      filename: sudo-debugsource-1.8.25p1-4.el8_0.3.x86_64.rpm
+      name: sudo-debugsource
+      release: 4.el8_0.3
+      src: sudo-1.8.25p1-4.el8_0.3.src.rpm
+      sum:
+      - md5
+      - 6b0967941c0caf626c073dc7da0272b6
+      - sha256
+      - 43e318fa49e4df685ea0d5f0925a00a336236b2e20f27f9365c39a48102c2cf6
+      version: 1.8.25p1
+  pulp_user_metadata:
+    content_types:
+    - rpm
+  pushcount: '3'
+  reboot_suggested: false
+  references:
+  - href: https://access.redhat.com/errata/RHSA-2020:0509
+    id: null
+    title: RHSA-2020:0509
+    type: self
+  - href: https://bugzilla.redhat.com/show_bug.cgi?id=1796944
+    id: '1796944'
+    title: 'CVE-2019-18634 sudo: Stack based buffer overflow when pwfeedback is enabled'
+    type: bugzilla
+  - href: https://www.redhat.com/security/data/cve/CVE-2019-18634.html
+    id: CVE-2019-18634
+    title: CVE-2019-18634
+    type: cve
+  - href: https://access.redhat.com/security/updates/classification/#important
+    id: classification
+    title: important
+    type: other
+  release: '0'
+  rights: Copyright 2020 Red Hat Inc
+  severity: Important
+  solution: 'For details on how to apply this update, which includes the changes described
+    in this advisory, refer to:
+
+
+    https://access.redhat.com/articles/11258'
+  status: final
+  summary: 'An update for sudo is now available for Red Hat Enterprise Linux 8.0 Update
+    Services for SAP Solutions.
+
+
+    Red Hat Product Security has rated this update as having a security impact of
+    Important. A Common Vulnerability Scoring System (CVSS) base score, which gives
+    a detailed severity rating, is available for each vulnerability from the CVE link(s)
+    in the References section.'
+  title: 'Important: sudo security update'
+  type: security
+  updated: 2020-02-13 19:00:11 UTC
+  version: '3'

tests/errata/test_errata_missing_modules.py

@@ -1,9 +1,11 @@
 from pytest import raises
-
+from mock import patch
 from pushsource import Source
 
 
-def test_errata_modules_via_koji(fake_errata_tool, fake_koji, koji_dir):
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_keys_from_header", return_value="fd431d51")
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_rpm_header")
+def test_errata_modules_via_koji(mock_get_rpm_header, mock_get_keys_from_headers, fake_errata_tool, fake_koji, koji_dir):
     """Errata source gives an error if ET requested modules which don't exist in koji"""
 
     source = Source.get(

tests/errata/test_errata_module_sources.py

@@ -3,7 +3,7 @@
 import pytest
 
 from pushsource import Source, ModuleMdSourcePushItem
-
+from mock import patch
 
 @pytest.fixture
 def source_factory(fake_errata_tool, fake_koji, koji_dir):
@@ -161,8 +161,9 @@ def source_factory(fake_errata_tool, fake_koji, koji_dir):
 
     yield ctor
 
-
-def test_errata_module_sources(source_factory, koji_dir):
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_keys_from_header", return_value="fd431d51")
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_rpm_header")
+def test_errata_module_sources(mock_get_rpm_header, mock_get_keys_from_headers, source_factory, koji_dir):
     """Errata source can provide ModuleMdSourcePushItems, typical scenario."""
 
     source = source_factory(errata="RHEA-2020:0346")
@@ -193,8 +194,9 @@ def test_errata_module_sources(source_factory, koji_dir):
         )
     ]
 
-
-def test_errata_module_sources_no_ftp_paths(source_factory):
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_keys_from_header", return_value="fd431d51")
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_rpm_header")
+def test_errata_module_sources_no_ftp_paths(mock_get_rpm_header, mock_get_keys_from_headers, source_factory):
     """Errata source skips ModuleMdSourcePushItems if ET does not request any
     FTP paths for modules."""
 
@@ -207,8 +209,9 @@ def test_errata_module_sources_no_ftp_paths(source_factory):
     # Should not have found anything since ET reported no dests for modules in FTP paths
     assert src_items == []
 
-
-def test_errata_module_sources_no_cdn_list(source_factory, caplog):
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_keys_from_header", return_value="fd431d51")
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_rpm_header")
+def test_errata_module_sources_no_cdn_list(mock_get_rpm_header, mock_get_keys_from_headers, source_factory, caplog):
     """Errata source skips ModuleMdSourcePushItems if ET does not present those
     modules in get_advisory_cdn_file_list."""
 
@@ -228,8 +231,9 @@ def test_errata_module_sources_no_cdn_list(source_factory, caplog):
         in caplog.text
     )
 
-
-def test_errata_module_missing_sources(source_factory, fake_koji):
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_keys_from_header", return_value="fd431d51")
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_rpm_header")
+def test_errata_module_missing_sources(mock_get_rpm_header, mock_get_keys_from_headers, source_factory, fake_koji):
     """Errata source gives fatal error if ET requests some FTP paths for modules,
     yet no module sources exist on koji build."""
     source = source_factory(errata="RHEA-2020:0346")

tests/errata/test_errata_modules.py

@@ -1,5 +1,5 @@
 import os
-
+from mock import patch
 from pushsource import (
     Source,
     ErratumPushItem,
@@ -10,8 +10,9 @@
     ModuleMdPushItem,
 )
 
-
-def test_errata_modules_via_koji(fake_errata_tool, fake_koji, koji_dir):
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_keys_from_header", return_value="fd431d51")
+@patch("pushsource._impl.backend.koji_source.rpmlib.get_rpm_header")
+def test_errata_modules_via_koji(mock_get_rpm_header, mock_get_keys_from_headers, fake_errata_tool, fake_koji, koji_dir):
     """Errata source containing a module yields modules & RPMs taken
     from koji source"""