From 0aad4e2246971601c16a20240eebf61964f8c198 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 17 Jan 2023 11:56:23 +0100 Subject: feat(tvix/derivation): also fail if output name is called `drv` `drv` is an invalid output name too, as this would cause a `builtins.derivation` call to return an attrset with a `drvPath` key (which already exists) and has a different meaning. Also handle errors during store path construction, and return our own error type, instead of the ParseStorePathError. Change-Id: Ib7952dde1d5cf18a0e210928df7c57b5939b7678 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7850 Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: flokli --- tvix/derivation/src/validate.rs | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'tvix/derivation/src/validate.rs') diff --git a/tvix/derivation/src/validate.rs b/tvix/derivation/src/validate.rs index 2ff23d52048f..b5ba4f72ca28 100644 --- a/tvix/derivation/src/validate.rs +++ b/tvix/derivation/src/validate.rs @@ -12,7 +12,16 @@ impl Derivation { // Validate all outputs for (output_name, output) in &self.outputs { - if output_name.is_empty() { + // empty output names are invalid. + // + // `drv` is an invalid output name too, as this would cause + // a `builtins.derivation` call to return an attrset with a + // `drvPath` key (which already exists) and has a different + // meaning. + // + // Other output names that don't match the name restrictions from + // [StorePath] will fail output path calculation. + if output_name.is_empty() || output_name == "drv" { return Err(ValidateDerivationError::InvalidOutputName( output_name.to_string(), )); @@ -62,13 +71,22 @@ impl Derivation { } for output_name in output_names.iter() { - if output_name.is_empty() { + // empty output names are invalid. + // + // `drv` is an invalid output name too, as this would cause + // a `builtins.derivation` call to return an attrset with a + // `drvPath` key (which already exists) and has a different + // meaning. + // + // Other output names that don't match the name restrictions + // from [StorePath] can't be constructed with this library, but + // are not explicitly checked here (yet). + if output_name.is_empty() || output_name == "drv" { return Err(ValidateDerivationError::InvalidInputDerivationOutputName( input_derivation_path.to_string(), output_name.to_string(), )); } - // TODO: do we need to apply more name validation here? } } -- cgit 1.4.1