mirror of
https://github.com/deuxfleurs-org/garage.git
synced 2026-08-13 15:46:53 +00:00
Implement CreateBucket
This commit is contained in:
@@ -433,13 +433,11 @@ impl<'a> BucketHelper<'a> {
|
||||
let mut bucket = self.get_internal_bucket(bucket_id).await?;
|
||||
let mut key = self.get_internal_key(key_id).await?;
|
||||
|
||||
let allow_any = perm.allow_read || perm.allow_write || perm.allow_owner;
|
||||
|
||||
if let Some(bstate) = bucket.state.as_option() {
|
||||
if let Some(kp) = bstate.authorized_keys.get(key_id) {
|
||||
perm.timestamp = increment_logical_clock_2(perm.timestamp, kp.timestamp);
|
||||
}
|
||||
} else if allow_any {
|
||||
} else if perm.is_any() {
|
||||
return Err(Error::BadRequest(
|
||||
"Trying to give permissions on a deleted bucket".into(),
|
||||
));
|
||||
@@ -449,7 +447,7 @@ impl<'a> BucketHelper<'a> {
|
||||
if let Some(bp) = kstate.authorized_buckets.get(&bucket_id) {
|
||||
perm.timestamp = increment_logical_clock_2(perm.timestamp, bp.timestamp);
|
||||
}
|
||||
} else if allow_any {
|
||||
} else if perm.is_any() {
|
||||
return Err(Error::BadRequest(
|
||||
"Trying to give permissions to a deleted key".into(),
|
||||
));
|
||||
|
||||
@@ -27,6 +27,17 @@ impl BucketKeyPerm {
|
||||
allow_write: false,
|
||||
allow_owner: false,
|
||||
};
|
||||
|
||||
pub const ALL_PERMISSIONS: Self = Self {
|
||||
timestamp: 0,
|
||||
allow_read: true,
|
||||
allow_write: true,
|
||||
allow_owner: true,
|
||||
};
|
||||
|
||||
pub fn is_any(&self) -> bool {
|
||||
self.allow_read || self.allow_write || self.allow_owner
|
||||
}
|
||||
}
|
||||
|
||||
impl Crdt for BucketKeyPerm {
|
||||
|
||||
Reference in New Issue
Block a user