Skip to content

Commit dc58469

Browse files
committed
fix(supervisor)!: preserve startup policy ownership on refusal
Report typed denied Attach against its exact admitted generation and retain the gateway-created revision receipt separately from refetched policy. Closes #4739 BREAKING CHANGE: Complete raw configuration-report and UpdateConfig response literals need new boolean fields or generated defaults. Coordinate gateway writers and supervisors in the next minor release. Signed-off-by: Shiju <[email protected]>
1 parent 068509f commit dc58469

17 files changed

Lines changed: 384 additions & 55 deletions

File tree

‎crates/openshell-core/src/grpc_client.rs‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,8 +1287,8 @@ async fn sync_policy_with_client(
12871287
sandbox: &str,
12881288
policy: &ProtoSandboxPolicy,
12891289
workspace: &str,
1290-
) -> Result<()> {
1291-
client
1290+
) -> Result<crate::proto::UpdateConfigResponse> {
1291+
let response = client
12921292
.update_config(UpdateConfigRequest {
12931293
sandbox: sandbox.to_string(),
12941294
workspace_scope: Some(crate::proto::workspace_selector(workspace)),
@@ -1299,7 +1299,7 @@ async fn sync_policy_with_client(
12991299
.map_err(grpc_status_error)
13001300
.wrap_err("failed to sync policy to server")?;
13011301

1302-
Ok(())
1302+
Ok(response.into_inner())
13031303
}
13041304

13051305
/// Discover and sync policy using a single gRPC connection.
@@ -1344,7 +1344,17 @@ pub async fn sync_policy(
13441344
) -> Result<()> {
13451345
debug!(endpoint = %gateway.url(), sandbox = %sandbox, "Syncing enriched policy to gateway");
13461346
let mut client = connect(gateway).await?;
1347-
sync_policy_with_client(&mut client, sandbox, policy, workspace).await
1347+
sync_policy_with_client(&mut client, sandbox, policy, workspace)
1348+
.await
1349+
.map(|_| ())
1350+
}
1351+
1352+
/// The authoritative snapshot and the acknowledged revision this write created.
1353+
/// A deduplicated or unknown write outcome never establishes startup ownership.
1354+
#[derive(Debug)]
1355+
pub struct PolicySyncResult {
1356+
pub snapshot: SettingsPollResult,
1357+
pub created_policy_version: Option<u32>,
13481358
}
13491359

13501360
/// Sync an enriched policy and return the authoritative revision snapshot.
@@ -1358,11 +1368,19 @@ pub async fn sync_policy_and_fetch_snapshot(
13581368
sandbox: &str,
13591369
policy: &ProtoSandboxPolicy,
13601370
workspace: &str,
1361-
) -> Result<SettingsPollResult> {
1371+
) -> Result<PolicySyncResult> {
13621372
let status = ClientSpanStatus::current();
13631373
let mut client = connect(gateway).await?;
1364-
sync_policy_with_client(&mut client, sandbox, policy, workspace).await?;
1365-
status.finish(fetch_settings_snapshot_with_client(&mut client, sandbox, Some(workspace)).await)
1374+
let write = sync_policy_with_client(&mut client, sandbox, policy, workspace).await?;
1375+
let snapshot = status
1376+
.finish(fetch_settings_snapshot_with_client(&mut client, sandbox, Some(workspace)).await)?;
1377+
Ok(PolicySyncResult {
1378+
snapshot,
1379+
created_policy_version: write
1380+
.created_policy_revision
1381+
.then_some(write.version)
1382+
.filter(|version| *version > 0),
1383+
})
13661384
}
13671385

13681386
/// Report an exact runtime configuration generation. Pending registration uses

‎crates/openshell-sdk/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,11 @@ These helpers use the raw client's authentication slot. They do not perform OIDC
199199
- Async-only. Tonic is async-native; callers needing a blocking call can wrap
200200
with their own runtime.
201201
- The curated surface will grow as more RPCs graduate from `raw`.
202+
203+
## Next minor API migration
204+
205+
This API addition is for the next minor release and must not be backported into a 0.1.x patch train. Raw `ReportSandboxConfigurationRequest` adds `refused_before_start`, and `UpdateConfigResponse` adds `created_policy_revision`. Complete generated Rust literals must initialize those fields (normally `false`) or use `..Default::default()`. Complete raw TypeScript messages need the corresponding boolean defaults; generated message builders supply them.
206+
207+
Legacy wire payloads decode both flags as false. A false or unacknowledged creation receipt never proves startup ownership. Older protobuf writers are not qualified to preserve the new metadata, so upgrade gateway replicas and supervisors together before relying on this contract.
208+
209+
Breaking commit headers and migration notes declare the intended minor treatment. Current release tooling advances an already seeded prerelease series; maintainers must seed and qualify the next minor train before landing this change. No release version or `Release-As` override is embedded in the source.

‎crates/openshell-server/src/grpc/mutation_replay/ordinary.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,8 @@ mutation!(
940940
let _: Sandbox = live(store, &id).await?;
941941
}
942942
Ok(UpdateConfigResponse {
943+
// Legacy durable replay outcomes do not attest which write created a policy.
944+
created_policy_revision: false,
943945
version,
944946
policy_hash,
945947
settings_revision,

‎crates/openshell-server/src/grpc/policy.rs‎

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,6 +2670,7 @@ fn update_config_response(
26702670
settings_revision,
26712671
deleted,
26722672
annotations,
2673+
created_policy_revision: false,
26732674
})
26742675
}
26752676

@@ -4837,13 +4838,15 @@ async fn handle_update_config_inner(
48374838
spawn_pending_chunk_refresh(state, &workspace, &sandbox);
48384839
emit_full_policy_update_success(sandbox_caller, next_version);
48394840

4840-
Ok(update_config_response(
4841+
let mut response = update_config_response(
48414842
u32::try_from(next_version).unwrap_or(0),
48424843
hash,
48434844
0,
48444845
false,
48454846
response_annotations,
4846-
))
4847+
);
4848+
response.get_mut().created_policy_revision = true;
4849+
Ok(response)
48474850
}
48484851

48494852
// ---------------------------------------------------------------------------
@@ -10168,6 +10171,45 @@ mod tests {
1016810171
}
1016910172
}
1017010173

10174+
#[tokio::test]
10175+
async fn policy_write_receipt_distinguishes_created_and_deduplicated_revisions() {
10176+
let state = test_server_state().await;
10177+
let policy = mcp_policy_with_versions(&["2025-11-25"]);
10178+
state
10179+
.store
10180+
.put_message(&test_sandbox(
10181+
"write-receipt",
10182+
"write-receipt",
10183+
policy.clone(),
10184+
vec![],
10185+
))
10186+
.await
10187+
.unwrap();
10188+
let mut narrowed = policy.clone();
10189+
narrowed.network_policies.clear();
10190+
for (candidate, expected_version, created) in [
10191+
(policy.clone(), 1, true),
10192+
(policy, 1, false),
10193+
(narrowed.clone(), 2, true),
10194+
(narrowed, 2, false),
10195+
] {
10196+
let response = handle_update_config(
10197+
&state,
10198+
with_user(Request::new(UpdateConfigRequest {
10199+
sandbox: "write-receipt".into(),
10200+
workspace_scope: Some(openshell_core::proto::workspace_selector("default")),
10201+
policy: Some(candidate),
10202+
..Default::default()
10203+
})),
10204+
)
10205+
.await
10206+
.unwrap()
10207+
.into_inner();
10208+
assert_eq!(response.version, expected_version);
10209+
assert_eq!(response.created_policy_revision, created);
10210+
}
10211+
}
10212+
1017110213
#[tokio::test]
1017210214
async fn policy_record_identity_sandbox_deduplicates_defaulted_mcp_history() {
1017310215
let state = test_server_state().await;
@@ -10218,6 +10260,7 @@ mod tests {
1021810260
.into_inner();
1021910261

1022010262
assert_eq!(response.version, 1, "{case}");
10263+
assert!(!response.created_policy_revision, "{case}");
1022110264
assert_eq!(response.policy_hash, canonical_hash, "{case}");
1022210265
let revisions = state
1022310266
.store

‎crates/openshell-server/src/storage_proto.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ mod tests {
180180
// ReportSandboxConfigurationRequest field 4 adds a public-only refusal
181181
// flag. Older supervisors omit it; durable schemas remain unchanged.
182182
const PUBLIC_RPC_SCHEMA_SHA256: &str =
183-
"e11259fbb0044206b457f34e03efad720354c74cd2938e86aa6b26d100df7fc1";
183+
"ac6d00d4d70275ec3c43f61e72974e626a5b19f580e99197b6c26e137448f0a2";
184184
const DURABLE_SCHEMA_SHA256: &str =
185185
"cb15f8f79a855064a43fe8c6cd908bf07eca6604e2bf8ab7d2de0ef33e97da4e";
186186
const PUBLIC_DURABLE_OVERLAP_SHA256: &str =

‎crates/openshell-supervisor/src/backend_setup.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl SelectedBackend {
205205
)
206206
.await
207207
.map_err(|error| match error {
208-
BackendError::Denied(_) | BackendError::Attach(_) => {
208+
BackendError::Denied(_) => {
209209
miette::miette!(code = ATTACH_REFUSED, "{error}")
210210
}
211211
error => miette::miette!("{error}"),

‎crates/openshell-supervisor/src/backend_setup/tests.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ struct Observed {
117117
deny_confirmation: AtomicBool,
118118
require_networking: AtomicBool,
119119
active: AtomicBool,
120+
attach_error: Mutex<Option<BackendError>>,
120121
starts: AtomicUsize,
121122
releases: AtomicUsize,
122123
suspendable: AtomicBool,
@@ -302,6 +303,10 @@ impl PreparedBackend for TestLaunch {
302303
Ok(match request {
303304
Request::Attach { .. } => {
304305
observed.record("attach");
306+
let attach_error = observed.attach_error.lock().unwrap().take();
307+
if let Some(error) = attach_error {
308+
return Err(error);
309+
}
305310
if observed.active.swap(true, Ordering::SeqCst) {
306311
return Err(BackendError::Denied("already attached".into()));
307312
}
@@ -594,6 +599,29 @@ async fn attach_refusal_is_marked_as_a_refusal() {
594599
assert!(error.to_string().contains("already attached"));
595600
}
596601

602+
#[tokio::test]
603+
async fn attach_transport_failures_are_not_policy_refusals() {
604+
for failure in [
605+
BackendError::Attach("mediation transport failed".into()),
606+
BackendError::Unavailable("backend unavailable".into()),
607+
] {
608+
let setup = TestSetup::new();
609+
*setup.observed.attach_error.lock().unwrap() = Some(failure);
610+
let error = setup
611+
.select()
612+
.attach(setup.services(), policy(), agent())
613+
.await
614+
.err()
615+
.expect("backend transport failure must fail startup");
616+
assert_ne!(
617+
error.code().map(|code| code.to_string()).as_deref(),
618+
Some(ATTACH_REFUSED),
619+
"infrastructure failures must not be reported as policy denials"
620+
);
621+
assert_eq!(setup.observed.starts.load(Ordering::SeqCst), 0);
622+
}
623+
}
624+
597625
#[tokio::test]
598626
async fn restored_boundary_attaches_with_retained_processes_and_starts_agent() {
599627
let setup = TestSetup::new();

‎crates/openshell-supervisor/src/legacy_startup_regression_tests.rs‎

Lines changed: 69 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,18 @@ use std::sync::atomic::Ordering;
1515
use tonic::codegen::tokio_stream::{StreamExt as _, wrappers::TcpListenerStream};
1616
use tonic::codegen::{Body, BoxFuture, BoxStream, Bytes, Service, StdError, http};
1717

18+
#[derive(Clone)]
19+
struct PolicySyncCase {
20+
write: UpdateConfigResponse,
21+
snapshot: GetSandboxConfigResponse,
22+
}
23+
1824
#[derive(Clone, Default)]
1925
struct LegacyReadyProbe {
2026
ready_event: Arc<tokio::sync::Notify>,
2127
premature_ready: Arc<AtomicBool>,
2228
discovered: Arc<AtomicBool>,
29+
policy_sync: Arc<std::sync::Mutex<Option<PolicySyncCase>>>,
2330
}
2431

2532
#[derive(Clone)]
@@ -132,10 +139,15 @@ where
132139
.await
133140
}
134141
"/openshell.v1.OpenShell/GetSandboxConfig" => {
135-
let mut policy = openshell_policy::restrictive_default_policy();
136-
enrich_proto_baseline_paths(&mut policy);
137-
legacy_unary::<B, GetSandboxConfigRequest, _>(
138-
request,
142+
let scripted = probe
143+
.policy_sync
144+
.lock()
145+
.unwrap()
146+
.as_ref()
147+
.map(|case| case.snapshot.clone());
148+
let snapshot = scripted.unwrap_or_else(|| {
149+
let mut policy = openshell_policy::restrictive_default_policy();
150+
enrich_proto_baseline_paths(&mut policy);
139151
GetSandboxConfigResponse {
140152
policy: Some(policy),
141153
version: 1,
@@ -147,9 +159,9 @@ where
147159
policy_source: openshell_core::proto::PolicySource::Sandbox.into(),
148160
policy_validation_failure_mode: "fail_closed".into(),
149161
..Default::default()
150-
},
151-
)
152-
.await
162+
}
163+
});
164+
legacy_unary::<B, GetSandboxConfigRequest, _>(request, snapshot).await
153165
}
154166
"/openshell.v1.OpenShell/GetSandboxProviderEnvironment" => {
155167
legacy_unary::<B, GetSandboxProviderEnvironmentRequest, _>(
@@ -173,15 +185,15 @@ where
173185
.await
174186
}
175187
"/openshell.v1.OpenShell/UpdateConfig" => {
176-
legacy_unary::<B, UpdateConfigRequest, _>(
177-
request,
178-
UpdateConfigResponse {
188+
let response = probe.policy_sync.lock().unwrap().as_ref().map_or_else(
189+
|| UpdateConfigResponse {
179190
version: 1,
180191
policy_hash: "legacy-policy".into(),
181192
..Default::default()
182193
},
183-
)
184-
.await
194+
|case| case.write.clone(),
195+
);
196+
legacy_unary::<B, UpdateConfigRequest, _>(request, response).await
185197
}
186198
_ => http::Response::builder()
187199
.status(200)
@@ -336,3 +348,48 @@ async fn config_push_regression_legacy_gateway_never_observes_ready_before_workl
336348
.unwrap_err();
337349
assert!(error.to_string().contains("test boundary remains held"));
338350
}
351+
352+
#[tokio::test]
353+
async fn policy_sync_preserves_write_receipt_separately_from_refetched_policy() {
354+
for (created, snapshot_version) in [(true, 2), (true, 3), (false, 2)] {
355+
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
356+
let endpoint = format!("http://{}", listener.local_addr().unwrap());
357+
let probe = LegacyReadyProbe::default();
358+
*probe.policy_sync.lock().unwrap() = Some(PolicySyncCase {
359+
write: UpdateConfigResponse {
360+
version: 2,
361+
created_policy_revision: created,
362+
..Default::default()
363+
},
364+
snapshot: GetSandboxConfigResponse {
365+
version: snapshot_version,
366+
policy_source: openshell_core::proto::PolicySource::Sandbox.into(),
367+
policy_validation_failure_mode: "fail_closed".into(),
368+
workspace: "default".into(),
369+
..Default::default()
370+
},
371+
});
372+
let server = tokio::spawn(
373+
tonic::transport::Server::builder()
374+
.add_service(LegacyGateway { probe })
375+
.serve_with_incoming(TcpListenerStream::new(listener)),
376+
);
377+
let gateway = openshell_core::grpc_client::GatewayEndpoint::new(
378+
endpoint,
379+
openshell_core::grpc_client::GatewayCredentials::from_gateway_token("test-token")
380+
.unwrap(),
381+
);
382+
let synced = openshell_core::grpc_client::sync_policy_and_fetch_snapshot(
383+
&gateway,
384+
"sandbox",
385+
&openshell_policy::restrictive_default_policy(),
386+
"default",
387+
)
388+
.await
389+
.expect("sync the policy through the production RPC helper");
390+
assert_eq!(synced.snapshot.version, snapshot_version);
391+
assert_eq!(synced.created_policy_version, created.then_some(2));
392+
server.abort();
393+
let _ = server.await;
394+
}
395+
}

0 commit comments

Comments
 (0)