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

fix(keyringctl): avoid simplified uid collisions using a hash

Browse Source 
Add a postfix hash of the raw uid data to the filenames to avoid
collisions with the simplified uid.
This commit is contained in:
Levente Polyak
2021-11-25 23:31:36 +01:00
parent 4821087b2b
commit 0ceb6c743e
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libkeyringctl/verify.py
View File

@ -18,7 +18,7 @@ from libkeyringctl.types import Fingerprint
from libkeyringctl.types import Uid
from libkeyringctl.util import get_cert_paths
from libkeyringctl.util import get_fingerprint_from_partial
from libkeyringctl.util import simplify_ascii
from libkeyringctl.util import simplify_uid
from libkeyringctl.util import system
@ -123,7 +123,7 @@ def verify_integrity(certificate: Path, all_fingerprints: Set[Fingerprint]) -> N
assert_packet_kind(path=uid_path, expected="User")
uid_value = Uid(simplify_ascii(packet_dump_field(packet=uid_path, field="Value")))
uid_value = simplify_uid(Uid(packet_dump_field(packet=uid_path, field="Value")))
if uid_value != uid.name:
raise Exception(f"Unexpected uid in file {str(uid_path)}: {uid_value}")
elif not uid_path.is_dir():