59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
|
From 7c30e7ffb65f9a58a85b3b556f8c0de04c1b4b20 Mon Sep 17 00:00:00 2001
|
||
|
|
From: He Xiaoqiao <hexiaoqiao@apache.org>
|
||
|
|
Date: Mon, 15 Jan 2024 16:01:08 +0800
|
||
|
|
Subject: [PATCH] HADOOP-19031. Enhance access control for RunJar.
|
||
|
|
|
||
|
|
---
|
||
|
|
.../java/org/apache/hadoop/util/RunJar.java | 17 ++++++++++-------
|
||
|
|
1 file changed, 10 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
|
||
|
|
index 239d464..20c2d13 100644
|
||
|
|
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
|
||
|
|
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
|
||
|
|
@@ -28,10 +28,15 @@ import java.lang.reflect.Method;
|
||
|
|
import java.net.MalformedURLException;
|
||
|
|
import java.net.URL;
|
||
|
|
import java.net.URLClassLoader;
|
||
|
|
+import java.nio.file.Files;
|
||
|
|
+import java.nio.file.attribute.FileAttribute;
|
||
|
|
+import java.nio.file.attribute.PosixFilePermission;
|
||
|
|
+import java.nio.file.attribute.PosixFilePermissions;
|
||
|
|
import java.util.ArrayList;
|
||
|
|
import java.util.Arrays;
|
||
|
|
import java.util.Enumeration;
|
||
|
|
import java.util.List;
|
||
|
|
+import java.util.Set;
|
||
|
|
import java.util.jar.JarEntry;
|
||
|
|
import java.util.jar.JarFile;
|
||
|
|
import java.util.jar.JarInputStream;
|
||
|
|
@@ -278,20 +283,18 @@ public class RunJar {
|
||
|
|
|
||
|
|
final File workDir;
|
||
|
|
try {
|
||
|
|
- workDir = File.createTempFile("hadoop-unjar", "", tmpDir);
|
||
|
|
- } catch (IOException ioe) {
|
||
|
|
+ FileAttribute<Set<PosixFilePermission>> perms = PosixFilePermissions
|
||
|
|
+ .asFileAttribute(PosixFilePermissions.fromString("rwx------"));
|
||
|
|
+ workDir = Files.createTempDirectory(tmpDir.toPath(), "hadoop-unjar", perms).toFile();
|
||
|
|
+ } catch (IOException | SecurityException e) {
|
||
|
|
// If user has insufficient perms to write to tmpDir, default
|
||
|
|
// "Permission denied" message doesn't specify a filename.
|
||
|
|
System.err.println("Error creating temp dir in java.io.tmpdir "
|
||
|
|
- + tmpDir + " due to " + ioe.getMessage());
|
||
|
|
+ + tmpDir + " due to " + e.getMessage());
|
||
|
|
System.exit(-1);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!workDir.delete()) {
|
||
|
|
- System.err.println("Delete failed for " + workDir);
|
||
|
|
- System.exit(-1);
|
||
|
|
- }
|
||
|
|
ensureDirectory(workDir);
|
||
|
|
|
||
|
|
ShutdownHookManager.get().addShutdownHook(
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|