PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-12-10 06:11:08 +01:00
Code Issues Releases Wiki Activity

Improve RegExs for extracting email addresses from keys

Browse source 
Based on https://github.com/pgpainless/pgpainless/pull/257/
Thanks @bratkartoffel for the initial proposed changes
This commit is contained in:
Paul Schaub 2022-03-01 12:14:09 +01:00
parent 1088b6c8ae
commit d55d6a1686
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 67 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
View file

@ -50,7 +50,8 @@ import org.pgpainless.signature.subpackets.SignatureSubpacketsUtil;
*/
public class KeyRingInfo {
private static final Pattern PATTERN_EMAIL = Pattern.compile("[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}");
private static final Pattern PATTERN_EMAIL_FROM_USERID = Pattern.compile("<([a-zA-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[a-zA-Z0-9.-]+)>");
private static final Pattern PATTERN_EMAIL_EXPLICIT = Pattern.compile("^([a-zA-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[a-zA-Z0-9.-]+)$");
private final PGPKeyRing keys;
private final Signatures signatures;
@ -421,9 +422,14 @@ public class KeyRingInfo {
List<String> userIds = getUserIds();
List<String> emails = new ArrayList<>();
for (String userId : userIds) {
Matcher matcher = PATTERN_EMAIL.matcher(userId);
Matcher matcher = PATTERN_EMAIL_FROM_USERID.matcher(userId);
if (matcher.find()) {
emails.add(matcher.group());
emails.add(matcher.group(1));
} else {
matcher = PATTERN_EMAIL_EXPLICIT.matcher(userId);
if (matcher.find()) {
emails.add(matcher.group(1));
}
}
}
return emails;