Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.
Rust agentai-agentapplecomputer-usecomputer-use-agentcontainerizationcuadesktop-automationhacktoberfestlumemacosmanusoperatorswiftvirtualizationvirtualization-frameworkwindowswindows-sandbox
fix(fleet): accept admitted DNS subdomain Image names (#7756)
r33drichards9d0f8ac9c524
diff --git a/libs/fleet/sdk/src/routes.rs b/libs/fleet/sdk/src/routes.rsindex 4bca6741e4..793b07b10b 100644--- a/libs/fleet/sdk/src/routes.rs+++ b/libs/fleet/sdk/src/routes.rs@@ -65,7 +65,7 @@ pub fn image_collection(base: &Url, namespace: &str) -> Result<Url, SdkError> {pub fn image_item(base: &Url, namespace: &str, name: &str) -> Result<Url, SdkError> {validate_dns_label_for("namespace", namespace)?;- validate_dns_label_for("name", name)?;+ validate_image_name(name)?;route(base,format!("api/k8s/apis/images.cua.ai/v1alpha1/namespaces/{namespace}/images/{name}"),@@ -196,6 +196,36 @@ pub(crate) fn validate_dns_label_for(field: &str, value: &str) -> Result<(), Sdk}}+fn validate_image_name(name: &str) -> Result<(), SdkError> {+ let reason = if name.is_empty() {+ Some("must not be empty")+ } else if name.len() > 253 {+ Some("must be at most 253 bytes")+ } else if !name.split('.').all(|label| {+ !label.is_empty()+ && !label.starts_with('-')+ && !label.ends_with('-')+ && label+ .bytes()+ .all(|byte| byte.is_ascii_lowercase() || byte.is_ascii_digit() || byte == b'-')+ }) {+ Some(+ "must be dot-separated nonempty labels containing lowercase ASCII letters, digits, and internal hyphens",+ )+ } else {+ None+ };++ match reason {+ Some(reason) => Err(SdkError::InvalidResourceName {+ field: "name".into(),+ value: name.into(),+ reason: reason.into(),+ }),+ None => Ok(()),+ }+}+fn route(base: &Url, suffix: String) -> Result<Url, SdkError> {let prefix = base.path().trim_end_matches('/');let path = if prefix.is_empty() {@@ -432,6 +462,59 @@ mod tests {);}+ #[test]+ fn image_names_match_canonical_admission() {+ let base = Url::parse("https://gateway.example/cyclops%20api/?old=query#fragment").unwrap();+ for name in [+ "ubuntu.24-04".to_owned(),+ "a".repeat(253),+ format!("{}.b", "a".repeat(251)),+ ] {+ let url = image_item(&base, "workers", &name).unwrap();+ assert_eq!(+ url.as_str(),+ format!(+ "https://gateway.example/cyclops%20api/api/k8s/apis/images.cua.ai/v1alpha1/namespaces/workers/images/{name}"+ )+ );+ }+ for name in [+ "",+ ".",+ "..",+ ".image",+ "image.",+ "image..v1",+ "../image",+ "image/other",+ "image\\other",+ "image?query",+ "image#fragment",+ "%2e%2e",+ "Image.v1",+ "-image.v1",+ "image-.v1",+ "image.-v1",+ "image.v1-",+ "image_v1",+ "im\u{e1}ge",+ ] {+ assert!(image_item(&base, "workers", name).is_err(), "{name:?}");+ }+ assert!(image_item(&base, "workers", &"a".repeat(254)).is_err());+ assert!(image_item(&base, &"a".repeat(63), "image.v1").is_ok());+ for namespace in ["workers.prod".to_owned(), "a".repeat(64)] {+ assert!(image_item(&base, &namespace, "image.v1").is_err());+ assert!(image_collection(&base, &namespace).is_err());+ }+ for name in ["image.v1".to_owned(), "a".repeat(64)] {+ assert!(pool_item(&base, "workers", &name).is_err());+ assert!(claim_item(&base, "workers", &name).is_err());+ assert!(template_item(&base, "workers", &name).is_err());+ assert!(super::service_url(&base, "workers", &name, "/").is_err());+ }+ }+#[test]fn routes_preserve_base_path_prefix_without_double_slashes() {let base = Url::parse("https://gateway.example/cyclops/").unwrap();diff --git a/libs/fleet/sdk/tests/image_flow.rs b/libs/fleet/sdk/tests/image_flow.rsindex f921fcfeb7..20781b9044 100644--- a/libs/fleet/sdk/tests/image_flow.rs+++ b/libs/fleet/sdk/tests/image_flow.rs@@ -9,10 +9,10 @@ use support::ScriptedHttpClient;const BASE_URL: &str = "https://cyclops.example:8443/prefix";const TOKEN_URL: &str = "https://identity.example/oauth/token";const NAMESPACE: &str = "workers";-const IMAGE_NAME: &str = "image-demo";+const IMAGE_NAME: &str = "image-demo.v1";const IMAGE_COLLECTION: &str = "https://cyclops.example:8443/prefix/api/k8s/apis/images.cua.ai/v1alpha1/namespaces/workers/images";-const IMAGE_ITEM: &str = "https://cyclops.example:8443/prefix/api/k8s/apis/images.cua.ai/v1alpha1/namespaces/workers/images/image-demo";-const IMAGE_JSON: &[u8] = br#"{"apiVersion":"images.cua.ai/v1alpha1","kind":"Image","metadata":{"namespace":"workers","name":"image-demo"},"spec":{"recipe":"example"}}"#;+const IMAGE_ITEM: &str = "https://cyclops.example:8443/prefix/api/k8s/apis/images.cua.ai/v1alpha1/namespaces/workers/images/image-demo.v1";+const IMAGE_JSON: &[u8] = br#"{"apiVersion":"images.cua.ai/v1alpha1","kind":"Image","metadata":{"namespace":"workers","name":"image-demo.v1"},"spec":{"recipe":"example"}}"#;#[tokio::test]async fn image_crud_uses_generic_k8s_paths() {