From 9c7ccbb59b8c13f29249c20da203c123a9a0e792 Mon Sep 17 00:00:00 2001 From: Kevin Janssen Date: Wed, 18 Nov 2026 11:08:53 +0100 Subject: [PATCH] Enable explicitly configured private artifact storage for authenticated production releases --- crates/server/src/agent_updates.rs | 4 +++- crates/server/src/update_artifact_store.rs | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crates/server/src/agent_updates.rs b/crates/server/src/agent_updates.rs index 61a090d..73520c1 100644 --- a/crates/server/src/agent_updates.rs +++ b/crates/server/src/agent_updates.rs @@ -123,11 +123,13 @@ pub fn store() -> Result { if !metadata.is_file() || metadata.permissions().mode() & 0o077 != 0 { return Err(fail("AGENT_UPDATE_NOT_CONFIGURED")); } + let profile = std::env::var("RMM_PROFILE").unwrap_or_default(); Ok(UpdateArtifacts::new( - &std::env::var("RMM_PROFILE").unwrap_or_default(), + &profile, match std::env::var_os("RMM_AGENT_UPDATE_ARTIFACT_DIR") { Some(value) if FsPath::new(&value).is_absolute() => value.into(), Some(_) => return Err(fail("AGENT_UPDATE_NOT_CONFIGURED")), + None if profile != "development" => return Err(fail("AGENT_UPDATE_NOT_CONFIGURED")), None => path .parent() .ok_or_else(|| fail("AGENT_UPDATE_NOT_CONFIGURED"))? diff --git a/crates/server/src/update_artifact_store.rs b/crates/server/src/update_artifact_store.rs index d3b174e..fd438a9 100644 --- a/crates/server/src/update_artifact_store.rs +++ b/crates/server/src/update_artifact_store.rs @@ -51,8 +51,8 @@ fn regular(file: &File, owner: u32, expected_size: u64) -> Result impl UpdateArtifacts { pub fn new(profile: &str, root: PathBuf, owner: u32) -> Result { ensure!( - profile == "development", - "update object adapter is development-only" + matches!(profile, "development" | "production") && root.is_absolute(), + "release store requires a configured profile and absolute path" ); Self::private_directory(root, owner) } @@ -246,7 +246,9 @@ mod tests { fs::set_permissions(&root, fs::Permissions::from_mode(0o700)).unwrap(); let owner = fs::metadata(&root).unwrap().uid(); let store = UpdateArtifacts::new("development", root.clone(), owner).unwrap(); - assert!(UpdateArtifacts::new("production", root.clone(), owner).is_err()); + assert!(UpdateArtifacts::new("production", root.clone(), owner).is_ok()); + assert!(UpdateArtifacts::new("unknown", root.clone(), owner).is_err()); + assert!(UpdateArtifacts::new("production", PathBuf::from("relative"), owner).is_err()); let tenant = Uuid::new_v4(); let bytes = vec![37_u8; 300_007]; let hash = rmm_domain::jobs::hash(&bytes);