CondorCORE/condorcore-keyring
CondorCORE/condorcore-keyring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature(keyringctl): enrich inspect to show explicit label for main keys

Browse Source 
This helps to identify if a certification issuer comes from a main key
or not.
This commit is contained in:
Levente Polyak 2021-10-23 17:35:42 +02:00
parent b6c25fa531
commit 4b136dd6f6
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keyringctl
View File

@ -989,12 +989,16 @@ def get_fingerprints_from_keyring_files(working_dir: Path, source: Iterable[Path
return fingerprints
def get_fingerprints_from_certificate_directory(paths: List[Path]) -> Dict[Fingerprint, Username]:
def get_fingerprints_from_certificate_directory(
paths: List[Path], prefix: str = "", postfix: str = ""
) -> Dict[Fingerprint, Username]:
"""Get all fingerprints of PGP public keys from decomposed directory structures
Parameters
----------
paths: The path to a decomposed directory structure
prefix: Prefix to add to each username
postfix: Postfix to add to each username
Returns
-------
@ -1003,7 +1007,7 @@ def get_fingerprints_from_certificate_directory(paths: List[Path]) -> Dict[Finge
fingerprints: Dict[Fingerprint, Username] = {}
for cert in sorted(get_cert_paths(paths)):
fingerprints[Fingerprint(cert.name)] = Username(cert.parent.name)
fingerprints[Fingerprint(cert.name)] = Username(f"{prefix}{cert.parent.name}{postfix}")
debug(f"Fingerprints of PGP public keys in {paths}: {fingerprints}")
return fingerprints
@ -1172,10 +1176,14 @@ def inspect_keyring(working_dir: Path, keyring_root: Path, sources: Optional[Lis
keyring = Path(mkstemp(dir=working_dir, prefix="packet-", suffix=".asc")[1]).absolute()
export(working_dir=working_dir, keyring_root=keyring_root, sources=sources, output=keyring)
fingerprints: Dict[Fingerprint, Username] = get_fingerprints_from_certificate_directory(
paths=[keyring_root / "packager"]
) | get_fingerprints_from_certificate_directory(paths=[keyring_root / "main"], postfix=" (main)")
return inspect(
packet=keyring,
certifications=True,
fingerprints=get_fingerprints_from_certificate_directory(paths=[keyring_root]),
fingerprints=fingerprints,
)