From 9634bd31e6594312b68d9e07b736d18d29f7648c Mon Sep 17 00:00:00 2001 From: Hexiaoqiao Date: Wed, 17 Jan 2024 15:00:06 +0800 Subject: [PATCH] HADOOP-19031. Enhance access control for RunJar. (#6427). Contributed by He Xiaoqiao. Signed-off-by: Shuyan Zhang Signed-off-by: Shilun Fan Signed-off-by: Ayush Saxena --- .../main/java/org/apache/hadoop/util/RunJar.java | 16 +++++++++------- 1 file changed, 9 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 c28e69f54611e..e527f602cdd31 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,14 @@ 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; @@ -287,20 +291,18 @@ public void run(String[] args) throws Throwable { final File workDir; try { - workDir = File.createTempFile("hadoop-unjar", "", tmpDir); - } catch (IOException ioe) { + FileAttribute> 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(