From d9a7bacde3ccd53471ad9e41fa64234006d17501 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Fri, 13 Dec 2024 02:30:27 +0800 Subject: [PATCH] fix: glassfish upload error --- .../integration/glassfish/GlassFish3ContainerTest.java | 1 - vul-webapp/src/main/java/UploadServlet.java | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java index 0f3f8642..b4ae4116 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java @@ -60,7 +60,6 @@ public class GlassFish3ContainerTest { @AfterAll static void tearDown() { String logs = container.getLogs(); - log.info(logs); assertThat("Logs should not contain any exceptions", logs, doesNotContainException()); } diff --git a/vul-webapp/src/main/java/UploadServlet.java b/vul-webapp/src/main/java/UploadServlet.java index 393fd00c..cc5e0d98 100644 --- a/vul-webapp/src/main/java/UploadServlet.java +++ b/vul-webapp/src/main/java/UploadServlet.java @@ -35,7 +35,11 @@ public class UploadServlet extends HttpServlet { for (FileItem item : items) { if (!item.isFormField()) { String fileName = new File(item.getName()).getName(); - String uploadPath = getServletContext().getRealPath(UPLOAD_DIRECTORY) + File.separator + fileName; + String uploadFolder = getServletContext().getRealPath(UPLOAD_DIRECTORY); + if (!uploadFolder.endsWith(File.separator)) { + uploadFolder += File.separator; + } + String uploadPath = uploadFolder + fileName; File uploadFile = new File(uploadPath); item.write(uploadFile); response.getWriter().println("file upload success: " + uploadPath);