Automated rollback of commit 7e6837cc1d1aa4259f5c27ba3606b277b5f6c3e9.
*** Reason for rollback ***
Breaks on our CI Linux machines (but works on our work desktop Linux machines); apparently, even our own Linux machines are too different from each other...
Fixes #4557
*** Original change description ***
http_archive: verify that unicode characters are OK in tar archives
Add a test verifying that http_archive can extract a tar archive
containing unicode characters. While such files cannot be referred
to by labels, it is still important that the archive can be extracted.
Also fix that use case on Darwin, by appropriately reencoding the string,
so that the Files java standard library can encode it back to what we
had in the first place.
Work-around for #1653, showing that http_archive from @bazel_tools can
be used; however, the issue still remains for zip archives.
***
PiperOrigin-RevId: 184132385
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/CompressedTarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/CompressedTarFunction.java
index 599fe06..b3141c7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/CompressedTarFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/CompressedTarFunction.java
@@ -17,20 +17,20 @@
import com.google.common.base.Optional;
import com.google.devtools.build.lib.bazel.repository.DecompressorValue.Decompressor;
import com.google.devtools.build.lib.rules.repository.RepositoryFunction.RepositoryFunctionException;
-import com.google.devtools.build.lib.util.OS;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.skyframe.SkyFunctionException.Transience;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
+
import java.util.Date;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
/**
* Common code for unarchiving a compressed TAR file.
*/
@@ -79,20 +79,8 @@
filename, descriptor.repositoryPath().getRelative(linkName));
}
} else {
- if (OS.getCurrent() == OS.DARWIN) {
- // On Darwin, Files interprets file names as utf8, regardless of the standard
- // encoding, so we have to create a unicode string that, when ecoded utf-8 gives
- // the same octets back; in this way, we can have Files.copy to behave consistent
- // with the file name interpretation of com.google.devtools.build.lib.vfs.
- String filenameForFiles =
- new String(
- filename.getPathFile().toPath().toString().getBytes("ISO-8859-1"), "UTF-8");
- Files.copy(
- tarStream, Paths.get(filenameForFiles), StandardCopyOption.REPLACE_EXISTING);
- } else {
- Files.copy(
- tarStream, filename.getPathFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
- }
+ Files.copy(
+ tarStream, filename.getPathFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
filename.chmod(entry.getMode());
// This can only be done on real files, not links, or it will skip the reader to
diff --git a/src/test/shell/bazel/external_integration_test.sh b/src/test/shell/bazel/external_integration_test.sh
index 76df020..b5c5f84 100755
--- a/src/test/shell/bazel/external_integration_test.sh
+++ b/src/test/shell/bazel/external_integration_test.sh
@@ -949,33 +949,6 @@
|| fail 'Expected @ext//:foo and //:foo not to conflict'
}
-function test_unicode_characters_tar() {
- # Verify that archives with the utf-8 encoding of unicode-characters in the
- # file name can be decompressed.
- WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
- cd "${WRKDIR}"
- mkdir ext
- # F0 9F 8D 82 is the UTF-8 encoding of the 'FALLEN LEAF' (U+1F342) unicode
- # symbol
- echo 'leaves' > ext/$'unicode-\xF0\x9F\x8D\x83.txt'
- echo 'Hello World' > ext/hello.txt
- echo 'exports_files(["hello.txt"])' > ext/BUILD
- tar cvf ext.tar ext
- rm -rf ext
-
- mkdir main
- cd main
- cat > WORKSPACE <<EOF
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-http_archive(
- name="ext",
- strip_prefix="ext",
- urls=["file://${WRKDIR}/ext.tar"],
-)
-EOF
- bazel build '@ext//:hello.txt' || fail "expected success"
-}
-
function test_missing_build() {
mkdir ext
echo foo> ext/foo
