From 2a5b4385ea423134813455c074ad01099dec19d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Feb 2025 19:52:40 +0100 Subject: [PATCH] chore: bump com.diffplug.spotless:spotless-maven-plugin (#2006) Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.41.1 to 2.44.2. - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/maven/2.41.1...maven/2.44.2) --- updated-dependencies: - dependency-name: com.diffplug.spotless:spotless-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- .../AccessControlIntegrationTest.java | 4 ++-- .../integration/XXEIntegrationTest.java | 16 ++++++++-------- .../passwordreset/ResetLinkAssignment.java | 18 +++++++++--------- .../owasp/webgoat/lessons/xxe/SimpleXXE.java | 10 +++++----- .../missingac/MissingFunctionACUsersTest.java | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index d0c6c526c..e46be64ff 100644 --- a/pom.xml +++ b/pom.xml @@ -548,7 +548,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.41.1 + 2.44.2 diff --git a/src/it/java/org/owasp/webgoat/integration/AccessControlIntegrationTest.java b/src/it/java/org/owasp/webgoat/integration/AccessControlIntegrationTest.java index 788103a80..cf376ff8a 100644 --- a/src/it/java/org/owasp/webgoat/integration/AccessControlIntegrationTest.java +++ b/src/it/java/org/owasp/webgoat/integration/AccessControlIntegrationTest.java @@ -32,8 +32,8 @@ class AccessControlIntegrationTest extends IntegrationTest { // create user var userTemplate = """ - {"username":"%s","password":"%s","admin": "true"} - """; + {"username":"%s","password":"%s","admin": "true"} + """; RestAssured.given() .when() .relaxedHTTPSValidation() diff --git a/src/it/java/org/owasp/webgoat/integration/XXEIntegrationTest.java b/src/it/java/org/owasp/webgoat/integration/XXEIntegrationTest.java index 938698276..4787d6d3a 100644 --- a/src/it/java/org/owasp/webgoat/integration/XXEIntegrationTest.java +++ b/src/it/java/org/owasp/webgoat/integration/XXEIntegrationTest.java @@ -9,20 +9,20 @@ public class XXEIntegrationTest extends IntegrationTest { private static final String xxe3 = """ - ]>&xxe;test - """; +]>&xxe;test +"""; private static final String xxe4 = """ - ]>&xxe;test - """; +]>&xxe;test +"""; private static final String dtd7 = """ - ">%all; - """; +">%all; +"""; private static final String xxe7 = """ - %remote;]>test&send; - """; +%remote;]>test&send; +"""; private String webGoatHomeDirectory; diff --git a/src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java index 3fe8af534..7f85e18ed 100644 --- a/src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java +++ b/src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java @@ -72,17 +72,17 @@ public class ResetLinkAssignment implements AssignmentEndpoint { static final String TEMPLATE = """ - Hi, you requested a password reset link, please use this link to reset your - password. + Hi, you requested a password reset link, please use this link to reset your + password. - If you did not request this password change you can ignore this message. - If you have any comments or questions, please do not hesitate to reach us at - support@webgoat-cloud.org + If you did not request this password change you can ignore this message. + If you have any comments or questions, please do not hesitate to reach us at + support@webgoat-cloud.org - Kind regards, - Team WebGoat - """; + Kind regards, + Team WebGoat + """; @PostMapping("/PasswordReset/reset/login") @ResponseBody diff --git a/src/main/java/org/owasp/webgoat/lessons/xxe/SimpleXXE.java b/src/main/java/org/owasp/webgoat/lessons/xxe/SimpleXXE.java index 2547cbcd4..5c28d69ee 100644 --- a/src/main/java/org/owasp/webgoat/lessons/xxe/SimpleXXE.java +++ b/src/main/java/org/owasp/webgoat/lessons/xxe/SimpleXXE.java @@ -99,10 +99,10 @@ public class SimpleXXE implements AssignmentEndpoint { @ResponseBody public String getSampleDTDFile() { return """ - - - "> - %all; - """; + + +"> +%all; +"""; } } diff --git a/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.java b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.java index a518940c1..a5af31297 100644 --- a/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsersTest.java @@ -58,8 +58,8 @@ class MissingFunctionACUsersTest extends LessonTest { void addUser() throws Exception { var user = """ - {"username":"newUser","password":"newUser12","admin": "true"} - """; + {"username":"newUser","password":"newUser12","admin": "true"} + """; mockMvc .perform( MockMvcRequestBuilders.post("/access-control/users")