From b3f7a5338e2a6596144b4395fbf535581ff122bb Mon Sep 17 00:00:00 2001 From: Nanne Baars Date: Wed, 31 Mar 2021 23:05:27 +0200 Subject: [PATCH] Update to latest versions --- docker/pom.xml | 2 +- webgoat-container/pom.xml | 2 +- .../owasp/webgoat/asciidoc/OperatingSystemMacro.java | 12 ++++++++---- .../owasp/webgoat/asciidoc/WebGoatTmpDirMacro.java | 9 +++++++-- .../owasp/webgoat/asciidoc/WebGoatVersionMacro.java | 9 +++++++-- .../org/owasp/webgoat/asciidoc/WebWolfMacro.java | 8 ++++++-- .../org/owasp/webgoat/asciidoc/WebWolfRootMacro.java | 4 ++++ webgoat-integration-tests/pom.xml | 2 +- webgoat-lessons/challenge/pom.xml | 3 +-- webgoat-lessons/cross-site-scripting/pom.xml | 2 +- webgoat-lessons/html-tampering/pom.xml | 1 - webgoat-lessons/insecure-deserialization/pom.xml | 1 - webgoat-lessons/insecure-login/pom.xml | 1 - webgoat-lessons/jwt/pom.xml | 4 ++-- webgoat-lessons/password-reset/pom.xml | 1 - webgoat-lessons/secure-passwords/pom.xml | 2 +- webgoat-lessons/ssrf/pom.xml | 1 - webgoat-lessons/vulnerable-components/pom.xml | 8 ++++---- webgoat-lessons/xxe/pom.xml | 4 ++-- webwolf/pom.xml | 6 +++--- 20 files changed, 49 insertions(+), 33 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 0ef6599a5..70ee16e14 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -18,7 +18,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 + 3.0.0 install diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml index 33cbd19cc..96d0ca51d 100644 --- a/webgoat-container/pom.xml +++ b/webgoat-container/pom.xml @@ -70,7 +70,7 @@ org.asciidoctor asciidoctorj - 1.5.8.1 + 2.4.3 org.springframework.boot diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/OperatingSystemMacro.java b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/OperatingSystemMacro.java index d965c2454..91613c309 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/OperatingSystemMacro.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/OperatingSystemMacro.java @@ -1,18 +1,22 @@ package org.owasp.webgoat.asciidoc; +import org.asciidoctor.ast.ContentNode; +import org.asciidoctor.extension.InlineMacroProcessor; + import java.util.Map; -import org.asciidoctor.ast.AbstractBlock; -import org.asciidoctor.extension.InlineMacroProcessor; - public class OperatingSystemMacro extends InlineMacroProcessor { + public OperatingSystemMacro(String macroName) { + super(macroName); + } + public OperatingSystemMacro(String macroName, Map config) { super(macroName, config); } @Override - public String process(AbstractBlock parent, String target, Map attributes) { + public Object process(ContentNode contentNode, String target, Map attributes) { return System.getProperty("os.name"); } } diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatTmpDirMacro.java b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatTmpDirMacro.java index 845815d9f..3310a22fe 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatTmpDirMacro.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatTmpDirMacro.java @@ -1,17 +1,22 @@ package org.owasp.webgoat.asciidoc; -import org.asciidoctor.ast.AbstractBlock; +import org.asciidoctor.ast.ContentNode; import org.asciidoctor.extension.InlineMacroProcessor; + import java.util.Map; public class WebGoatTmpDirMacro extends InlineMacroProcessor { + public WebGoatTmpDirMacro(String macroName) { + super(macroName); + } + public WebGoatTmpDirMacro(String macroName, Map config) { super(macroName, config); } @Override - public String process(AbstractBlock parent, String target, Map attributes) { + public String process(ContentNode contentNode, String target, Map attributes) { return EnvironmentExposure.getEnv().getProperty("webgoat.server.directory"); } } diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatVersionMacro.java b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatVersionMacro.java index b736f4afe..8029ab0fd 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatVersionMacro.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebGoatVersionMacro.java @@ -1,17 +1,22 @@ package org.owasp.webgoat.asciidoc; -import org.asciidoctor.ast.AbstractBlock; +import org.asciidoctor.ast.ContentNode; import org.asciidoctor.extension.InlineMacroProcessor; + import java.util.Map; public class WebGoatVersionMacro extends InlineMacroProcessor { + public WebGoatVersionMacro(String macroName) { + super(macroName); + } + public WebGoatVersionMacro(String macroName, Map config) { super(macroName, config); } @Override - public String process(AbstractBlock parent, String target, Map attributes) { + public String process(ContentNode contentNode, String target, Map attributes) { return EnvironmentExposure.getEnv().getProperty("webgoat.build.version"); } } diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfMacro.java b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfMacro.java index d78d62765..40b1ba555 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfMacro.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfMacro.java @@ -1,6 +1,6 @@ package org.owasp.webgoat.asciidoc; -import org.asciidoctor.ast.AbstractBlock; +import org.asciidoctor.ast.ContentNode; import org.asciidoctor.extension.InlineMacroProcessor; import org.springframework.core.env.Environment; import org.springframework.web.context.request.RequestContextHolder; @@ -17,12 +17,16 @@ import java.util.Map; */ public class WebWolfMacro extends InlineMacroProcessor { + public WebWolfMacro(String macroName) { + super(macroName); + } + public WebWolfMacro(String macroName, Map config) { super(macroName, config); } @Override - public String process(AbstractBlock parent, String target, Map attributes) { + public String process(ContentNode contentNode, String target, Map attributes) { Environment env = EnvironmentExposure.getEnv(); String hostname = determineHost(env.getProperty("webwolf.host"), env.getProperty("webwolf.port")); diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfRootMacro.java b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfRootMacro.java index b188c2a66..7491af6fb 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfRootMacro.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/asciidoc/WebWolfRootMacro.java @@ -10,6 +10,10 @@ import java.util.Map; */ public class WebWolfRootMacro extends WebWolfMacro { + public WebWolfRootMacro(String macroName) { + super(macroName); + } + public WebWolfRootMacro(String macroName, Map config) { super(macroName, config); } diff --git a/webgoat-integration-tests/pom.xml b/webgoat-integration-tests/pom.xml index 0690413d4..c5b095eae 100644 --- a/webgoat-integration-tests/pom.xml +++ b/webgoat-integration-tests/pom.xml @@ -18,7 +18,7 @@ io.github.bonigarcia webdrivermanager - 4.2.2 + 4.3.1 test diff --git a/webgoat-lessons/challenge/pom.xml b/webgoat-lessons/challenge/pom.xml index accce8025..874053493 100644 --- a/webgoat-lessons/challenge/pom.xml +++ b/webgoat-lessons/challenge/pom.xml @@ -14,7 +14,7 @@ io.jsonwebtoken jjwt - 0.7.0 + 0.9.1 org.springframework.boot @@ -24,7 +24,6 @@ org.springframework.security spring-security-test - 4.1.3.RELEASE test diff --git a/webgoat-lessons/cross-site-scripting/pom.xml b/webgoat-lessons/cross-site-scripting/pom.xml index 1b72ff455..7a0171373 100644 --- a/webgoat-lessons/cross-site-scripting/pom.xml +++ b/webgoat-lessons/cross-site-scripting/pom.xml @@ -13,7 +13,7 @@ org.jsoup jsoup - 1.11.3 + 1.13.1 diff --git a/webgoat-lessons/html-tampering/pom.xml b/webgoat-lessons/html-tampering/pom.xml index fd06dd7cc..5478f4126 100755 --- a/webgoat-lessons/html-tampering/pom.xml +++ b/webgoat-lessons/html-tampering/pom.xml @@ -18,7 +18,6 @@ org.springframework.security spring-security-test - 4.1.3.RELEASE test diff --git a/webgoat-lessons/insecure-deserialization/pom.xml b/webgoat-lessons/insecure-deserialization/pom.xml index 9e462d155..7db02049a 100755 --- a/webgoat-lessons/insecure-deserialization/pom.xml +++ b/webgoat-lessons/insecure-deserialization/pom.xml @@ -18,7 +18,6 @@ org.springframework.security spring-security-test - 4.1.3.RELEASE test diff --git a/webgoat-lessons/insecure-login/pom.xml b/webgoat-lessons/insecure-login/pom.xml index 5c4dd18b6..73f64d793 100755 --- a/webgoat-lessons/insecure-login/pom.xml +++ b/webgoat-lessons/insecure-login/pom.xml @@ -18,7 +18,6 @@ org.springframework.security spring-security-test - 4.1.3.RELEASE test diff --git a/webgoat-lessons/jwt/pom.xml b/webgoat-lessons/jwt/pom.xml index b86dff4d7..9add3ad70 100644 --- a/webgoat-lessons/jwt/pom.xml +++ b/webgoat-lessons/jwt/pom.xml @@ -13,12 +13,12 @@ io.jsonwebtoken jjwt - 0.7.0 + 0.9.1 org.springframework.security spring-security-test - 4.1.3.RELEASE + 5.4.5 test diff --git a/webgoat-lessons/password-reset/pom.xml b/webgoat-lessons/password-reset/pom.xml index 574c22f32..f4aa1f5f2 100644 --- a/webgoat-lessons/password-reset/pom.xml +++ b/webgoat-lessons/password-reset/pom.xml @@ -13,7 +13,6 @@ org.springframework.security spring-security-test - 4.1.3.RELEASE test diff --git a/webgoat-lessons/secure-passwords/pom.xml b/webgoat-lessons/secure-passwords/pom.xml index 950cb26c3..8d1e26787 100644 --- a/webgoat-lessons/secure-passwords/pom.xml +++ b/webgoat-lessons/secure-passwords/pom.xml @@ -13,7 +13,7 @@ com.nulab-inc zxcvbn - 1.2.5 + 1.4.0 \ No newline at end of file diff --git a/webgoat-lessons/ssrf/pom.xml b/webgoat-lessons/ssrf/pom.xml index 48a85a78b..15242416c 100755 --- a/webgoat-lessons/ssrf/pom.xml +++ b/webgoat-lessons/ssrf/pom.xml @@ -18,7 +18,6 @@ org.springframework.security spring-security-test - 4.1.3.RELEASE test diff --git a/webgoat-lessons/vulnerable-components/pom.xml b/webgoat-lessons/vulnerable-components/pom.xml index 97ded9f15..827c349c1 100644 --- a/webgoat-lessons/vulnerable-components/pom.xml +++ b/webgoat-lessons/vulnerable-components/pom.xml @@ -12,22 +12,22 @@ com.thoughtworks.xstream xstream - 1.4.5 + 1.4.5 cglib cglib-nodep - 2.2 + 2.2 ant ant-launcher - 1.6.2 + 1.6.5 ant ant - 1.6.2 + 1.6.5 xml-resolver diff --git a/webgoat-lessons/xxe/pom.xml b/webgoat-lessons/xxe/pom.xml index 263fef6cd..7f4e3c007 100644 --- a/webgoat-lessons/xxe/pom.xml +++ b/webgoat-lessons/xxe/pom.xml @@ -18,13 +18,13 @@ org.glassfish.jaxb jaxb-runtime - 2.3.0 + 3.0.0 com.github.tomakehurst wiremock - 2.8.0 + 2.27.2 test diff --git a/webwolf/pom.xml b/webwolf/pom.xml index 2a1093857..dffb992f9 100644 --- a/webwolf/pom.xml +++ b/webwolf/pom.xml @@ -39,7 +39,7 @@ org.bitbucket.b_c jose4j - 0.7.2 + 0.7.6 org.springframework.boot @@ -84,12 +84,12 @@ org.webjars bootstrap - 3.3.7 + 5.0.0-beta3 org.webjars jquery - 3.2.1 + 3.6.0 org.hsqldb