#1045: Run build with Java 16

webgoat-integration-tests/pom.xml

@@ -10,17 +10,17 @@
     </parent>
 
     <dependencies>
-    	<dependency>
+        <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-	    <artifactId>selenium-java</artifactId>
-	    <scope>test</scope>
-	</dependency>
-	<dependency>
-    	<groupId>io.github.bonigarcia</groupId>
-    	<artifactId>webdrivermanager</artifactId>
-    	<version>4.3.1</version>
-    	<scope>test</scope>
-	</dependency>
+            <artifactId>selenium-java</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <version>4.3.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.owasp.webgoat</groupId>
             <artifactId>webgoat-server</artifactId>
@@ -43,16 +43,16 @@
             <artifactId>webwolf</artifactId>
             <version>${project.version}</version>
         </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.rest-assured</groupId>
-			<artifactId>rest-assured</artifactId>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -62,14 +62,12 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <forkCount>0</forkCount>
-                    <reuseForks>true</reuseForks>
+                    <!-- Otherwise test will fail with JDK16 -->
                     <argLine>
-                        --illegal-access=permit
+                        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.beans=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>

webgoat-integration-tests/src/test/java/org/owasp/webgoat/PathTraversalITTest.java

@@ -24,9 +24,8 @@ import java.util.zip.ZipOutputStream;
 
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-public class PathTraversalTest extends IntegrationTest {
+class PathTraversalITTest extends IntegrationTest {
 
-    //the JUnit5 way
     @TempDir
     Path tempDir;
 
@@ -35,8 +34,7 @@ public class PathTraversalTest extends IntegrationTest {
     @BeforeEach
     @SneakyThrows
     public void init() {
-        fileToUpload = Files.createFile(
-                tempDir.resolve("test.jpg")).toFile();
+        fileToUpload = Files.createFile(tempDir.resolve("test.jpg")).toFile();
         Files.write(fileToUpload.toPath(), "This is a test".getBytes());
         startLesson("PathTraversal");
     }
@@ -52,7 +50,7 @@ public class PathTraversalTest extends IntegrationTest {
         );
     }
 
-    public void assignment1() throws IOException {
+    private void assignment1() throws IOException {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -66,7 +64,7 @@ public class PathTraversalTest extends IntegrationTest {
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
     }
 
-    public void assignment2() throws IOException {
+    private void assignment2() throws IOException {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -80,7 +78,7 @@ public class PathTraversalTest extends IntegrationTest {
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
     }
 
-    public void assignment3() throws IOException {
+    private void assignment3() throws IOException {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -93,7 +91,7 @@ public class PathTraversalTest extends IntegrationTest {
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
     }
 
-    public void assignment4() throws IOException {
+    private void assignment4() throws IOException {
         var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
         RestAssured.given().urlEncodingEnabled(false)
                 .when()
@@ -102,17 +100,17 @@ public class PathTraversalTest extends IntegrationTest {
                 .get(uri)
                 .then()
                 .statusCode(200)
-                .content(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
+                .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
 
         checkAssignment("/WebGoat/PathTraversal/random", Map.of("secret", Sha512DigestUtils.shaHex(getWebgoatUser())), true);
     }
 
-    public void assignment5() throws IOException {
-        var webGoatHome = System.getProperty("user.dir") + "/target/.webgoat/PathTraversal/" + getWebgoatUser();
+    private void assignment5() throws IOException {
+        var webGoatHome = System.getProperty("java.io.tmpdir") + "/webgoat/PathTraversal/" + getWebgoatUser();
         webGoatHome = webGoatHome.replaceAll("^[a-zA-Z]:", ""); //Remove C: from the home directory on Windows
 
         var webGoatDirectory = new File(webGoatHome);
-        var zipFile = new File(webGoatDirectory, "upload.zip");
+        var zipFile = new File(tempDir.toFile(), "upload.zip");
         try (var zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
             ZipEntry e = new ZipEntry("../../../../../../../../../../" + webGoatDirectory.toString() + "/image.jpg");
             zos.putNextEntry(e);
@@ -132,7 +130,7 @@ public class PathTraversalTest extends IntegrationTest {
     }
 
     @AfterEach
-    public void shutdown() {
+    void shutdown() {
         //this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
         checkResults("/PathTraversal");
     }

webgoat-integration-tests/src/test/resources/application-inttest.properties

@@ -1,9 +1,9 @@
 #In order to run tests a known temp directory is preferred
 #that is why these values are used
 
-webgoat.user.directory=${user.dir}/target/.webgoat
-webgoat.server.directory=${user.dir}/target/.webgoat
-webwolf.fileserver.location=${user.dir}/target/webwolf-fileserver
+webgoat.user.directory=${java.io.tmpdir}/webgoat
+webgoat.server.directory=${java.io.tmpdir}/webgoat
+webwolf.fileserver.location=${java.io.tmpdir}/webwolf-fileserver
 
 #database will get deleted for every mvn clean install
 #as these extra properties are read by WebGoat and WebWolf the drop of the tables