mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 14:36:15 -05:00
fix(ci): verify the signed COPR RPM digest (#719)
This commit is contained in:
1 parent
dc1376dbac
commit
92c19c55a3
2 files changed
+36
-18
No files matched your search
@@ -130,24 +130,31 @@ class OBSTests(unittest.TestCase):
|
|||||||
|
|
||||||
|
|
||||||
class CoprTests(unittest.TestCase):
|
class CoprTests(unittest.TestCase):
|
||||||
def test_migrated_repository_matches_exact_build_manifest(self):
|
def test_public_repository_must_match_the_selected_builds_signed_rpm(self):
|
||||||
checker = publication.Copr(arguments(build_id=42))
|
checker = publication.Copr(arguments(build_id=42))
|
||||||
build = {"ownername": "yuezk", "projectname": "globalprotect-openconnect",
|
build = {"ownername": "yuezk", "projectname": "globalprotect-openconnect",
|
||||||
"state": "succeeded", "source_package": {"name": "globalprotect-openconnect", "version": "3.0.1-1"},
|
"state": "succeeded", "source_package": {"name": "globalprotect-openconnect", "version": "3.0.1-1"},
|
||||||
"chroots": ["fedora-44-x86_64"], "repo_url": "https://repo"}
|
"chroots": ["fedora-44-x86_64"], "repo_url": "https://repo"}
|
||||||
status = {"state": "succeeded", "result_url": "https://results/42/"}
|
status = {"state": "succeeded", "result_url": "https://results/42/"}
|
||||||
package = {"name": "globalprotect-openconnect", "version": "3.0.1", "release": "1.fc44", "arch": "x86_64"}
|
digest = "a" * 64
|
||||||
primary = ET.fromstring('''<metadata xmlns="http://linux.duke.edu/metadata/common"><package>
|
artifacts = {"count": 1, "results": [{"release": "1.fc44", "sha256": digest}]}
|
||||||
<name>globalprotect-openconnect</name><arch>x86_64</arch><version ver="3.0.1" rel="1.fc44"/>
|
for release, published_digest, matches in [
|
||||||
|
("1.fc44", digest, True),
|
||||||
|
("1.fc44", "b" * 64, False),
|
||||||
|
("1.fc45", digest, False)]:
|
||||||
|
with self.subTest(release=release, published_digest=published_digest):
|
||||||
|
primary = ET.fromstring(f'''<metadata xmlns="http://linux.duke.edu/metadata/common"><package>
|
||||||
|
<name>globalprotect-openconnect</name><arch>x86_64</arch><version ver="3.0.1" rel="{release}"/>
|
||||||
|
<checksum type="sha256">{published_digest}</checksum>
|
||||||
<location href="Packages/g/globalprotect-openconnect-3.0.1-1.fc44.x86_64.rpm"/></package></metadata>''')
|
<location href="Packages/g/globalprotect-openconnect-3.0.1-1.fc44.x86_64.rpm"/></package></metadata>''')
|
||||||
with patch.object(publication, "api", side_effect=[build, status, {"packages": [package]}]), \
|
with patch.object(publication, "api", side_effect=[build, status, artifacts]) as api, \
|
||||||
patch.object(publication, "rpm_packages", return_value=primary):
|
patch.object(publication, "rpm_packages", return_value=primary):
|
||||||
|
if matches:
|
||||||
self.assertIn("1 targets built and published", checker.check())
|
self.assertIn("1 targets built and published", checker.check())
|
||||||
package["release"] = "1.fc45"
|
else:
|
||||||
with patch.object(publication, "api", side_effect=[build, status, {"packages": [package]}]), \
|
|
||||||
patch.object(publication, "rpm_packages", return_value=primary):
|
|
||||||
with self.assertRaisesRegex(publication.Pending, "Waiting for Copr build 42"):
|
with self.assertRaisesRegex(publication.Pending, "Waiting for Copr build 42"):
|
||||||
checker.check()
|
checker.check()
|
||||||
|
self.assertEqual(api.call_args.kwargs["pulp_label_select"], "build_id=42,chroot=fedora-44-x86_64")
|
||||||
|
|
||||||
def test_unselected_chroot_cannot_be_hidden_by_verification(self):
|
def test_unselected_chroot_cannot_be_hidden_by_verification(self):
|
||||||
checker = publication.Copr(arguments(build_id=42, chroots=["fedora-44-x86_64"]))
|
checker = publication.Copr(arguments(build_id=42, chroots=["fedora-44-x86_64"]))
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ def rpm_packages(base_url):
|
|||||||
return ET.fromstring(unpack(content, location))
|
return ET.fromstring(unpack(content, location))
|
||||||
|
|
||||||
|
|
||||||
def rpm_present(base_url, package, version, arch, release_matches):
|
def rpm_present(base_url, package, version, arch, release_matches, *, sha256=None):
|
||||||
namespace = {"rpm": "http://linux.duke.edu/metadata/common"}
|
namespace = {"rpm": "http://linux.duke.edu/metadata/common"}
|
||||||
for entry in rpm_packages(base_url).findall("rpm:package", namespace):
|
for entry in rpm_packages(base_url).findall("rpm:package", namespace):
|
||||||
info = entry.find("rpm:version", namespace)
|
info = entry.find("rpm:version", namespace)
|
||||||
@@ -92,6 +92,10 @@ def rpm_present(base_url, package, version, arch, release_matches):
|
|||||||
entry.findtext("rpm:arch", namespaces=namespace) != arch or
|
entry.findtext("rpm:arch", namespaces=namespace) != arch or
|
||||||
info.get("ver") != version or not release_matches(info.get("rel", ""))):
|
info.get("ver") != version or not release_matches(info.get("rel", ""))):
|
||||||
continue
|
continue
|
||||||
|
if sha256 is not None:
|
||||||
|
digest = entry.find("rpm:checksum[@type='sha256']", namespace)
|
||||||
|
if digest is None or digest.text != sha256:
|
||||||
|
continue
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -251,16 +255,23 @@ class Copr:
|
|||||||
raise Pending(f"Copr {chroot}: {status['state']}; {link}")
|
raise Pending(f"Copr {chroot}: {status['state']}; {link}")
|
||||||
base = build["repo_url"].rstrip("/") + "/" + chroot
|
base = build["repo_url"].rstrip("/") + "/" + chroot
|
||||||
arch = chroot.rsplit("-", 1)[1]
|
arch = chroot.rsplit("-", 1)[1]
|
||||||
packages = api(urljoin(status["result_url"], "results.json"))["packages"]
|
# Pulp labels the signed RPM with the producing build and chroot.
|
||||||
package = next((item for item in packages
|
artifacts = api("https://packages.redhat.com/api/pulp/public-copr/api/v3/content/rpm/packages/",
|
||||||
if item["name"] == args.package and item["version"] == args.version
|
pulp_label_select=f"build_id={args.build_id},chroot={chroot}",
|
||||||
and item["arch"] == arch
|
name=args.package, version=args.version, arch=arch, fields="release,sha256")
|
||||||
and (item["release"] == args.revision
|
if not artifacts["count"]:
|
||||||
or item["release"].startswith(args.revision + "."))), None)
|
raise Pending(f"Waiting for the signed RPM from Copr build {args.build_id} for {chroot}")
|
||||||
if package is None:
|
if artifacts["count"] != 1:
|
||||||
raise Failed(f"Copr build {args.build_id} has no requested package for {chroot}")
|
raise Failed(f"Ambiguous RPMs from Copr build {args.build_id} for {chroot}")
|
||||||
|
artifact = artifacts["results"][0]
|
||||||
|
release = artifact["release"]
|
||||||
|
if release != args.revision and not release.startswith(args.revision + "."):
|
||||||
|
raise Failed(f"Copr build {args.build_id} has an unexpected RPM revision for {chroot}")
|
||||||
|
digest = artifact["sha256"]
|
||||||
|
if not digest or not re.fullmatch(r"[0-9a-f]{64}", digest):
|
||||||
|
raise Failed(f"Missing signed RPM checksum for Copr build {args.build_id} for {chroot}")
|
||||||
if not rpm_present(base, args.package, args.version, arch,
|
if not rpm_present(base, args.package, args.version, arch,
|
||||||
lambda release: release == package["release"]):
|
lambda value: value == release, sha256=digest):
|
||||||
raise Pending(f"Waiting for Copr build {args.build_id} in {base}")
|
raise Pending(f"Waiting for Copr build {args.build_id} in {base}")
|
||||||
return f"Copr build {args.build_id}: {len(build['chroots'])} targets built and published; {link}"
|
return f"Copr build {args.build_id}: {len(build['chroots'])} targets built and published; {link}"
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user