Correctly handle non-ASCII paths in DiskCacheLock.

PiperOrigin-RevId: 680491370 Change-Id: Ia3454a60296fa183e59b0fde8c41da42ef75aba5
fmeum · Sep 30, 2024 · 6922734 · 6922734
1 parent 333b625
commit 6922734
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/disk/BUILD b/src/main/java/com/google/devtools/build/lib/remote/disk/BUILD
@@ -22,6 +22,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/remote/options",
         "//src/main/java/com/google/devtools/build/lib/remote/util",
         "//src/main/java/com/google/devtools/build/lib/server:idle_task",
+        "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//third_party:flogger",
         "//third_party:guava",

diff --git a/src/main/java/com/google/devtools/build/lib/remote/disk/DiskCacheLock.java b/src/main/java/com/google/devtools/build/lib/remote/disk/DiskCacheLock.java
@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.lib.remote.disk;
 
+import static com.google.devtools.build.lib.util.StringUtil.reencodeInternalToExternal;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.devtools.build.lib.vfs.Path;
 import java.io.IOException;
@@ -56,7 +58,8 @@ private static DiskCacheLock get(Path path, boolean shared) throws IOException {
     path.getParentDirectory().createDirectoryAndParents();
     FileChannel channel =
         FileChannel.open(
-            java.nio.file.Path.of(path.getPathString()),
+            // Correctly handle non-ASCII paths by converting from the internal string encoding.
+            java.nio.file.Path.of(reencodeInternalToExternal(path.getPathString())),
             StandardOpenOption.READ,
             StandardOpenOption.WRITE,
             StandardOpenOption.CREATE);