From fdd7817aad18346197a521593bdafdae4045aeb6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 31 Dec 2023 18:54:44 +0200 Subject: feat(nix-compat/store_path): build_ca_path may fail Change-Id: Ia74ee870f38b7966501458bace541092256c3213 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10509 Reviewed-by: raitobezarius Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/store/src/bin/tvix-store.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tvix/store/src') diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index ab80415cf2e5..ef66d6b7bab1 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -283,8 +283,16 @@ async fn main() -> Result<(), Box> { let (nar_size, nar_sha256) = path_info_service.calculate_nar(&root_node).await?; + // Calculate the output path. This might still fail, as some names are illegal. let output_path = - store_path::build_nar_based_store_path(&nar_sha256, name); + store_path::build_nar_based_store_path(&nar_sha256, name).map_err( + |_| { + std::io::Error::new( + std::io::ErrorKind::InvalidData, + format!("invalid name: {}", name), + ) + }, + )?; // assemble a new root_node with a name that is derived from the nar hash. let root_node = -- cgit 1.4.1