aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal
diff options
context:
space:
mode:
authorThomas Wolf <thomas.wolf@paranor.ch>2020-12-29 10:15:20 +0100
committerThomas Wolf <thomas.wolf@paranor.ch>2020-12-29 10:15:20 +0100
commit8caaaf956a070864b8e700afc76b5ab9e8c12f36 (patch)
tree6d4bae5005b52dcc33b43ce724e11e75a81e6dec /org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal
parent616a7eeaec2e2525001823585f1c44a9124ebb65 (diff)
downloadjgit-8caaaf956a070864b8e700afc76b5ab9e8c12f36.tar.gz
jgit-8caaaf956a070864b8e700afc76b5ab9e8c12f36.zip
GPG user ID matching: use case-insensitive matching
Although not mentioned in the GPG documentation at [1], GPG uses case-insensitive matching also for the '<' (exact e-mail) and '@' (partial e-mail) operators. Matching for '=' (full exact match) is case-sensitive. Compare [2]. [1] https://www.gnupg.org/documentation/manuals/gnupg/Specify-a-User-ID.html [2] https://dev.gnupg.org/source/gnupg/browse/master/g10/keyring.c;22f7dddc34446a8c3e9eddf6cb281f16802351d7$890 Bug: 547789 Change-Id: I2f5ab65807d5dde3aa00ff032894701bbd8418c9 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal')
-rw-r--r--org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java19
1 files changed, 15 insertions, 4 deletions
diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
index eca45072bf..1389f8bd1b 100644
--- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
+++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
@@ -219,23 +219,34 @@ public class BouncyCastleGpgKeyLocator {
int stop = toMatch.indexOf('>');
return begin >= 0 && end > begin + 1 && stop > 0
&& userId.substring(begin + 1, end)
- .equals(toMatch.substring(0, stop));
+ .equalsIgnoreCase(toMatch.substring(0, stop));
}
case '@': {
int begin = userId.indexOf('<');
int end = userId.indexOf('>', begin + 1);
return begin >= 0 && end > begin + 1
- && userId.substring(begin + 1, end).contains(toMatch);
+ && containsIgnoreCase(userId.substring(begin + 1, end),
+ toMatch);
}
default:
if (toMatch.trim().isEmpty()) {
return false;
}
- return userId.toLowerCase(Locale.ROOT)
- .contains(toMatch.toLowerCase(Locale.ROOT));
+ return containsIgnoreCase(userId, toMatch);
}
}
+ private static boolean containsIgnoreCase(String a, String b) {
+ int alength = a.length();
+ int blength = b.length();
+ for (int i = 0; i + blength <= alength; i++) {
+ if (a.regionMatches(true, i, b, 0, blength)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private String toFingerprint(String keyId) {
if (keyId.startsWith("0x")) { //$NON-NLS-1$
return keyId.substring(2);