aboutsummaryrefslogtreecommitdiff
path: root/src/garage
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-12-12 17:00:31 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-12-12 17:00:31 +0100
commite1ce2b228aaacd5984bf4e1b73a0a6c1276f78e5 (patch)
treed5a5b5038df8b3c0554b967e5d54f8d7f7659ea8 /src/garage
parent1119d466e762b6fe11eb939811c4f24b27a0404f (diff)
downloadgarage-e1ce2b228aaacd5984bf4e1b73a0a6c1276f78e5.tar.gz
garage-e1ce2b228aaacd5984bf4e1b73a0a6c1276f78e5.zip
WIP table migration
Diffstat (limited to 'src/garage')
-rw-r--r--src/garage/admin_rpc.rs33
-rw-r--r--src/garage/main.rs8
2 files changed, 36 insertions, 5 deletions
diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs
index 65bd24c0..f9d398c2 100644
--- a/src/garage/admin_rpc.rs
+++ b/src/garage/admin_rpc.rs
@@ -156,7 +156,36 @@ impl AdminRpcHandler {
)))
}
BucketOperation::Website(query) => {
- Ok(AdminRPC::Ok(format!("test")))
+ let bucket = self.get_existing_bucket(&query.bucket).await?;
+ if query.allow && query.deny {
+ return Err(Error::Message(format!("Website can not be both allowed and denied on a bucket")));
+ }
+
+ if query.allow || query.deny {
+ let exposed = query.allow;
+ if let BucketState::Present(ak) = bucket.state.get_mut() {
+ let old_ak = ak.take_and_clear();
+ ak.merge(&old_ak.update_mutator(
+ key_id.to_string(),
+ PermissionSet {
+ allow_read,
+ allow_write,
+ },
+ ));
+ } else {
+ return Err(Error::Message(format!(
+ "Bucket is deleted in update_bucket_key"
+ )));
+ }
+ }
+
+ let msg = if bucket.exposed {
+ "Bucket is exposed as a website."
+ } else {
+ "Bucket is not exposed."
+ };
+
+ Ok(AdminRPC::Ok(msg))
}
}
}
@@ -240,6 +269,7 @@ impl AdminRpcHandler {
.unwrap_or(Err(Error::BadRPC(format!("Key {} does not exist", id))))
}
+ /// Update **bucket table** to inform of the new linked key
async fn update_bucket_key(
&self,
mut bucket: Bucket,
@@ -265,6 +295,7 @@ impl AdminRpcHandler {
Ok(())
}
+ /// Update **key table** to inform of the new linked bucket
async fn update_key_bucket(
&self,
mut key: Key,
diff --git a/src/garage/main.rs b/src/garage/main.rs
index 7996d1f9..d97ca3b8 100644
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -150,12 +150,12 @@ pub enum BucketOperation {
#[derive(Serialize, Deserialize, StructOpt, Debug)]
pub struct WebsiteOpt {
/// Create
- #[structopt(long = "create")]
- pub create: bool,
+ #[structopt(long = "allow")]
+ pub allow: bool,
/// Delete
- #[structopt(long = "delete")]
- pub delete: bool,
+ #[structopt(long = "deny")]
+ pub deny: bool,
}
#[derive(Serialize, Deserialize, StructOpt, Debug)]