Scope enrollment membership migration and use pull-only deployed gateway
This commit is contained in:
@@ -128,7 +128,10 @@ pub fn store() -> Result<UpdateArtifacts, Error> {
|
||||
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 => path.parent().ok_or_else(|| fail("AGENT_UPDATE_NOT_CONFIGURED"))?.join("agent-update-artifacts"),
|
||||
None => path
|
||||
.parent()
|
||||
.ok_or_else(|| fail("AGENT_UPDATE_NOT_CONFIGURED"))?
|
||||
.join("agent-update-artifacts"),
|
||||
},
|
||||
metadata.uid(),
|
||||
)?)
|
||||
@@ -168,7 +171,9 @@ pub fn verify_envelope(
|
||||
binding: Option<&rmm_domain::agent_update::UpdaterBinding>,
|
||||
) -> Result<ReleaseManifest, Error> {
|
||||
let platform = envelope.decode().map_err(|_| invalid())?.manifest.platform;
|
||||
if platform == Platform::WindowsGnuX64 && std::env::var("RMM_PROFILE").as_deref() != Ok("development") {
|
||||
if platform == Platform::WindowsGnuX64
|
||||
&& std::env::var("RMM_PROFILE").as_deref() != Ok("development")
|
||||
{
|
||||
return Err(fail("AGENT_UPDATE_DEVELOPMENT_CHANNEL_REQUIRED"));
|
||||
}
|
||||
let raw = keyring_bytes(platform)?;
|
||||
@@ -255,7 +260,10 @@ fn verify_envelope_with_keyring(
|
||||
}
|
||||
pub fn routes(router: Router<crate::State>) -> Router<crate::State> {
|
||||
router
|
||||
.route("/api/v1/tenants/{tenant}/enrollment-tokens", post(bootstrap::issue))
|
||||
.route(
|
||||
"/api/v1/tenants/{tenant}/enrollment-tokens",
|
||||
post(bootstrap::issue),
|
||||
)
|
||||
.route(
|
||||
"/api/v1/tenants/{tenant}/agent-releases",
|
||||
get(list).post(import),
|
||||
@@ -267,13 +275,36 @@ pub fn routes(router: Router<crate::State>) -> Router<crate::State> {
|
||||
}
|
||||
pub fn gateway_routes(router: Router<crate::State>) -> Router<crate::State> {
|
||||
router
|
||||
.route("/install/linux.sh", get(|| async { ([("content-type", "text/x-shellscript")], concat!(include_str!("bootstrap/install.sh"),include_str!("bootstrap/lifecycle.py"),"
|
||||
.route(
|
||||
"/install/linux.sh",
|
||||
get(|| async {
|
||||
(
|
||||
[("content-type", "text/x-shellscript")],
|
||||
concat!(
|
||||
include_str!("bootstrap/install.sh"),
|
||||
include_str!("bootstrap/lifecycle.py"),
|
||||
"
|
||||
RMM_BOOTSTRAP_PYTHON
|
||||
/usr/bin/python3 -I \"$file\" install \"$@\"
|
||||
")) }))
|
||||
.route("/install/windows.ps1", get(|| async { ([("content-type", "text/plain; charset=utf-8")], include_str!("bootstrap/install.ps1")) }))
|
||||
"
|
||||
),
|
||||
)
|
||||
}),
|
||||
)
|
||||
.route(
|
||||
"/install/windows.ps1",
|
||||
get(|| async {
|
||||
(
|
||||
[("content-type", "text/plain; charset=utf-8")],
|
||||
include_str!("bootstrap/install.ps1"),
|
||||
)
|
||||
}),
|
||||
)
|
||||
.route("/agent/v1/bootstrap/current", get(bootstrap::current))
|
||||
.route("/agent/v1/bootstrap/releases/{release}/artifacts/{artifact}", get(bootstrap::artifact))
|
||||
.route(
|
||||
"/agent/v1/bootstrap/releases/{release}/artifacts/{artifact}",
|
||||
get(bootstrap::artifact),
|
||||
)
|
||||
.route("/agent/v1/bootstrap/updater", get(bootstrap::updater))
|
||||
.route("/agent/v1/releases/current", get(current))
|
||||
.route("/agent/v1/releases/installed", get(installed))
|
||||
@@ -456,7 +487,7 @@ pub async fn import(
|
||||
return Err(fail("AGENT_UPDATE_RELEASE_CONFLICT"));
|
||||
}
|
||||
} else {
|
||||
sqlx::query("INSERT INTO audit_events VALUES($1,$2,$3,'agent_update_release_imported',$4,now())").bind(t).bind(Uuid::new_v4()).bind(p.name)
|
||||
sqlx::query("INSERT INTO audit_events VALUES($1,$2,$3,'agent_update_release_imported',$4,now())").bind(t).bind(Uuid::new_v4()).bind(p.name)
|
||||
.bind(json!({"release_id":m.release_id,"manifest_sha256":manifest_sha,"testsimulation":p.testsimulation})).execute(&mut *tx).await?;
|
||||
}
|
||||
tx.commit().await?;
|
||||
@@ -537,15 +568,23 @@ async fn device(
|
||||
.await
|
||||
.map_err(|status| Error(status, "UNAUTHENTICATED"))
|
||||
}
|
||||
async fn installed(State(s): State<crate::State>, Extension(peer): Extension<crate::Peer>, headers: HeaderMap) -> Result<Response, Error> {
|
||||
async fn installed(
|
||||
State(s): State<crate::State>,
|
||||
Extension(peer): Extension<crate::Peer>,
|
||||
headers: HeaderMap,
|
||||
) -> Result<Response, Error> {
|
||||
let (tenant, agent) = device(&s, peer, &headers).await?;
|
||||
let mut tx = rmm_persistence::tenant_tx(&s.pool, tenant).await?;
|
||||
let row = sqlx::query("SELECT reported_agent_version,connection_generation,last_contact_at FROM agent_installations WHERE agent_id=$1 AND revoked_at IS NULL").bind(agent).fetch_one(&mut *tx).await?;
|
||||
tx.commit().await?;
|
||||
Ok(([("cache-control","private, no-store")], Json(json!({"agent_id":agent,
|
||||
Ok((
|
||||
[("cache-control", "private, no-store")],
|
||||
Json(json!({"agent_id":agent,
|
||||
"agent_version":row.get::<Option<String>,_>("reported_agent_version"),
|
||||
"connection_generation":row.get::<i64,_>("connection_generation"),
|
||||
"last_contact_at":row.get::<Option<chrono::DateTime<chrono::Utc>>,_>("last_contact_at")}))).into_response())
|
||||
"last_contact_at":row.get::<Option<chrono::DateTime<chrono::Utc>>,_>("last_contact_at")})),
|
||||
)
|
||||
.into_response())
|
||||
}
|
||||
|
||||
async fn check_device_platform(
|
||||
@@ -562,7 +601,9 @@ async fn check_device_platform(
|
||||
let caps: Vec<String> = serde_json::from_value(caps)?;
|
||||
let expected = match platform {
|
||||
Platform::LinuxX64 => "linux.base/1",
|
||||
Platform::WindowsX64 if caps.iter().any(|c| c == "agent.release.windows.gnu/1") => return Err(missing()),
|
||||
Platform::WindowsX64 if caps.iter().any(|c| c == "agent.release.windows.gnu/1") => {
|
||||
return Err(missing());
|
||||
}
|
||||
Platform::WindowsX64 => "windows.base/1",
|
||||
Platform::WindowsGnuX64 => "agent.release.windows.gnu/1",
|
||||
};
|
||||
@@ -585,8 +626,11 @@ async fn release_artifact(
|
||||
let mut tx = rmm_persistence::tenant_tx(&s.pool, tenant).await?;
|
||||
let (_, manifest) = checked_release(&mut tx, release).await?;
|
||||
check_device_platform(&mut tx, agent, manifest.platform).await?;
|
||||
let descriptor = manifest.artifacts.into_iter()
|
||||
.find(|entry| entry.artifact_id == artifact).ok_or_else(missing)?;
|
||||
let descriptor = manifest
|
||||
.artifacts
|
||||
.into_iter()
|
||||
.find(|entry| entry.artifact_id == artifact)
|
||||
.ok_or_else(missing)?;
|
||||
tx.commit().await?;
|
||||
verified_binary(tenant, descriptor.sha256, descriptor.bytes).await
|
||||
}
|
||||
@@ -608,12 +652,27 @@ async fn verified_binary(tenant: Uuid, sha256: String, size: u64) -> Result<Resp
|
||||
});
|
||||
let mut response = Response::new(Body::from_stream(stream));
|
||||
let headers = response.headers_mut();
|
||||
headers.insert("content-type", HeaderValue::from_static("application/octet-stream"));
|
||||
headers.insert(
|
||||
"content-type",
|
||||
HeaderValue::from_static("application/octet-stream"),
|
||||
);
|
||||
headers.insert("content-length", HeaderValue::from(size));
|
||||
headers.insert("content-disposition", HeaderValue::from_static("attachment"));
|
||||
headers.insert("x-content-type-options", HeaderValue::from_static("nosniff"));
|
||||
headers.insert("cache-control", HeaderValue::from_static("private, no-store"));
|
||||
headers.insert("x-artifact-sha256", HeaderValue::from_str(&sha256).map_err(|_| invalid())?);
|
||||
headers.insert(
|
||||
"content-disposition",
|
||||
HeaderValue::from_static("attachment"),
|
||||
);
|
||||
headers.insert(
|
||||
"x-content-type-options",
|
||||
HeaderValue::from_static("nosniff"),
|
||||
);
|
||||
headers.insert(
|
||||
"cache-control",
|
||||
HeaderValue::from_static("private, no-store"),
|
||||
);
|
||||
headers.insert(
|
||||
"x-artifact-sha256",
|
||||
HeaderValue::from_str(&sha256).map_err(|_| invalid())?,
|
||||
);
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
@@ -629,7 +688,12 @@ async fn current(
|
||||
let ids:Vec<Uuid>=sqlx::query_scalar("SELECT release_id FROM agent_update_releases WHERE platform=$1 ORDER BY release_sequence DESC LIMIT 1").bind(platform_name(q.platform)).fetch_all(&mut *tx).await?;
|
||||
let release = if let Some(id) = ids.first() {
|
||||
let (envelope, manifest) = checked_release(&mut tx, *id).await?;
|
||||
resolve_artifacts(&mut tx, tenant, &manifest.artifacts).await?;
|
||||
// Polling is frequent. The catalog binds immutable descriptors by FK.
|
||||
// Publication and actual downloads verify the full stream.
|
||||
let objects = store()?;
|
||||
for item in &manifest.artifacts {
|
||||
objects.available(tenant, &item.sha256, item.bytes)?;
|
||||
}
|
||||
Some(json!({"release_envelope":envelope,"manifest":manifest}))
|
||||
} else {
|
||||
None
|
||||
|
||||
Reference in New Issue
Block a user