diff options
| -rw-r--r-- | tvix/castore/src/proto/mod.rs | 18 | ||||
| -rw-r--r-- | tvix/castore/src/proto/tests/directory.rs | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tvix/castore/src/proto/mod.rs b/tvix/castore/src/proto/mod.rs index f590c6841336..07892ab79905 100644 --- a/tvix/castore/src/proto/mod.rs +++ b/tvix/castore/src/proto/mod.rs @@ -1,7 +1,7 @@ #![allow(clippy::derive_partial_eq_without_eq, non_snake_case)] // https://github.com/hyperium/tonic/issues/1056 use bstr::ByteSlice; -use std::{collections::HashSet, iter::Peekable}; +use std::{collections::HashSet, iter::Peekable, str}; use prost::Message; @@ -47,8 +47,8 @@ pub enum ValidateNodeError { #[error("Invalid Digest length: {0}")] InvalidDigestLen(usize), /// Invalid name encountered - #[error("Invalid name")] - InvalidName, + #[error("Invalid name: {}", .0.as_bstr())] + InvalidName(Vec<u8>), /// Invalid symlink target #[error("Invalid symlink target: {}", .0.as_bstr())] InvalidSymlinkTarget(Vec<u8>), @@ -63,9 +63,10 @@ fn validate_node_name(name: &[u8]) -> Result<(), ValidateNodeError> { || name.contains(&0x00) || name.contains(&b'/') { - Err(ValidateNodeError::InvalidName)?; + Err(ValidateNodeError::InvalidName(name.to_owned())) + } else { + Ok(()) } - Ok(()) } /// NamedNode is implemented for [FileNode], [DirectoryNode] and [SymlinkNode] @@ -122,14 +123,14 @@ impl node::Node { directory_node.digest.len(), ))?; } - validate_node_name(&directory_node.name)?; + validate_node_name(&directory_node.name) } // for a file root node, ensure the digest has the appropriate size. node::Node::File(file_node) => { if file_node.digest.len() != B3_LEN { Err(ValidateNodeError::InvalidDigestLen(file_node.digest.len()))?; } - validate_node_name(&file_node.name)?; + validate_node_name(&file_node.name) } // ensure the symlink target is not empty and doesn't contain null bytes. node::Node::Symlink(symlink_node) => { @@ -138,10 +139,9 @@ impl node::Node { symlink_node.target.to_vec(), ))?; } - validate_node_name(&symlink_node.name)?; + validate_node_name(&symlink_node.name) } } - Ok(()) } } diff --git a/tvix/castore/src/proto/tests/directory.rs b/tvix/castore/src/proto/tests/directory.rs index 0464a268292c..f2295740f25e 100644 --- a/tvix/castore/src/proto/tests/directory.rs +++ b/tvix/castore/src/proto/tests/directory.rs @@ -165,7 +165,7 @@ fn validate_invalid_names() { ..Default::default() }; match d.validate().expect_err("must fail") { - ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => { + ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName(_)) => { assert_eq!(n, b"") } _ => panic!("unexpected error"), @@ -182,7 +182,7 @@ fn validate_invalid_names() { ..Default::default() }; match d.validate().expect_err("must fail") { - ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => { + ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName(_)) => { assert_eq!(n, b".") } _ => panic!("unexpected error"), @@ -200,7 +200,7 @@ fn validate_invalid_names() { ..Default::default() }; match d.validate().expect_err("must fail") { - ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => { + ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName(_)) => { assert_eq!(n, b"..") } _ => panic!("unexpected error"), @@ -216,7 +216,7 @@ fn validate_invalid_names() { ..Default::default() }; match d.validate().expect_err("must fail") { - ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => { + ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName(_)) => { assert_eq!(n, b"\x00") } _ => panic!("unexpected error"), @@ -232,7 +232,7 @@ fn validate_invalid_names() { ..Default::default() }; match d.validate().expect_err("must fail") { - ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => { + ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName(_)) => { assert_eq!(n, b"foo/bar") } _ => panic!("unexpected error"), |