Merge pull request from GHSA-269q-hmxg-m83q

normanmaurer · web-flow · commit 185f8b2756a3 · 2022-05-06T08:57:43.000+02:00
* Correctly modify permission for temporary files when using Java 6 in all cases Motivation: [GHSA-5mcr-gq6c-3hq2](GHSA-5mcr-gq6c-3hq2) did not correctly fix all cases for temprory files when running on java 6. Modifications: - Add correctly adjust perms in all cases - Add logging if adjusting of permissions fails Result: Fixes GHSA-269q-hmxg-m83q * Throw on failure
diff --git a/common/src/main/java/io/netty/util/internal/PlatformDependent.java b/common/src/main/java/io/netty/util/internal/PlatformDependent.java
@@ -1447,13 +1447,20 @@ public static File createTempFile(String prefix, String suffix, File directory)
             }
             return Files.createTempFile(directory.toPath(), prefix, suffix).toFile();
         }
+        final File file;
         if (directory == null) {
-            return File.createTempFile(prefix, suffix);
+            file = File.createTempFile(prefix, suffix);
+        } else {
+            file = File.createTempFile(prefix, suffix, directory);
         }
-        File file = File.createTempFile(prefix, suffix, directory);
+
         // Try to adjust the perms, if this fails there is not much else we can do...
-        file.setReadable(false, false);
-        file.setReadable(true, true);
+        if (!file.setReadable(false, false)) {
+            throw new IOException("Failed to set permissions on temporary file " + file);
+        }
+        if (!file.setReadable(true, true)) {
+            throw new IOException("Failed to set permissions on temporary file " + file);
+        }
         return file;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1447,13 +1447,20 @@ public static File createTempFile(String prefix, String suffix, File directory)`
`1447`	`1447`	`}`
`1448`	`1448`	`return Files.createTempFile(directory.toPath(), prefix, suffix).toFile();`
`1449`	`1449`	`}`
	`1450`	`+ final File file;`
`1450`	`1451`	`if (directory == null) {`
`1451`		`- return File.createTempFile(prefix, suffix);`
	`1452`	`+ file = File.createTempFile(prefix, suffix);`
	`1453`	`+ } else {`
	`1454`	`+ file = File.createTempFile(prefix, suffix, directory);`
`1452`	`1455`	`}`
`1453`		`- File file = File.createTempFile(prefix, suffix, directory);`
	`1456`	`+`
`1454`	`1457`	`// Try to adjust the perms, if this fails there is not much else we can do...`
`1455`		`- file.setReadable(false, false);`
`1456`		`- file.setReadable(true, true);`
	`1458`	`+ if (!file.setReadable(false, false)) {`
	`1459`	`+ throw new IOException("Failed to set permissions on temporary file " + file);`
	`1460`	`+ }`
	`1461`	`+ if (!file.setReadable(true, true)) {`
	`1462`	`+ throw new IOException("Failed to set permissions on temporary file " + file);`
	`1463`	`+ }`
`1457`	`1464`	`return file;`
`1458`	`1465`	`}`
`1459`	`1466`