diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-03-01 11:15:16 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-03-01 11:15:16 +0100 |
| commit | 8a5bbc3b0b1c6ab252d0c98950456a9d4cc2e9fe (patch) | |
| tree | fc58f965981debc989108c39379dfca3c4da5e93 /src/web | |
| parent | 97f245f218836c699088ab51d810f33ae947c903 (diff) | |
| download | garage-8a5bbc3b0b1c6ab252d0c98950456a9d4cc2e9fe.tar.gz garage-8a5bbc3b0b1c6ab252d0c98950456a9d4cc2e9fe.zip | |
More permissive OPTIONS on S3 APIv0.6.1better-cors
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/web_server.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/web/web_server.rs b/src/web/web_server.rs index 15935cba..80d2feb9 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -13,7 +13,7 @@ use crate::error::*; use garage_api::error::{Error as ApiError, OkOrBadRequest, OkOrInternalError}; use garage_api::helpers::{authority_to_host, host_to_bucket}; -use garage_api::s3_cors::{add_cors_headers, find_matching_cors_rule, handle_options}; +use garage_api::s3_cors::{add_cors_headers, find_matching_cors_rule, handle_options_for_bucket}; use garage_api::s3_get::{handle_get, handle_head}; use garage_model::garage::Garage; @@ -133,7 +133,7 @@ async fn serve_file(garage: Arc<Garage>, req: &Request<Body>) -> Result<Response ); let ret_doc = match *req.method() { - Method::OPTIONS => handle_options(garage.clone(), req, Some(bucket_name.to_string())).await, + Method::OPTIONS => handle_options_for_bucket(req, &bucket), Method::HEAD => handle_head(garage.clone(), req, bucket_id, &key, None).await, Method::GET => handle_get(garage.clone(), req, bucket_id, &key, None).await, _ => Err(ApiError::BadRequest("HTTP method not supported".into())), |