Issue #5451 - Setting ServletContext temp dir to user private

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Oct 16, 2020 · 74d1473 · 74d1473
1 parent a23b01e
commit 74d1473
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java b/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java
@@ -42,7 +42,6 @@
 
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.ByteArrayOutputStream2;
-import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.LazyList;
 import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jetty.util.MultiMap;
@@ -152,8 +151,8 @@ protected void write(byte[] bytes, int offset, int length) throws IOException
 
         protected void createFile() throws IOException
         {
-            Path parent = MultiPartFormInputStream.this._tmpDir.toPath();
-            Path tempFile = Files.createTempFile(parent, "MultiPart", "", IO.getUserOnlyFileAttribute(parent));
+            // Create temp file in Context tempDir (which is user private already)
+            Path tempFile = Files.createTempFile(MultiPartFormInputStream.this._tmpDir.toPath(), "MultiPart", "");
             _file = tempFile.toFile();
 
             OutputStream fos = Files.newOutputStream(tempFile, StandardOpenOption.WRITE);

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IO.java
@@ -474,7 +474,7 @@ public static void close(Writer writer)
      * For Windows / Dos, that means {@link java.nio.file.attribute.DosFileAttributes}
      * </p>
      */
-    public static FileAttribute<?>[] getUserOnlyFileAttribute(Path path)
+    public static FileAttribute<?>[] getUserPrivateFileAttribute(Path path)
     {
         FileStore fileStore = null;
         try

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
@@ -190,8 +190,8 @@ protected void write(byte[] bytes, int offset, int length)
         protected void createFile()
             throws IOException
         {
-            Path parent = MultiPartInputStreamParser.this._tmpDir.toPath();
-            Path tempFile = Files.createTempFile(parent, "MultiPart", "", IO.getUserOnlyFileAttribute(parent));
+            // Create temp file in Context tempDir (which is user private already)
+            Path tempFile = Files.createTempFile(MultiPartInputStreamParser.this._tmpDir.toPath(), "MultiPart", "");
             _file = tempFile.toFile();
 
             OutputStream fos = Files.newOutputStream(tempFile, StandardOpenOption.WRITE);

diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
@@ -508,7 +508,7 @@ public void makeTempDirectory(File parent, WebAppContext context)
         else
         {
             //ensure file will always be unique by appending random digits
-            tmpDir = Files.createTempDirectory(parent.toPath(), temp, IO.getUserOnlyFileAttribute(parent.toPath())).toFile();
+            tmpDir = Files.createTempDirectory(parent.toPath(), temp, IO.getUserPrivateFileAttribute(parent.toPath())).toFile();
         }
         configureTempDirectory(tmpDir, context);