refactor(tvix/castore): add PathComponent type for checked components
This encodes a verified component on the type level. Internally, it contains a bytes::Bytes. The castore Path/PathBuf component() and file_name() methods now return this type, the old ones returning bytes were renamed to component_bytes() and component_file_name() respectively. We can drop the directory_reject_invalid_name test - it's not possible anymore to pass an invalid name to Directories::add. Invalid names in the Directory proto are still being tested to be rejected in the validate_invalid_names tests. Change-Id: Ide4d16415dfd50b7e2d7e0c36d42a3bbeeb9b6c5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12217 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI
This commit is contained in:
parent
8ea7d2b60e
commit
5ec93b57e6
25 changed files with 282 additions and 165 deletions
|
|
@ -1,7 +1,5 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use bstr::ByteSlice;
|
||||
|
||||
use petgraph::{
|
||||
graph::{DiGraph, NodeIndex},
|
||||
visit::{Bfs, DfsPostOrder, EdgeRef, IntoNodeIdentifiers, Walker},
|
||||
|
|
@ -10,7 +8,7 @@ use petgraph::{
|
|||
use tracing::instrument;
|
||||
|
||||
use super::order_validator::{LeavesToRootValidator, OrderValidator, RootToLeavesValidator};
|
||||
use crate::{B3Digest, Directory, Node};
|
||||
use crate::{path::PathComponent, B3Digest, Directory, Node};
|
||||
|
||||
#[derive(thiserror::Error, Debug)]
|
||||
pub enum Error {
|
||||
|
|
@ -71,12 +69,12 @@ pub struct ValidatedDirectoryGraph {
|
|||
root: Option<NodeIndex>,
|
||||
}
|
||||
|
||||
fn check_edge(dir: &Edge, dir_name: &[u8], child: &Directory) -> Result<(), Error> {
|
||||
fn check_edge(dir: &Edge, dir_name: &PathComponent, child: &Directory) -> Result<(), Error> {
|
||||
// Ensure the size specified in the child node matches our records.
|
||||
if dir.1 != child.size() {
|
||||
return Err(Error::ValidationError(format!(
|
||||
"'{}' has wrong size, specified {}, recorded {}",
|
||||
dir_name.as_bstr(),
|
||||
dir_name,
|
||||
dir.1,
|
||||
child.size(),
|
||||
)));
|
||||
|
|
@ -179,7 +177,7 @@ impl<O: OrderValidator> DirectoryGraph<O> {
|
|||
.expect("edge is already validated");
|
||||
|
||||
// TODO: where's the name here?
|
||||
check_edge(&edge_weight, b"??", &directory)?;
|
||||
check_edge(&edge_weight, &"??".try_into().unwrap(), &directory)?;
|
||||
}
|
||||
|
||||
// finally, store the directory information in the node weight
|
||||
|
|
@ -284,7 +282,7 @@ mod tests {
|
|||
pub static ref BROKEN_PARENT_DIRECTORY: Directory = {
|
||||
let mut dir = Directory::new();
|
||||
dir.add(
|
||||
"foo".into(),
|
||||
"foo".try_into().unwrap(),
|
||||
Node::Directory{
|
||||
digest: DIRECTORY_A.digest(),
|
||||
size: DIRECTORY_A.size() + 42, // wrong!
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ async fn upload_reject_wrong_size(directory_service: impl DirectoryService) {
|
|||
let wrong_parent_directory = {
|
||||
let mut dir = Directory::new();
|
||||
dir.add(
|
||||
"foo".into(),
|
||||
"foo".try_into().unwrap(),
|
||||
Node::Directory {
|
||||
digest: DIRECTORY_A.digest(),
|
||||
size: DIRECTORY_A.size() + 42, // wrong!
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ where
|
|||
DS: AsRef<dyn DirectoryService>,
|
||||
{
|
||||
let mut parent_node = root_node;
|
||||
for component in path.as_ref().components() {
|
||||
for component in path.as_ref().components_bytes() {
|
||||
match parent_node {
|
||||
Node::File { .. } | Node::Symlink { .. } => {
|
||||
// There's still some path left, but the parent node is no directory.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue