commit:     f7af6081f5478bebe8a644c76f85f821f2d2a149
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  6 21:58:09 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  6 22:03:37 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7af6081

sec-keys/openpgp-keys-gentoo-infrastructure: new package, add 20260202, 99999999

Bug: https://bugs.gentoo.org/834329
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../openpgp-keys-gentoo-infrastructure/Manifest    |   1 +
 .../files/keyring-mangler.py                       | 104 +++++++++
 .../metadata.xml                                   |   9 +
 ...npgp-keys-gentoo-infrastructure-20260202.ebuild | 236 +++++++++++++++++++++
 ...npgp-keys-gentoo-infrastructure-99999999.ebuild | 236 +++++++++++++++++++++
 5 files changed, 586 insertions(+)

diff --git a/sec-keys/openpgp-keys-gentoo-infrastructure/Manifest 
b/sec-keys/openpgp-keys-gentoo-infrastructure/Manifest
new file mode 100644
index 000000000000..0480a89f3282
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-infrastructure/Manifest
@@ -0,0 +1 @@
+DIST openpgp-keys-gentoo-infrastructure-20260202-infra-devs.gpg 297079 BLAKE2B 
5c265c5a716b3e00c5c5bacfef72d01f73e40166c185ea723b3b3f80f0aba45563715b3bc492559a717abbfa99b7842a46c03f182bd4dee2a83d5e89628eb108
 SHA512 
4a7a42fb83e50643b6c7a42d1dcc4a235620e88f8931778fab1fc02f9361b276ce4a2e42a546c717c47c33e4492ac483027f9fdaf8b2288854c910de29f06931

