Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-18136. Verify FileUtils.unTar() handling of missing .tar files. 

Contributed by Steve Loughran

Change-Id: I3856afa821dbc8c2e3cb1cbe33793ec1734e2e24
This commit is contained in:
Steve Loughran 2022-02-21 17:08:22 +00:00
parent a302a19b48
commit 94a0a04113
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -887,10 +887,13 @@ public class FileUtil {
private static void unTarUsingTar(File inFile, File untarDir,
boolean gzipped) throws IOException {
StringBuffer untarCommand = new StringBuffer();
// not using canonical path here; this postpones relative path
// resolution until bash is executed.
final String source = "'" + FileUtil.makeSecureShellPath(inFile) + "'";
if (gzipped) {
untarCommand.append(" gzip -dc '")
.append(FileUtil.makeSecureShellPath(inFile))
.append("' | (");
untarCommand.append(" gzip -dc ")
.append(source)
.append(" | (");
}
untarCommand.append("cd '")
.append(FileUtil.makeSecureShellPath(untarDir))
@ -900,15 +903,17 @@ public class FileUtil {
if (gzipped) {
untarCommand.append(" -)");
} else {
untarCommand.append(FileUtil.makeSecureShellPath(inFile));
untarCommand.append(source);
}
LOG.debug("executing [{}]", untarCommand);
String[] shellCmd = { "bash", "-c", untarCommand.toString() };
ShellCommandExecutor shexec = new ShellCommandExecutor(shellCmd);
shexec.execute();
int exitcode = shexec.getExitCode();
if (exitcode != 0) {
throw new IOException("Error untarring file " + inFile +
". Tar process exited with exit code " + exitcode);
". Tar process exited with exit code " + exitcode
+ " from command " + untarCommand);
}
}

33
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
View File

@ -17,6 +17,7 @@
*/
package org.apache.hadoop.fs;
import static org.apache.hadoop.test.LambdaTestUtils.intercept;
import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@ -1106,6 +1107,38 @@ public class TestFileUtil {
doUntarAndVerify(new File(tarFileName), untarDir);
}
/**
* Verify we can't unTar a file which isn't there.
* This will test different codepaths on Windows from unix,
* but both MUST throw an IOE of some kind.
*/
@Test(timeout = 30000)
public void testUntarMissingFile() throws Throwable {
File dataDir = GenericTestUtils.getTestDir();
File tarFile = new File(dataDir, "missing; true");
File untarDir = new File(dataDir, "untarDir");
intercept(IOException.class, () ->
FileUtil.unTar(tarFile, untarDir));
}
/**
* Verify we can't unTar a file which isn't there
* through the java untar code.
* This is how {@code FileUtil.unTar(File, File}
* will behave on Windows,
*/
@Test(timeout = 30000)
public void testUntarMissingFileThroughJava() throws Throwable {
File dataDir = GenericTestUtils.getTestDir();
File tarFile = new File(dataDir, "missing; true");
File untarDir = new File(dataDir, "untarDir");
// java8 on unix throws java.nio.file.NoSuchFileException here;
// leaving as an IOE intercept in case windows throws something
// else.
intercept(IOException.class, () ->
FileUtil.unTarUsingJava(tarFile, untarDir, false));
}
@Test (timeout = 30000)
public void testCreateJarWithClassPath() throws Exception {
// create files expected to match a wildcard