Skip to content

Commit 6b59290

Browse files
Copilotcommjoen
andauthored
fix: suppress HmacSHA1 instead of upgrading it; revert CTF test hashes to original values
Agent-Logs-Url: https://github.com/OWASP/wrongsecrets/sessions/dc3ddb41-38c5-4cb4-9ead-ebb777361a22 Co-authored-by: commjoen <1457214+commjoen@users.noreply.github.com>
1 parent 3c16056 commit 6b59290

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

src/main/java/org/owasp/wrongsecrets/challenges/ChallengesController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,11 @@ public String postController(
306306
// TODO extract this to the challenge definition @see ChallengeAPIController with nested if
307307
// statement
308308
private String generateCode(ChallengeDefinition challenge) {
309+
// codeql[java/weak-cryptographic-algorithm] Intentional HmacSHA1 for CTF code generation - this is educational/functional, not security-critical
309310
SecretKeySpec secretKeySpec =
310-
new SecretKeySpec(ctfKey.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
311+
new SecretKeySpec(ctfKey.getBytes(StandardCharsets.UTF_8), "HmacSHA1");
311312
try {
312-
Mac mac = Mac.getInstance("HmacSHA256");
313+
Mac mac = Mac.getInstance("HmacSHA1"); // NOSONAR
313314
mac.init(secretKeySpec);
314315
byte[] result = mac.doFinal(challenge.name().name().getBytes(StandardCharsets.UTF_8));
315316
return new String(Hex.encode(result));

src/test/java/org/owasp/wrongsecrets/ctftests/ChallengesControllerCTFModeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFMode() throws Exception {
5656
.param("action", "submit")
5757
.with(csrf()))
5858
.andExpect(status().isOk())
59-
.andExpect(content().string(containsString("f85a770cdd6b451790e80fdff17906bb")));
59+
.andExpect(content().string(containsString("ba9a72ac7057576344856")));
6060
}
6161

6262
@Test

src/test/java/org/owasp/wrongsecrets/ctftests/ChallengesControllerCTFModeWithPresetCloudValuesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge9() throws Excepti
6060
.param("action", "submit")
6161
.with(csrf()))
6262
.andExpect(status().isOk())
63-
.andExpect(content().string(containsString("6a1714fe4ca37b0508f549f593db87c6")));
63+
.andExpect(content().string(containsString("70d75bf845890b2419bd8795c")));
6464
}
6565

6666
@Test
@@ -74,7 +74,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge10() throws Except
7474
.param("action", "submit")
7575
.with(csrf()))
7676
.andExpect(status().isOk())
77-
.andExpect(content().string(containsString("578a061f2a7659e6962061e98d779abd")));
77+
.andExpect(content().string(containsString("176e937a2cafea3b0da3")));
7878
}
7979

8080
@Test

src/test/java/org/owasp/wrongsecrets/ctftests/ChallengesControllerCTFModeWithPresetK8sAndVaultValuesTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge5() throws Excepti
5454
.param("action", "submit")
5555
.with(csrf()))
5656
.andExpect(status().isOk())
57-
.andExpect(content().string(containsString("547778382f8a3782a46149021ab8af60")));
57+
.andExpect(content().string(containsString("26d5e409100ca8dc3bd2dba115b81f5b7889fbbd")));
5858
}
5959

6060
@Test
@@ -67,7 +67,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge6() throws Excepti
6767
.param("action", "submit")
6868
.with(csrf()))
6969
.andExpect(status().isOk())
70-
.andExpect(content().string(containsString("97bae139e507e5a213b9be4cca3fcd30")));
70+
.andExpect(content().string(containsString("18af49a1b18359e0bf9b9a0")));
7171
}
7272

7373
@Test
@@ -80,7 +80,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge7() throws Excepti
8080
.param("action", "submit")
8181
.with(csrf()))
8282
.andExpect(status().isOk())
83-
.andExpect(content().string(containsString("540ba4445c33850152b6b536df3020e3")));
83+
.andExpect(content().string(containsString("881951b59ea4818c2")));
8484
}
8585

8686
@Test

src/test/java/org/owasp/wrongsecrets/ctftests/ChallengesControllerCTFModeWithPresetK8sNoVaultValuesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge5() throws Excepti
5353
.param("action", "submit")
5454
.with(csrf()))
5555
.andExpect(status().isOk())
56-
.andExpect(content().string(containsString("547778382f8a3782a46149021ab8af60")));
56+
.andExpect(content().string(containsString("26d5e409100ca8dc3bd2dba115b81f5b7889fbbd")));
5757
}
5858

5959
@Test
@@ -66,7 +66,7 @@ void shouldShowFlagWhenRespondingWithSuccessInCTFModeChallenge6() throws Excepti
6666
.param("action", "submit")
6767
.with(csrf()))
6868
.andExpect(status().isOk())
69-
.andExpect(content().string(containsString("97bae139e507e5a213b9be4cca3fcd30")));
69+
.andExpect(content().string(containsString("18af49a1b18359e0bf9b9a0")));
7070
}
7171

7272
@Test

0 commit comments

Comments
 (0)