Imrpoved isSecret implementation

OpenConext · Jul 19, 2024 · f22e99f · f22e99f
1 parent 211765f
commit f22e99f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/crypto/RSAKeyStore.java b/src/main/java/crypto/RSAKeyStore.java
@@ -99,12 +99,7 @@ public boolean isEncryptedSecret(String input) {
     }
 
     private boolean validBase64(String input) {
-        try {
-            Base64.decodeBase64(input);
-            return true;
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
+            return Base64.decodeBase64(input).length > 0;
     }
 
     private String stripPublicKey(String publicKey) {

diff --git a/src/test/java/crypto/KeyStoreTest.java b/src/test/java/crypto/KeyStoreTest.java
@@ -40,6 +40,8 @@ void isEncryptedSecret() {
 
         assertTrue(keyStore.isEncryptedSecret(encryptedSecret));
         assertFalse(keyStore.isEncryptedSecret("!"));
+        assertFalse(keyStore.isEncryptedSecret("!".repeat(342)));
+        assertFalse(keyStore.isEncryptedSecret("%".repeat(342)));
         //Corner case - waiting for a smart tester to pick this up
         assertTrue(keyStore.isEncryptedSecret("a".repeat(342)));
     }