From 513a6b15f99983c2054b95c6a17cebf672dbd360 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 24 Jan 2022 12:03:57 +0100 Subject: Handle OPTIONS on website endpoint --- src/api/s3_cors.rs | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'src/api/s3_cors.rs') diff --git a/src/api/s3_cors.rs b/src/api/s3_cors.rs index d23bf48d..cde66079 100644 --- a/src/api/s3_cors.rs +++ b/src/api/s3_cors.rs @@ -18,16 +18,7 @@ use garage_model::garage::Garage; use garage_table::*; use garage_util::data::*; -pub async fn handle_get_cors( - garage: Arc, - bucket_id: Uuid, -) -> Result, Error> { - let bucket = garage - .bucket_table - .get(&EmptyKey, &bucket_id) - .await? - .ok_or(Error::NoSuchBucket)?; - +pub async fn handle_get_cors(bucket: &Bucket) -> Result, Error> { let param = bucket .params() .ok_or_internal_error("Bucket should not be deleted at this point")?; @@ -109,16 +100,7 @@ pub async fn handle_put_cors( .body(Body::empty())?) } -pub async fn handle_options( - garage: Arc, - req: &Request, - bucket_id: Uuid, -) -> Result, Error> { - let bucket = garage - .bucket_table - .get(&EmptyKey, &bucket_id) - .await? - .ok_or(Error::NoSuchBucket)?; +pub async fn handle_options(req: &Request, bucket: &Bucket) -> Result, Error> { let origin = req .headers() .get("Origin") -- cgit v1.2.3