Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(cua-relay): Spaces API errors never repeat the request URL (it can carry an account id) (CUA-2339) (#5997)

cua-agents[bot]243fae03ec54
diff --git a/libs/cua-spacesd/crates/cua-relay/src/org_access.rs b/libs/cua-spacesd/crates/cua-relay/src/org_access.rs
index e8d6f88f36..25617d313d 100644
--- a/libs/cua-spacesd/crates/cua-relay/src/org_access.rs
+++ b/libs/cua-spacesd/crates/cua-relay/src/org_access.rs
@@ -385,7 +385,7 @@ impl OrgAccess {
])
.send()
.await
- .map_err(|e| format!("service token: {}", error_chain(&e)))?;
+ .map_err(|e| format!("service token: {}", error_chain(&e.without_url())))?;
if !reply.status().is_success() {
return Err(format!("service token: HTTP {}", reply.status()));
}
@@ -421,7 +421,7 @@ impl OrgAccess {
self.counters.api_calls.fetch_add(1, Ordering::Relaxed);
let r = req.send().await.map_err(|e| {
self.counters.api_errors.fetch_add(1, Ordering::Relaxed);
- format!("Spaces API: {}", error_chain(&e))
+ format!("Spaces API: {}", error_chain(&e.without_url()))
})?;
if r.status().is_server_error() || r.status() == reqwest::StatusCode::UNAUTHORIZED {
self.counters.api_errors.fetch_add(1, Ordering::Relaxed);
@@ -457,7 +457,7 @@ impl OrgAccess {
self.counters.api_calls.fetch_add(1, Ordering::Relaxed);
let r = req.send().await.map_err(|e| {
self.counters.api_errors.fetch_add(1, Ordering::Relaxed);
- format!("Spaces API: {e}")
+ format!("Spaces API: {}", e.without_url())
})?;
if !r.status().is_success() {
self.counters.api_errors.fetch_add(1, Ordering::Relaxed);
@@ -488,7 +488,7 @@ impl OrgAccess {
self.counters.api_calls.fetch_add(1, Ordering::Relaxed);
let r = req.send().await.map_err(|e| {
self.counters.api_errors.fetch_add(1, Ordering::Relaxed);
- format!("Spaces API: {e}")
+ format!("Spaces API: {}", e.without_url())
})?;
let status = r.status();
if status.is_server_error() || status == reqwest::StatusCode::UNAUTHORIZED {
@@ -498,7 +498,7 @@ impl OrgAccess {
let value = r
.json::<serde_json::Value>()
.await
- .map_err(|e| format!("Spaces API reply: {e}"))?;
+ .map_err(|e| format!("Spaces API reply: {}", e.without_url()))?;
Ok((status, value))
}
@@ -727,7 +727,7 @@ impl OrgAccess {
} else if r.status().is_success() {
r.json::<AccessAnswer>()
.await
- .map_err(|e| format!("Spaces API access answer: {e}"))?
+ .map_err(|e| format!("Spaces API access answer: {}", e.without_url()))?
} else {
// An unexpected 4xx is not an outage and not a yes: fail closed.
self.entries.lock().expect("org entries").remove(&key);
@@ -920,7 +920,7 @@ impl OrgAccess {
let v: serde_json::Value = r
.json()
.await
- .map_err(|e| format!("Spaces API machine list: {e}"))?;
+ .map_err(|e| format!("Spaces API machine list: {}", e.without_url()))?;
machine_ids(&v)
} else {
return Err(format!("Spaces API: HTTP {status}"));
diff --git a/libs/cua-spacesd/crates/cua-relay/src/plan_source.rs b/libs/cua-spacesd/crates/cua-relay/src/plan_source.rs
index 57d050029f..ad0f0c6fca 100644
--- a/libs/cua-spacesd/crates/cua-relay/src/plan_source.rs
+++ b/libs/cua-spacesd/crates/cua-relay/src/plan_source.rs
@@ -499,7 +499,7 @@ impl Inner {
let reply: EntitlementsReply = r
.json()
.await
- .map_err(|e| format!("{ANSWERED} answer: {e}"))?;
+ .map_err(|e| format!("{ANSWERED} answer: {}", e.without_url()))?;
Ok(assignment_from(&reply))
}
}
@@ -614,6 +614,21 @@ mod tests {
);
}
+ #[tokio::test]
+ async fn a_failed_lookup_never_names_the_account_in_its_error() {
+ // The entitlements URL carries the account id; a connection error
+ // must not repeat it (it ends up in a WARN log line).
+ let org = Arc::new(OrgAccess::new(crate::org_access::OrgAccessConfig {
+ api_url: Some("http://127.0.0.1:9".into()),
+ ..Default::default()
+ }));
+ let plans = EntitlementPlans::new(org, None);
+ let err = plans.inner.fetch("acct-5f0c-secret-sub").await.unwrap_err();
+ assert!(err.starts_with("Spaces API"), "{err}");
+ assert!(!err.contains("acct-5f0c-secret-sub"), "{err}");
+ assert!(!err.contains("/internal/v1/entitlements"), "{err}");
+ }
+
#[tokio::test]
async fn a_lookup_is_asked_again_after_a_transport_error() {
// A server that drops the first connection, then answers.