Fix wrong masking of one-char-secrets

Fixes JENKINS-72412.
jenkinsci · Dec 1, 2023 · 89bbe4e · 89bbe4e
1 parent 224f989
commit 89bbe4e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...ain/java/org/jenkinsci/plugins/credentialsbinding/masking/Base64SecretPatternFactory.java b/...ain/java/org/jenkinsci/plugins/credentialsbinding/masking/Base64SecretPatternFactory.java
@@ -38,8 +38,13 @@ public Collection<String> getBase64Forms(@NonNull String secret) {
                 String shiftedSecret = shift + secret;
                 String encoded = encoder.encodeToString(shiftedSecret.getBytes(StandardCharsets.UTF_8));
                 String processedEncoded = shift.length() > 0 ? encoded.substring(2 * shift.length()) : encoded;
-                result.add(processedEncoded);
-                result.add(removeTrailingEquals(processedEncoded));
+                if (!processedEncoded.isEmpty()) {
+                    result.add(processedEncoded);
+                }
+                String processedWithoutTrailingEquals = removeTrailingEquals(processedEncoded);
+                if (!processedWithoutTrailingEquals.isEmpty()) {
+                    result.add(removeTrailingEquals(processedEncoded));
+                }
             }
         }
         return result;