Feature(#816): fix spotbugs-2

OWASP · May 11, 2023 · 261d6f9 · 261d6f9
1 parent f6292a1
commit 261d6f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge32.java b/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge32.java
@@ -88,8 +88,7 @@ private String decrypt(String cipherTextString) {
             SecretKey decryptKey = new SecretKeySpec("AIKnowsThisKey12".getBytes(StandardCharsets.UTF_8), "AES");
             AlgorithmParameterSpec gcmIv = new GCMParameterSpec(128, Base64.decode(cipherTextString), 0, 12);
             decryptor.init(Cipher.DECRYPT_MODE, decryptKey, gcmIv);
-            byte[] cipherTextBytes = Base64.decode(cipherTextString.getBytes(StandardCharsets.UTF_8));
-            return new String(decryptor.doFinal(cipherTextBytes), 12, cipherTextBytes.length - 12, StandardCharsets.UTF_8);
+            return new String(decryptor.doFinal(Base64.decode(cipherTextString.getBytes(StandardCharsets.UTF_8)), 12, Base64.decode(cipherTextString.getBytes(StandardCharsets.UTF_8)).length - 12), StandardCharsets.UTF_8);
         } catch (Exception e) {
             log.warn("Exception in Challenge32", e);
             return "";

diff --git a/src/test/java/org/owasp/wrongsecrets/challenges/docker/Challenge32Test.java b/src/test/java/org/owasp/wrongsecrets/challenges/docker/Challenge32Test.java
@@ -1,10 +1,20 @@
 package org.owasp.wrongsecrets.challenges.docker;
 
 import org.assertj.core.api.Assertions;
+import org.bouncycastle.util.encoders.Base64;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.owasp.wrongsecrets.ScoreCard;
 
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
+
 public class Challenge32Test {
     @Mock
     private ScoreCard scoreCard;
@@ -22,4 +32,5 @@ void incorrectAnswerShouldNotSolveChallenge() {
         var challenge = new Challenge29(scoreCard);
         Assertions.assertThat(challenge.solved("wrong answer")).isFalse();
     }
+
 }