Fix regex for parsing PEMs

Lesson: never trust stackoverflow.
aviraxp · Jul 15, 2024 · 06d3e71 · 06d3e71
1 parent ff638f9
commit 06d3e71
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/src/main/java/io/github/aviraxp/keystoreinjection/CertUtils.java b/app/src/main/java/io/github/aviraxp/keystoreinjection/CertUtils.java
@@ -14,11 +14,13 @@
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
+import java.util.regex.Pattern;
 
 public class CertUtils {
+    private static final Pattern lineTrimmer = Pattern.compile("^\\s+|\\s+$", Pattern.MULTILINE);
 
     public static Certificate parseCert(String cert) throws Throwable {
-        cert = cert.trim().replaceAll("(?m)^[\s&&[^\n]]+|[\s+&&[^\n]]+$", "");
+        cert = lineTrimmer.matcher(cert).replaceAll("");
         PemObject pemObject;
         try (PemReader reader = new PemReader(new StringReader(cert))) {
             pemObject = reader.readPemObject();
@@ -30,7 +32,7 @@ public static Certificate parseCert(String cert) throws Throwable {
     }
 
     public static X500Name parseCertSubject(String cert) throws Throwable {
-        cert = cert.trim().replaceAll("(?m)^[\s&&[^\n]]+|[\s+&&[^\n]]+$", "");
+        cert = lineTrimmer.matcher(cert).replaceAll("");
         PemObject pemObject;
         try (PemReader reader = new PemReader(new StringReader(cert))) {
             pemObject = reader.readPemObject();
@@ -42,7 +44,7 @@ public static X500Name parseCertSubject(String cert) throws Throwable {
     }
 
     public static KeyPair parseKeyPair(String key) throws Throwable {
-        key = key.trim().replaceAll("(?m)^[\s&&[^\n]]+|[\s+&&[^\n]]+$", "");
+        key = lineTrimmer.matcher(key).replaceAll("");
         Object object;
         try (PEMParser parser = new PEMParser(new StringReader(key))) {
             object = parser.readObject();
@@ -54,7 +56,7 @@ public static KeyPair parseKeyPair(String key) throws Throwable {
     }
 
     public static PrivateKey parsePrivateKey(String keyPair) throws RuntimeException {
-        keyPair = keyPair.trim().replaceAll("(?m)^[\s&&[^\n]]+|[\s+&&[^\n]]+$", "");
+        keyPair = lineTrimmer.matcher(keyPair).replaceAll("");
         try (PEMParser parser = new PEMParser(new StringReader(keyPair))) {
             PEMKeyPair pemKeyPair = (PEMKeyPair) parser.readObject();
             return new JcaPEMKeyConverter().getPrivateKey(pemKeyPair.getPrivateKeyInfo());