From 5e8cfcfcd6289cff5c4391fa93e4246ec1cf6c23 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 30 Apr 2024 12:16:40 +0300
Subject: fix(tvix/castore/import): symlink targets are Vec<u8>

These can be arbitrary bytes in theory. Some of our libraries might
be more strict, or inconsistent w.r.t. their representation of path
separators.

Change-Id: I7981b74fc7d3dd79f5589cf2ef52ced7b71dd003
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11551
Tested-by: BuildkiteCI
Reviewed-by: edef <edef@edef.eu>
---
 tvix/castore/src/import/archive.rs | 4 +++-
 tvix/castore/src/import/fs.rs      | 5 ++++-
 tvix/castore/src/import/mod.rs     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'tvix/castore/src')

diff --git a/tvix/castore/src/import/archive.rs b/tvix/castore/src/import/archive.rs
index b13716f54f7f..a3f63be49098 100644
--- a/tvix/castore/src/import/archive.rs
+++ b/tvix/castore/src/import/archive.rs
@@ -150,7 +150,9 @@ where
                 target: entry
                     .link_name()?
                     .ok_or_else(|| Error::MissingSymlinkTarget(path.clone()))?
-                    .into(),
+                    .into_owned()
+                    .into_os_string()
+                    .into_encoded_bytes(),
                 path,
             },
             // Push a bogus directory marker so we can make sure this directoy gets
diff --git a/tvix/castore/src/import/fs.rs b/tvix/castore/src/import/fs.rs
index 03a52f2ba073..5e7061bec66d 100644
--- a/tvix/castore/src/import/fs.rs
+++ b/tvix/castore/src/import/fs.rs
@@ -2,6 +2,7 @@
 
 use futures::stream::BoxStream;
 use futures::StreamExt;
+use std::os::unix::ffi::OsStringExt;
 use std::os::unix::fs::MetadataExt;
 use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
@@ -108,7 +109,9 @@ where
         Ok(IngestionEntry::Dir { path })
     } else if file_type.is_symlink() {
         let target = std::fs::read_link(entry.path())
-            .map_err(|e| Error::UnableToStat(entry.path().to_path_buf(), e))?;
+            .map_err(|e| Error::UnableToStat(entry.path().to_path_buf(), e))?
+            .into_os_string()
+            .into_vec();
 
         Ok(IngestionEntry::Symlink { path, target })
     } else if file_type.is_file() {
diff --git a/tvix/castore/src/import/mod.rs b/tvix/castore/src/import/mod.rs
index e9fdc750f8c1..e77eda255fbf 100644
--- a/tvix/castore/src/import/mod.rs
+++ b/tvix/castore/src/import/mod.rs
@@ -114,7 +114,7 @@ where
             }
             IngestionEntry::Symlink { ref target, .. } => Node::Symlink(SymlinkNode {
                 name,
-                target: target.as_os_str().as_bytes().to_owned().into(),
+                target: target.to_owned().into(),
             }),
             IngestionEntry::Regular {
                 size,
@@ -209,7 +209,7 @@ pub enum IngestionEntry {
     },
     Symlink {
         path: PathBuf,
-        target: PathBuf,
+        target: Vec<u8>,
     },
     Dir {
         path: PathBuf,
-- 
cgit 1.4.1