-
-
Notifications
You must be signed in to change notification settings - Fork 341
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1133 from OWASP/hotfix-k8s-okteto
Fix for issues regarding challenge rendering
- Loading branch information
Showing
22 changed files
with
152 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
...rongsecrets/challenges/kubernetes/ChallengesControllerWithPresetKubernetesValuesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package org.owasp.wrongsecrets.challenges.kubernetes; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.not; | ||
| import static org.hamcrest.Matchers.containsString; | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.owasp.wrongsecrets.Challenges; | ||
| import org.owasp.wrongsecrets.WrongSecretsApplication; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.test.web.servlet.MockMvc; | ||
|
|
||
| @SpringBootTest( | ||
| properties = { | ||
| "K8S_ENV=Okteto(k8s)", | ||
| "ctf_key=randomtextforkey", | ||
| "SPECIAL_K8S_SECRET=test5", | ||
| "SPECIAL_SPECIAL_K8S_SECRET=test6", | ||
| "vaultpassword=test7", | ||
| "secretmountpath=nothere" | ||
| }, | ||
| classes = WrongSecretsApplication.class) | ||
| @AutoConfigureMockMvc | ||
| class ChallengesControllerWithPresetKubernetesValuesTest { | ||
|
|
||
| @Autowired private MockMvc mvc; | ||
| @Autowired private Challenges challenges; | ||
|
|
||
| @Test | ||
| void shouldSpoilExercises() throws Exception { | ||
| mvc.perform(get("/spoil/challenge-0")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(containsString("The first answer"))); | ||
| mvc.perform(get("/spoil/challenge-5")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(containsString("test5"))); | ||
| mvc.perform(get("/spoil/challenge-6")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(containsString("test6"))); | ||
| mvc.perform(get("/spoil/challenge-9")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(containsString("if_you_see_this_please_use_AWS_Setup"))); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldNotShowDisabledChallengeAnywhere() throws Exception { | ||
| for (var challenge : challenges.getChallengeDefinitions()) { | ||
| var shortname = challenge.name().shortName(); | ||
| if (shortname.contains("7") | ||
| || shortname.contains("9") | ||
| || shortname.contains("10") | ||
| || shortname.contains("11")) { | ||
| continue; | ||
| } | ||
| mvc.perform(get("/challenge/%s".formatted(challenge.name().shortName()))) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(not(containsString("This challenge has been disabled.")))); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void shouldDisableCloudExercises() throws Exception { | ||
| mvc.perform(get("/")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(containsString("challenge-9_disabled-link"))) | ||
| .andExpect(content().string(containsString("challenge-10_disabled-link"))) | ||
| .andExpect(content().string(containsString("challenge-11_disabled-link"))); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldEnableK8sExercises() throws Exception { | ||
| mvc.perform(get("/")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(not(containsString("challenge-5_disabled-link")))) | ||
| .andExpect(content().string(not(containsString("challenge-6_disabled-link")))) | ||
| .andExpect( | ||
| content().string(containsString("challenge-7_disabled-link"))) // vault is not visible | ||
| .andExpect(content().string(not(containsString("challenge-33_disabled-link")))); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldEnableDockerExercises() throws Exception { | ||
| mvc.perform(get("/")) | ||
| .andExpect(status().isOk()) | ||
| .andExpect(content().string(not(containsString("challenge-1_disabled-link")))) | ||
| .andExpect(content().string(not(containsString("challenge-2_disabled-link")))) | ||
| .andExpect(content().string(not(containsString("challenge-14_disabled-link")))) | ||
| .andExpect(content().string(not(containsString("challenge-22_disabled-link")))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters