dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some debugging information to know which test cases might have failed

Browse Source
This commit is contained in:
Nanne Baars
2021-03-28 17:41:19 +02:00
committed by Nanne Baars
parent ce6e4d2090
commit 935871c39a
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webgoat-integration-tests/src/test/java/org/owasp/webgoat/IntegrationTest.java
View File

@ -3,6 +3,7 @@ package org.owasp.webgoat;
import io.restassured.RestAssured; import io.restassured.RestAssured;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.hamcrest.CoreMatchers; import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
@ -18,6 +19,7 @@ import java.util.UUID;
import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.given;
@Slf4j
public abstract class IntegrationTest { public abstract class IntegrationTest {
protected static int WG_PORT = 8080; protected static int WG_PORT = 8080;
@ -262,6 +264,7 @@ public abstract class IntegrationTest {
} }
public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) { public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
log.info("Checking assignment for: {}", url);
MatcherAssert.assertThat( MatcherAssert.assertThat(
RestAssured.given() RestAssured.given()
.when() .when()

2
webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/Comment.java
View File

@ -26,6 +26,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.ToString;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
@ -38,6 +39,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@XmlRootElement @XmlRootElement
@ToString
public class Comment { public class Comment {
private String user; private String user;
private String dateTime; private String dateTime;

1
webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java
View File

@ -76,6 +76,7 @@ public class SimpleXXE extends AssignmentEndpoint {
secure = true; secure = true;
} }
Comment comment = comments.parseXml(commentStr, secure); Comment comment = comments.parseXml(commentStr, secure);
System.err.println("Comment " + comment);
comments.addComment(comment, false); comments.addComment(comment, false);
if (checkSolution(comment)) { if (checkSolution(comment)) {
return success(this).build(); return success(this).build();