openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-15 12:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check metadata even when the rollout blob is missing, and enforce ownership in that case

Browse Source
This commit is contained in:
Charles Cunningham
2026-01-25 11:48:38 -08:00
parent 99f190bf91
commit 23855a07f3
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codex-rs/Cargo.lock generated
View File

@@ -2451,7 +2451,7 @@ dependencies = [
name = "codex-utils-cargo-bin"
version = "0.0.0"
dependencies = [
"assert_cmd",
"path-absolutize",
"runfiles",
"thiserror 2.0.18",
]

51
codex-rs/core/src/session_share.rs
View File

@@ -120,12 +120,12 @@ pub async fn upload_rollout_with_owner(
let store = SessionObjectStore::new(base_url).await?;
let key = object_key(session_id);
let meta_key = meta_key(session_id);
let exists = store.object_exists(&key).await?;
let rollout_exists = store.object_exists(&key).await?;
let now = OffsetDateTime::now_utc().unix_timestamp();
let meta = fetch_meta(&store, &meta_key).await?;
if exists {
let meta = fetch_meta(&store, &meta_key).await?;
if let Some(meta) = meta {
match (rollout_exists, meta) {
(true, Some(meta)) => {
if meta.owner != owner {
return Err(anyhow::anyhow!(
"remote session already exists and belongs to another user"
@@ -141,7 +141,8 @@ pub async fn upload_rollout_with_owner(
updated_at: now,
};
upload_meta(&store, &meta_key, &updated).await?;
} else {
}
(true, None) => {
// Recover from a previous metadata upload failure by restoring metadata
// and overwriting the rollout blob.
let meta = SessionShareMeta {
@@ -155,17 +156,35 @@ pub async fn upload_rollout_with_owner(
.await
.with_context(|| format!("failed to upload rollout for id {session_id}"))?;
}
} else {
let meta = SessionShareMeta {
owner: owner.to_string(),
created_at: now,
updated_at: now,
};
upload_meta(&store, &meta_key, &meta).await?;
store
.put_object(&key, data, "application/x-ndjson")
.await
.with_context(|| format!("failed to upload rollout for id {session_id}"))?;
(false, Some(meta)) => {
if meta.owner != owner {
return Err(anyhow::anyhow!(
"remote session metadata already exists and belongs to another user"
));
}
store
.put_object(&key, data, "application/x-ndjson")
.await
.with_context(|| format!("failed to upload rollout for id {session_id}"))?;
let updated = SessionShareMeta {
owner: meta.owner,
created_at: meta.created_at,
updated_at: now,
};
upload_meta(&store, &meta_key, &updated).await?;
}
(false, None) => {
let meta = SessionShareMeta {
owner: owner.to_string(),
created_at: now,
updated_at: now,
};
upload_meta(&store, &meta_key, &meta).await?;
store
.put_object(&key, data, "application/x-ndjson")
.await
.with_context(|| format!("failed to upload rollout for id {session_id}"))?;
}
}
let object_url = store.object_url(&key)?;

2
codex-rs/utils/cargo-bin/Cargo.toml
View File

@@ -8,6 +8,6 @@ license.workspace = true
workspace = true
[dependencies]
assert_cmd = { workspace = true }
path-absolutize = { workspace = true }
runfiles = { workspace = true }
thiserror = { workspace = true }