Skip to content

Commit 78e61fc

Browse files
tsegismontvietj
authored andcommitted
Make sure test dir is cleaned up
Signed-off-by: Thomas Segismont <tsegismont@gmail.com>
1 parent f2dbc2a commit 78e61fc

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

vertx-web/src/test/java/io/vertx/ext/web/handler/StaticHandlerTest.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import java.util.function.BiConsumer;
4242

4343
import static io.vertx.core.http.HttpHeaders.ACCEPT_ENCODING;
44+
import static java.util.Comparator.reverseOrder;
4445
import static java.util.stream.Collectors.collectingAndThen;
4546
import static java.util.stream.Collectors.toList;
4647

@@ -676,11 +677,18 @@ public void testCustomDirectoryListingHtmlEscaping() throws Exception {
676677

677678
stat.setDirectoryListing(true);
678679

679-
testDirectoryListingHtmlCustomTemplate(
680-
"META-INF/vertx/web/vertx-web-directory.html",
681-
"/dirxss/",
682-
"<a href=\"/\">..</a>",
683-
"<ul id=\"files\"><li><a href=\"/dirxss/%3Cimg%20src=x%20onerror=alert('XSS-FILE')%3E.txt\" title=\"&#60;img src=x onerror=alert(&#39;XSS-FILE&#39;)&#62;.txt\">&#60;img src=x onerror=alert(&#39;XSS-FILE&#39;)&#62;.txt</a></li></ul>");
680+
try {
681+
testDirectoryListingHtmlCustomTemplate(
682+
"META-INF/vertx/web/vertx-web-directory.html",
683+
"/dirxss/",
684+
"<a href=\"/\">..</a>",
685+
"<ul id=\"files\"><li><a href=\"/dirxss/%3Cimg%20src=x%20onerror=alert('XSS-FILE')%3E.txt\" title=\"&#60;img src=x onerror=alert(&#39;XSS-FILE&#39;)&#62;.txt\">&#60;img src=x onerror=alert(&#39;XSS-FILE&#39;)&#62;.txt</a></li></ul>");
686+
} finally {
687+
try (var pathStream = Files.walk(testDir.toPath())) {
688+
pathStream.sorted(reverseOrder()).map(Path::toFile).forEach(File::delete);
689+
}
690+
assertFalse(testDir.exists());
691+
}
684692
}
685693

686694
private void testDirectoryListingHtmlCustomTemplate(String dirTemplateFile, String path, String parentLink, String files) throws Exception {

0 commit comments

Comments
 (0)