diff --git 
a/sec-keys/openpgp-keys-gentoo-infrastructure/files/keyring-mangler.py 
b/sec-keys/openpgp-keys-gentoo-infrastructure/files/keyring-mangler.py
new file mode 100644
index 000000000000..d78101038d1e
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-infrastructure/files/keyring-mangler.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+#
+# Distributed under the terms of the GNU General Public License v2
+#
+# Takes as input:
+# 1. authority keys as gentoo-auth.asc (sec-keys/openpgp-keys-gentoo-auth);
+# 2. a downloaded, unverified bundle of active infra developers from 
qa-reports.gentoo.org (https://qa-reports.gentoo.org/output/infra-devs.gpg);
+#    but this must be converted to ASCII first(!), and
+# 3. an output file (armored).
+#
+# Outputs armored keyring with all expired keys dropped and all keys without
+# a signature from the L2 infrastructure key dropped.
+#
+# Usage: python keyring-mangler.py <gentoo-auth.asc> <infra-devs.gpg> <output 
for armored keys.asc>
+from xml.dom import ValidationErr
+
+import gnupg
+import os
+import sys
+
+AUTHORITY_KEYS = [
+    # Gentoo Authority Key L1
+    "ABD00913019D6354BA1D9A132839FE0D796198B1",
+    # Gentoo Authority Key L2 for Infrastructure
+    "ABA5E4E7F4E407ABE9CA7EC7422C9066E21F705A",
+]
+SKIP_KEYS = [
+    # Gentoo Authority Key L2 for Services
+    "18F703D702B1B9591373148C55D3238EC050396E",
+    # Gentoo Authority Key L2 for Developers
+    "2C13823B8237310FA213034930D132FF0FF50EEB"
+]
+
+# logging.basicConfig(level=os.environ.get("LOGLEVEL", "DEBUG"))
+
+gentoo_auth = sys.argv[1]
+active_devs = sys.argv[2]
+armored_output = sys.argv[3]
+
+gpg = gnupg.GPG(verbose=False, gnupghome=os.environ["GNUPGHOME"], 
options="--auto-check-trustdb")
+gpg.encoding = "utf-8"
+
+with open(gentoo_auth, "r", encoding="utf8") as keyring:
+    keys = keyring.read()
+    gpg.import_keys(keys)
+
+gpg.trust_keys([AUTHORITY_KEYS[0]], "TRUST_ULTIMATE")
+
+with open(active_devs, "r", encoding="utf8") as keyring:
+    keys = keyring.read()
+    gpg.import_keys(keys)
+
+# print(keys)
+# print(gpg.list_keys)
+
+good_keys = []
+
+# TODO: Use new 'problems' key from python-gnupg-0.5.1?
+for key in gpg.list_keys(sigs=True):
+    print(f"Checking key={key['keyid']}, uids={key['uids']}")
+
+    # pprint.pprint(key)
+
+    if key["fingerprint"] in AUTHORITY_KEYS:
+        # Just add this in.
+        good_keys.append(key["fingerprint"])
+        continue
+    if key["fingerprint"] in SKIP_KEYS:
+        # We don't want the other L2 keys (e.g. developers) in here as we're 
filtering
+        # for infra members.
+        continue
+
+    # 
https://security.stackexchange.com/questions/41208/what-is-the-exact-meaning-of-this-gpg-output-regarding-trust
+    if key["trust"] == "e":
+        # If it's expired, drop the key, as we can't easily then
+        # verify it because of gpg limitations.
+        print(
+            f"Dropping expired {key['keyid']=}, {key['uids']=} (because this 
prevents validation)"
+        )
+        continue
+
+    if key["trust"] == "-":
+        print(f"Dropping {key['keyid']=}, {key['uids']=} because no trust 
calculated")
+        continue
+
+    if key["trust"] != "f":
+        print(
+            f"Dropping {key['keyid']=}, {key['uids']=} because not calculated 
as fully trusted"
+        )
+        continue
+
+    # As a sanity check, make sure each key has a signature from
+    # the L2 infrastructure signing key.
+    got_l2_signature = any(sig[0] == "422C9066E21F705A" for sig in key["sigs"])
+    if not got_l2_signature:
+        raise ValidationErr(f"{key['uids']=} lacks a signature from L2 key!")
+
+    good_keys.append(key["fingerprint"])
+
+if len(good_keys) <= len(AUTHORITY_KEYS):
+    raise RuntimeError("No valid infrastructure developer keys were found!")
+
+with open(armored_output, "w", encoding="utf8") as keyring:
+    keyring.write(gpg.export_keys(good_keys))

diff --git a/sec-keys/openpgp-keys-gentoo-infrastructure/metadata.xml 
b/sec-keys/openpgp-keys-gentoo-infrastructure/metadata.xml
new file mode 100644
index 000000000000..7efb31b9e7f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-infrastructure/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Sam James</name>
+       </maintainer>
+       <stabilize-allarches/>
+</pkgmetadata>

diff --git 
a/sec-keys/openpgp-keys-gentoo-infrastructure/openpgp-keys-gentoo-infrastructure-20260202.ebuild
 
b/sec-keys/openpgp-keys-gentoo-infrastructure/openpgp-keys-gentoo-infrastructure-20260202.ebuild
new file mode 100644
index 000000000000..fd20a4d09d10
--- /dev/null
+++ 
b/sec-keys/openpgp-keys-gentoo-infrastructure/openpgp-keys-gentoo-infrastructure-20260202.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/";
+if [[ ${PV} == 9999* ]] ; then
+       PROPERTIES="live"
+
+       BDEPEND="net-misc/curl"
+else
+       SRC_URI="https://qa-reports.gentoo.org/output/keys/infra-devs-${PV}.gpg 
-> ${P}-infra-devs.gpg"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~sparc ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+       $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+       || ( app-crypt/gnupg[nls] app-crypt/freepg[nls] )
+       >=sec-keys/openpgp-keys-gentoo-auth-20260206
+       test? (
+               sys-apps/grep[pcre]
+       )
+"
+
+python_check_deps() {
+       python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+       if [[ ${PV} == 9999* ]] ; then
+               curl https://qa-reports.gentoo.org/output/infra-devs.gpg -o 
${P}-infra-devs.gpg || die
+       else
+               default
+       fi
+}
+
+src_compile() {
+       export GNUPGHOME="${T}"/.gnupg
+
+       get_gpg_keyring_dir() {
+               if [[ ${PV} == 9999* ]] ; then
+                       echo "${WORKDIR}"
+               else
+                       echo "${DISTDIR}"
+               fi
+       }
+
+       local mygpgargs=(
+               --no-autostart
+               --no-default-keyring
+               --homedir "${GNUPGHOME}"
+       )
+
+       # From verify-sig.eclass:
+       # "GPG upstream knows better than to follow the spec, so we can't
+       # override this directory.  However, there is a clean fallback
+       # to GNUPGHOME."
+       addpredict /run/user
+
+       mkdir "${GNUPGHOME}" || die
+       chmod 700 "${GNUPGHOME}" || die
+
+       # Convert the binary keyring into an armored one so we can process it
+       edo gpg "${mygpgargs[@]}" --import 
"$(get_gpg_keyring_dir)"/${P}-infra-devs.gpg
+       edo gpg "${mygpgargs[@]}" --export --armor > 
"${WORKDIR}"/gentoo-infrastructure.asc
+
+       # Now strip out the keys which are expired and/or missing a signature
+       # from our L2 infrastructure authority key
+       edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+                       "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+                       "${WORKDIR}"/gentoo-infrastructure.asc \
+                       "${WORKDIR}"/gentoo-infrastructure-sanitised.asc
+}
+
+src_test() {
+       export GNUPGHOME="${T}"/tests/.gnupg
+
+       local mygpgargs=(
+               # We don't have --no-autostart here because we need
+               # to let it spawn an agent for the key generation.
+               --no-default-keyring
+               --homedir "${GNUPGHOME}"
+       )
+
+       # From verify-sig.eclass:
+       # "GPG upstream knows better than to follow the spec, so we can't
+       # override this directory.  However, there is a clean fallback
+       # to GNUPGHOME."
+       addpredict /run/user
+
+       # Check each of the keys to verify they're trusted by
+       # the L2 developer key.
+       mkdir -p "${GNUPGHOME}" || die
+       chmod 700 "${GNUPGHOME}" || die
+       cd "${T}"/tests || die
+
+       # First, grab the L1 key, and mark it as ultimately trusted.
+       edo gpg "${mygpgargs[@]}" --import 
"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+       edo gpg "${mygpgargs[@]}" --import-ownertrust 
"${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+       # Generate a temporary key which isn't signed by anything to check
+       # whether we're detecting unexpected keys.
+       #
+       # The test is whether this appears in the sanitised keyring we
+       # produce in src_compile (it should not be in there).
+       #
+       # 
https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+       edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+               %echo Generating temporary key for testing...
+
+               %no-protection
+               %transient-key
+               %pubring ${P}-ebuild-test-key.asc
+
+               Key-Type: 1
+               Key-Length: 2048
+               Subkey-Type: 1
+               Subkey-Length: 2048
+               Name-Real: Larry The Cow
+               Name-Email: [email protected]
+               Expire-Date: 0
+               Handle: ${P}-ebuild-test-key
+
+               %commit
+               %echo Temporary key generated!
+       EOF
+
+       # Import the new injected key that shouldn't be signed by anything into 
a temporary testing keyring
+       edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+       # Sign a tiny file with the to-be-injected key for testing rejection 
below
+       echo "Hello world!" > "${T}"/tests/signme || die
+       edo gpg "${mygpgargs[@]}" -u "Larry The Cow <[email protected]>" --sign 
"${T}"/tests/signme || die
+
+       # keyring-mangler will fail with no valid keys so import the sanitised 
list from src_compile.
+       edo gpg "${mygpgargs[@]}" --import 
"${WORKDIR}"/gentoo-infrastructure-sanitised.asc
+
+       edo gpg "${mygpgargs[@]}" --export --armor > 
"${T}"/tests/tainted-keyring.asc
+
+       # keyring-mangler.py should now produce a keyring *without* it
+       edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+                       "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+                       "${T}"/tests/tainted-keyring.asc \
+                       "${T}"/tests/gentoo-infrastructure-sanitised.asc | tee 
"${T}"/tests/keyring-mangler.log
+       assert "Key mangling in tests failed?"
+
+       # Check the log to verify the injected key got detected
+       grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log 
|| die "Did not remove injected key from test keyring!"
+
+       # gnupg doesn't have an easy way for us to actually just.. ask
+       # if a key is known via WoT. So, sign a file using the key
+       # we just made, and then try to gpg --verify it, and check exit code.
+       #
+       # Let's now double check by seeing if a file signed by the injected key
+       # is rejected.
+       if gpg "${mygpgargs[@]}" --keyring 
"${T}"/tests/gentoo-infrastructure-sanitised.asc --verify 
"${T}"/tests/signme.gpg ; then
+               die "'gpg --verify' using injected test key succeeded! This 
shouldn't happen!"
+       fi
+
+       # Bonus lame sanity check
+       edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee 
"${T}"/tests/trustdb.log
+       assert "trustdb call failed!"
+
+       check_trust_levels() {
+               local mode=${1}
+
+               while IFS= read -r line; do
+                       # gpg: depth: 0  valid:   1  signed:   2  trust: 0-, 
0q, 0n, 0m, 0f, 1u
+                       # gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 
0q, 0n, 0m, 2f, 0u
+                       if [[ ${line} == *depth* ]] ; then
+                               depth=$(echo ${line} | grep -Po "depth: [0-9]")
+                               trust=$(echo ${line} | grep -Po "trust:.*")
+
+                               trust_uncalculated=$(echo ${trust} | grep -Po 
"[0-9]-")
+                               [[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+                               trust_insufficient=$(echo ${trust} | grep -Po 
"[0-9]q")
+                               [[ ${trust_insufficient} == 0 ]] || ${mode}
+
+                               trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+                               [[ ${trust_never} == 0 ]] || ${mode}
+
+                               trust_marginal=$(echo ${trust} | grep -Po 
"[0-9]m")
+                               [[ ${trust_marginal} == 0 ]] || ${mode}
+
+                               trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+                               [[ ${trust_full} != 0 ]] || ${mode}
+
+                               trust_ultimate=$(echo ${trust} | grep -Po 
"[0-9]u")
+                               [[ ${trust_ultimate} == 1 ]] || ${mode}
+
+                               echo "${trust_uncalculated}, 
${trust_insufficient}"
+                       fi
+               done < "${T}"/tests/trustdb.log
+       }
+
+       # First, check with the bad key still in the test keyring.
+       # This is supposed to fail, so we want it to return 1
+       check_trust_levels "return 1" && die "Trustdb passed when it should 
have failed!"
+
+       # Now check without the bad key in the test keyring.
+       # This one should pass.
+       #
+       # Drop the bad key first 
(https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+       keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry 
The Cow <[email protected]>" \
+               | grep "^fpr" \
+               | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+       local key
+       for key in ${keys[@]} ; do
+               nonfatal edo gpg "${mygpgargs[@]}" --batch --yes 
--delete-secret-keys ${key}
+       done
+
+       edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow 
<[email protected]>"
+       check_trust_levels "return 0" || die "Trustdb failed when it should 
have passed!"
+
+       gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+       insinto /usr/share/openpgp-keys
+       newins gentoo-infrastructure-sanitised.asc gentoo-infrastructure.asc
+
+       # TODO: install an ownertrust file like 
sec-keys/openpgp-keys-gentoo-auth?
+}

diff --git 
a/sec-keys/openpgp-keys-gentoo-infrastructure/openpgp-keys-gentoo-infrastructure-99999999.ebuild
 
b/sec-keys/openpgp-keys-gentoo-infrastructure/openpgp-keys-gentoo-infrastructure-99999999.ebuild
new file mode 100644
index 000000000000..fd20a4d09d10
--- /dev/null
+++ 
b/sec-keys/openpgp-keys-gentoo-infrastructure/openpgp-keys-gentoo-infrastructure-99999999.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/";
+if [[ ${PV} == 9999* ]] ; then
+       PROPERTIES="live"
+
+       BDEPEND="net-misc/curl"
+else
+       SRC_URI="https://qa-reports.gentoo.org/output/keys/infra-devs-${PV}.gpg 
-> ${P}-infra-devs.gpg"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~sparc ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+       $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+       || ( app-crypt/gnupg[nls] app-crypt/freepg[nls] )
+       >=sec-keys/openpgp-keys-gentoo-auth-20260206
+       test? (
+               sys-apps/grep[pcre]
+       )
+"
+
+python_check_deps() {
+       python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+       if [[ ${PV} == 9999* ]] ; then
+               curl https://qa-reports.gentoo.org/output/infra-devs.gpg -o 
${P}-infra-devs.gpg || die
+       else
+               default
+       fi
+}
+
+src_compile() {
+       export GNUPGHOME="${T}"/.gnupg
+
+       get_gpg_keyring_dir() {
+               if [[ ${PV} == 9999* ]] ; then
+                       echo "${WORKDIR}"
+               else
+                       echo "${DISTDIR}"
+               fi
+       }
+
+       local mygpgargs=(
+               --no-autostart
+               --no-default-keyring
+               --homedir "${GNUPGHOME}"
+       )
+
+       # From verify-sig.eclass:
+       # "GPG upstream knows better than to follow the spec, so we can't
+       # override this directory.  However, there is a clean fallback
+       # to GNUPGHOME."
+       addpredict /run/user
+
+       mkdir "${GNUPGHOME}" || die
+       chmod 700 "${GNUPGHOME}" || die
+
+       # Convert the binary keyring into an armored one so we can process it
+       edo gpg "${mygpgargs[@]}" --import 
"$(get_gpg_keyring_dir)"/${P}-infra-devs.gpg
+       edo gpg "${mygpgargs[@]}" --export --armor > 
"${WORKDIR}"/gentoo-infrastructure.asc
+
+       # Now strip out the keys which are expired and/or missing a signature
+       # from our L2 infrastructure authority key
+       edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+                       "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+                       "${WORKDIR}"/gentoo-infrastructure.asc \
+                       "${WORKDIR}"/gentoo-infrastructure-sanitised.asc
+}
+
+src_test() {
+       export GNUPGHOME="${T}"/tests/.gnupg
+
+       local mygpgargs=(
+               # We don't have --no-autostart here because we need
+               # to let it spawn an agent for the key generation.
+               --no-default-keyring
+               --homedir "${GNUPGHOME}"
+       )
+
+       # From verify-sig.eclass:
+       # "GPG upstream knows better than to follow the spec, so we can't
+       # override this directory.  However, there is a clean fallback
+       # to GNUPGHOME."
+       addpredict /run/user
+
+       # Check each of the keys to verify they're trusted by
+       # the L2 developer key.
+       mkdir -p "${GNUPGHOME}" || die
+       chmod 700 "${GNUPGHOME}" || die
+       cd "${T}"/tests || die
+
+       # First, grab the L1 key, and mark it as ultimately trusted.
+       edo gpg "${mygpgargs[@]}" --import 
"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+       edo gpg "${mygpgargs[@]}" --import-ownertrust 
"${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+       # Generate a temporary key which isn't signed by anything to check
+       # whether we're detecting unexpected keys.
+       #
+       # The test is whether this appears in the sanitised keyring we
+       # produce in src_compile (it should not be in there).
+       #
+       # 
https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+       edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+               %echo Generating temporary key for testing...
+
+               %no-protection
+               %transient-key
+               %pubring ${P}-ebuild-test-key.asc
+
+               Key-Type: 1
+               Key-Length: 2048
+               Subkey-Type: 1
+               Subkey-Length: 2048
+               Name-Real: Larry The Cow
+               Name-Email: [email protected]
+               Expire-Date: 0
+               Handle: ${P}-ebuild-test-key
+
+               %commit
+               %echo Temporary key generated!
+       EOF
+
+       # Import the new injected key that shouldn't be signed by anything into 
a temporary testing keyring
+       edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+       # Sign a tiny file with the to-be-injected key for testing rejection 
below
+       echo "Hello world!" > "${T}"/tests/signme || die
+       edo gpg "${mygpgargs[@]}" -u "Larry The Cow <[email protected]>" --sign 
"${T}"/tests/signme || die
+
+       # keyring-mangler will fail with no valid keys so import the sanitised 
list from src_compile.
+       edo gpg "${mygpgargs[@]}" --import 
"${WORKDIR}"/gentoo-infrastructure-sanitised.asc
+
+       edo gpg "${mygpgargs[@]}" --export --armor > 
"${T}"/tests/tainted-keyring.asc
+
+       # keyring-mangler.py should now produce a keyring *without* it
+       edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+                       "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+                       "${T}"/tests/tainted-keyring.asc \
+                       "${T}"/tests/gentoo-infrastructure-sanitised.asc | tee 
"${T}"/tests/keyring-mangler.log
+       assert "Key mangling in tests failed?"
+
+       # Check the log to verify the injected key got detected
+       grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log 
|| die "Did not remove injected key from test keyring!"
+
+       # gnupg doesn't have an easy way for us to actually just.. ask
+       # if a key is known via WoT. So, sign a file using the key
+       # we just made, and then try to gpg --verify it, and check exit code.
+       #
+       # Let's now double check by seeing if a file signed by the injected key
+       # is rejected.
+       if gpg "${mygpgargs[@]}" --keyring 
"${T}"/tests/gentoo-infrastructure-sanitised.asc --verify 
"${T}"/tests/signme.gpg ; then
+               die "'gpg --verify' using injected test key succeeded! This 
shouldn't happen!"
+       fi
+
+       # Bonus lame sanity check
+       edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee 
"${T}"/tests/trustdb.log
+       assert "trustdb call failed!"
+
+       check_trust_levels() {
+               local mode=${1}
+
+               while IFS= read -r line; do
+                       # gpg: depth: 0  valid:   1  signed:   2  trust: 0-, 
0q, 0n, 0m, 0f, 1u
+                       # gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 
0q, 0n, 0m, 2f, 0u
+                       if [[ ${line} == *depth* ]] ; then
+                               depth=$(echo ${line} | grep -Po "depth: [0-9]")
+                               trust=$(echo ${line} | grep -Po "trust:.*")
+
+                               trust_uncalculated=$(echo ${trust} | grep -Po 
"[0-9]-")
+                               [[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+                               trust_insufficient=$(echo ${trust} | grep -Po 
"[0-9]q")
+                               [[ ${trust_insufficient} == 0 ]] || ${mode}
+
+                               trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+                               [[ ${trust_never} == 0 ]] || ${mode}
+
+                               trust_marginal=$(echo ${trust} | grep -Po 
"[0-9]m")
+                               [[ ${trust_marginal} == 0 ]] || ${mode}
+
+                               trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+                               [[ ${trust_full} != 0 ]] || ${mode}
+
+                               trust_ultimate=$(echo ${trust} | grep -Po 
"[0-9]u")
+                               [[ ${trust_ultimate} == 1 ]] || ${mode}
+
+                               echo "${trust_uncalculated}, 
${trust_insufficient}"
+                       fi
+               done < "${T}"/tests/trustdb.log
+       }
+
+       # First, check with the bad key still in the test keyring.
+       # This is supposed to fail, so we want it to return 1
+       check_trust_levels "return 1" && die "Trustdb passed when it should 
have failed!"
+
+       # Now check without the bad key in the test keyring.
+       # This one should pass.
+       #
+       # Drop the bad key first 
(https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+       keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry 
The Cow <[email protected]>" \
+               | grep "^fpr" \
+               | sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+       local key
+       for key in ${keys[@]} ; do
+               nonfatal edo gpg "${mygpgargs[@]}" --batch --yes 
--delete-secret-keys ${key}
+       done
+
+       edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow 
<[email protected]>"
+       check_trust_levels "return 0" || die "Trustdb failed when it should 
have passed!"
+
+       gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+       insinto /usr/share/openpgp-keys
+       newins gentoo-infrastructure-sanitised.asc gentoo-infrastructure.asc
+
+       # TODO: install an ownertrust file like 
sec-keys/openpgp-keys-gentoo-auth?
+}

Reply via email to