Skip to content

fix(store): enforce conditions at delete and multipart commit #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tobi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(store): enforce conditions at delete and multipart commit #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions crates/walgit-store/src/gcs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,12 +603,15 @@ impl GcsStore {
}

async fn put_inner(&self, key: &str, body: PutBody, opts: PutOptions) -> Result<ObjectMeta> {
if let PutMode::Update(version) = &opts.mode {
update_generation(version)?;
}
let result = match body {
PutBody::Bytes(b) => {
let (client, _permit) = self.data_client(key, false).await;
let mut builder =
client.write_object(self.bucket_resource.clone(), key.to_owned(), b);
builder = apply_put_opts(builder, &opts);
builder = apply_put_opts(builder, &opts)?;
Box::pin(builder.send_unbuffered()).await
}
PutBody::File(path) => {
Expand All @@ -623,7 +626,7 @@ impl GcsStore {
key.to_owned(),
Bytes::from(bytes),
);
builder = apply_put_opts(builder, &opts);
builder = apply_put_opts(builder, &opts)?;
Box::pin(builder.send_unbuffered()).await
} else {
let stream = crate::util::file_stream(path, None, FILE_CHUNK_SIZE);
Expand All @@ -633,7 +636,7 @@ impl GcsStore {
let (client, _permit) = self.data_client(key, false).await;
let mut builder =
client.write_object(self.bucket_resource.clone(), key.to_owned(), source);
builder = apply_put_opts(builder, &opts);
builder = apply_put_opts(builder, &opts)?;
Box::pin(builder.send_buffered()).await
}
}
Expand All @@ -644,7 +647,7 @@ impl GcsStore {
let (client, _permit) = self.data_client(key, false).await;
let mut builder =
client.write_object(self.bucket_resource.clone(), key.to_owned(), bytes);
builder = apply_put_opts(builder, &opts);
builder = apply_put_opts(builder, &opts)?;
Box::pin(builder.send_unbuffered()).await
}
PutBody::Stream { stream, .. } => {
Expand All @@ -654,7 +657,7 @@ impl GcsStore {
let (client, _permit) = self.data_client(key, false).await;
let mut builder =
client.write_object(self.bucket_resource.clone(), key.to_owned(), source);
builder = apply_put_opts(builder, &opts);
builder = apply_put_opts(builder, &opts)?;
Box::pin(builder.send_buffered()).await
}
};
Expand Down Expand Up @@ -1115,12 +1118,19 @@ impl StreamingSource for StoreStreamSource {
}
}

/// A conditional update must name an existing generation. Zero means create in
/// GCS, so accepting it here would silently change the operation's contract.
fn update_generation(version: &Version) -> Result<i64> {
parse_generation(version).filter(|g| *g > 0).ok_or_else(|| {
StoreError::InvalidArgument("GCS update requires a positive generation token".into())
})
}

/// Apply put-mode preconditions and metadata to a `WriteObject` builder.
/// Builder methods consume `self` and return `Self`, so we chain them.
fn apply_put_opts<T, S>(
mut builder: google_cloud_storage::builder::storage::WriteObject<T, S>,
opts: &PutOptions,
) -> google_cloud_storage::builder::storage::WriteObject<T, S>
) -> Result<google_cloud_storage::builder::storage::WriteObject<T, S>>
where
S: google_cloud_storage::stub::Storage + 'static,
{
Expand All @@ -1130,9 +1140,7 @@ where
builder = builder.set_if_generation_match(0_i64);
}
PutMode::Update(v) => {
if let Some(generation) = parse_generation(v) {
builder = builder.set_if_generation_match(generation);
}
builder = builder.set_if_generation_match(update_generation(v)?);
}
}

Expand All @@ -1144,7 +1152,7 @@ where
builder = builder.set_cache_control(IMMUTABLE_CACHE_CONTROL);
}

builder
Ok(builder)
}

// ---- error mapping ----
Expand Down Expand Up @@ -1246,6 +1254,17 @@ mod tests {
assert_eq!(parse_generation(&v), None);
}

#[test]
fn update_conditions_cannot_turn_into_create_or_overwrite() {
for token in ["", "invalid", "0", "-1", "9223372036854775808"] {
assert!(matches!(
update_generation(&Version::new(token)),
Err(StoreError::InvalidArgument(_))
));
}
assert_eq!(update_generation(&Version::new("42")).unwrap(), 42);
}

#[test]
fn range_to_read_range_basic() {
let _r = range_to_read_range(&(10..30)); // [10, 30) → offset=10, limit=20
Expand Down
Loading
Loading