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

fix(keyringctl): resolve cert dir per fingerprint and not parent user

Browse Source
This commit is contained in:
Levente Polyak 2021-10-26 00:15:11 +02:00
parent 03d5899f87
commit 2384d0337b
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libkeyringctl/keyring.py
View File

@ -131,7 +131,7 @@ def transform_fingerprint_to_keyring_path(keyring_root: Path, paths: List[Path])
fingerprint_paths = list(keyring_root.glob(f"*/*/*{source.name}")) fingerprint_paths = list(keyring_root.glob(f"*/*/*{source.name}"))
if not fingerprint_paths: if not fingerprint_paths:
continue continue
paths[index] = fingerprint_paths[0].parent paths[index] = fingerprint_paths[0]
# TODO: simplify to lower complexity # TODO: simplify to lower complexity
@ -960,11 +960,12 @@ def list_keyring(keyring_root: Path, sources: Optional[List[Path]] = None, main_
transform_username_to_keyring_path(keyring_dir=keyring_dir, paths=sources) transform_username_to_keyring_path(keyring_dir=keyring_dir, paths=sources)
transform_fingerprint_to_keyring_path(keyring_root=keyring_root, paths=sources) transform_fingerprint_to_keyring_path(keyring_root=keyring_root, paths=sources)
username_length = max([len(source.name) for source in sources]) for index, source in enumerate(sources):
if is_pgp_fingerprint(source.name):
sources[index] = source.parent
username_length = max([len(source.name) for source in sources])
for user_path in sources: for user_path in sources:
if is_pgp_fingerprint(user_path.name):
user_path = user_path.parent
certificates = [cert.name for cert in user_path.iterdir()] certificates = [cert.name for cert in user_path.iterdir()]
print(f"{user_path.name:<{username_length}} {' '.join(certificates)}") print(f"{user_path.name:<{username_length}} {' '.join(certificates)}")