Skip to content

Commit f384c1a

Browse files
authored
Merge pull request #2113 from OWASP/fix-java-deprecations
Fix java deprecations and update to vault 1.19
2 parents 360795d + d9cd170 commit f384c1a

File tree

7 files changed

+9
-23
lines changed

7 files changed

+9
-23
lines changed

k8s-vault-minikube-start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ else
4747
helm repo add hashicorp https://helm.releases.hashicorp.com
4848
fi
4949
kubectl create ns vault
50-
helm upgrade --install vault hashicorp/vault --version 0.29.1 --namespace vault --values k8s/helm-vault-values.yml
50+
helm upgrade --install vault hashicorp/vault --version 0.30.0 --namespace vault --values k8s/helm-vault-values.yml
5151

5252
isvaultrunning=$(kubectl get pods -n vault --field-selector=status.phase=Running)
5353
while [[ $isvaultrunning != *"vault-0"* ]]; do echo "waiting for Vault1" && sleep 2 && isvaultrunning=$(kubectl get pods -n vault --field-selector=status.phase=Running); done

renovate.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,6 @@
9595
],
9696
"depNameTemplate": "node",
9797
"datasourceTemplate": "node-version"
98-
},
99-
{
100-
"customType": "regex",
101-
"description": "Track jeroenwillemsen/wrongsecrets images in K8s manifests",
102-
"fileMatch": ["(^|/)k8s/.+\\.ya?ml$", "(^|/)[^/]*\\.ya?ml$"],
103-
"matchStrings": [
104-
"image:\\s*['\"]?jeroenwillemsen/wrongsecrets:(?<currentValue>[^'\"\\s]+)['\"]?",
105-
"image:\\s*['\"]?jeroenwillemsen/wrongsecrets-challenge53:(?<currentValue>[^'\"\\s]+)['\"]?"
106-
],
107-
"depNameTemplate": "jeroenwillemsen/wrongsecrets",
108-
"datasourceTemplate": "docker"
10998
}
11099
],
111100
"packageRules": [

scripts/install-vault.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ else
77
helm repo update hashicorp
88
fi
99

10-
helm upgrade --install vault hashicorp/vault --version 0.29.1 --namespace vault --values ../k8s/helm-vault-values.yml --create-namespace
10+
helm upgrade --install vault hashicorp/vault --version 0.30.0 --namespace vault --values ../k8s/helm-vault-values.yml --create-namespace
1111

1212
isvaultrunning=$(kubectl get pods -n vault --field-selector=status.phase=Running)
1313
while [[ $isvaultrunning != *"vault-0"* ]]; do echo "waiting for Vault0" && sleep 2 && isvaultrunning=$(kubectl get pods -n vault --field-selector=status.phase=Running); done

src/main/java/org/owasp/wrongsecrets/SecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public boolean matches(HttpServletRequest request) {
7676
&& request.getHeader("x-forwarded-proto") != null;
7777
}
7878
};
79-
http.requiresChannel(channel -> channel.requestMatchers(requestMatcher).requiresSecure())
79+
http.redirectToHttps(channel -> channel.requestMatchers(requestMatcher))
8080
.portMapper(configurer -> configurer.portMapper(portMapper));
8181
}
8282
}

src/test/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge44Test.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.junit.jupiter.api.Test;
66
import org.springframework.cloud.vault.config.VaultProperties;
7+
import org.springframework.test.annotation.DirtiesContext;
78
import org.springframework.vault.authentication.TokenAuthentication;
89
import org.springframework.vault.client.VaultEndpoint;
910
import org.springframework.vault.core.VaultTemplate;
@@ -12,13 +13,15 @@
1213
import org.testcontainers.junit.jupiter.Testcontainers;
1314
import org.testcontainers.vault.VaultContainer;
1415

16+
@DirtiesContext
1517
@Testcontainers
1618
public class Challenge44Test {
1719
private static final String VAULT_TOKEN = "my-token";
1820

21+
@SuppressWarnings("resource")
1922
@Container
2023
public static VaultContainer<?> vaultContainer =
21-
new VaultContainer<>("hashicorp/vault:1.13")
24+
new VaultContainer<>("hashicorp/vault:1.19")
2225
.withVaultToken(VAULT_TOKEN)
2326
.withInitCommand("secrets enable transit");
2427

src/test/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge45Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
public class Challenge45Test {
1616
private static final String VAULT_TOKEN = "my-token";
1717

18+
@SuppressWarnings("resource")
1819
@Container
1920
public static VaultContainer<?> vaultContainer =
20-
new VaultContainer<>("hashicorp/vault:1.13")
21+
new VaultContainer<>("hashicorp/vault:1.19")
2122
.withVaultToken(VAULT_TOKEN)
2223
.withInitCommand("secrets enable transit");
2324

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ void shouldStillDissableTestsIfNotPreconfigured() throws Exception {
9191
testForCloudCluster("/challenge/challenge-11");
9292
}
9393

94-
private void testForVault(String url) throws Exception {
95-
mvc.perform(get(url).contentType(MediaType.APPLICATION_FORM_URLENCODED).with(csrf()))
96-
.andExpect(status().isOk())
97-
.andExpect(
98-
content().string(containsString("We are running outside a K8s cluster with Vault")));
99-
}
100-
10194
private void testK8sChallenge(String url) throws Exception {
10295
mvc.perform(get(url).contentType(MediaType.APPLICATION_FORM_URLENCODED).with(csrf()))
10396
.andExpect(status().isOk())

0 commit comments

Comments
 (0)