cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix behavior for duplicate user ids

Browse Source
This commit is contained in:
Vincent Breitmoser
2024-01-29 14:47:48 +01:00
parent 2391a8c09b
commit 0e8f3fa90e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@@ -523,13 +523,17 @@ public class UncachedKeyRing {
// check for duplicate user ids // check for duplicate user ids
if (processedUserIds.contains(userId)) { if (processedUserIds.contains(userId)) {
log.add(LogType.MSG_KC_UID_DUP, indent, userId); log.add(LogType.MSG_KC_UID_DUP, indent, userId);
// strip out the first found user id with this name // strip out this user id entirely. we could preserve one and merge
// certifications, but that would be more effort and it's an error case,
// so we just don't.
modified = PGPPublicKey.removeCertification(modified, rawUserId); modified = PGPPublicKey.removeCertification(modified, rawUserId);
continue;
} }
if (processedUserIds.size() > CANONICALIZE_MAX_USER_IDS) { if (processedUserIds.size() > CANONICALIZE_MAX_USER_IDS) {
log.add(LogType.MSG_KC_UID_TOO_MANY, indent, userId); log.add(LogType.MSG_KC_UID_TOO_MANY, indent, userId);
// strip out the user id // strip out this user id entirely
modified = PGPPublicKey.removeCertification(modified, rawUserId); modified = PGPPublicKey.removeCertification(modified, rawUserId);
continue;
} }
processedUserIds.add(userId); processedUserIds.add(userId);
@@ -538,7 +542,7 @@ public class UncachedKeyRing {
// look through signatures for this specific user id // look through signatures for this specific user id
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Iterator<PGPSignature> signaturesIt = masterKey.getSignaturesForID(rawUserId); Iterator<PGPSignature> signaturesIt = modified.getSignaturesForID(rawUserId);
if (signaturesIt != null) { if (signaturesIt != null) {
for (PGPSignature zert : new IterableIterator<>(signaturesIt)) { for (PGPSignature zert : new IterableIterator<>(signaturesIt)) {
WrappedSignature cert = new WrappedSignature(zert); WrappedSignature cert = new WrappedSignature(zert);