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

feature(keyringctl): raise exception on duplicate uid data

Browse Source
This commit is contained in:
Levente Polyak 2021-11-25 23:05:51 +01:00
parent b653edfcdc
commit b32c37bec1
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libkeyringctl/keyring.py
View File

@ -354,6 +354,10 @@ def convert_certificate(
current_packet_fingerprint = None current_packet_fingerprint = None
current_packet_uid = Uid(simplify_ascii(packet_dump_field(packet, "Value"))) current_packet_uid = Uid(simplify_ascii(packet_dump_field(packet, "Value")))
if current_packet_uid in uids:
raise Exception(
f"Duplicate User ID {current_packet_uid} used in packet {uids[current_packet_uid]} and {packet}"
)
uids[current_packet_uid] = packet uids[current_packet_uid] = packet
elif packet.name.endswith("UserAttribute"): elif packet.name.endswith("UserAttribute"):
current_packet_mode = "uattr" current_packet_mode = "uattr"

16
tests/test_keyring.py
View File

@ -423,6 +423,22 @@ def test_convert_signature_packet(
"bar", "bar",
does_not_raise(), does_not_raise(),
), ),
(
Path("foo.asc"),
[
Path("--PublicKey"),
Path("--Signature"),
Path("--UserID"),
Path("--UserID"),
],
[
"".join(choice("ABCDEF" + digits) for _ in range(40)),
"foo <foo@bar.com>",
"foo <foo@bar.com>",
],
"bar",
raises(Exception),
),
( (
Path("foo.asc"), Path("foo.asc"),
[ [