diff options
| author | Alex <alex@adnab.me> | 2024-01-16 11:33:27 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-01-16 11:33:27 +0000 |
| commit | 707d85f60293099e75e5aa821c0ee66796fdaa5b (patch) | |
| tree | 09f2dbdd30f8464c2d1f27532a690a46258aedb9 /src/api/s3 | |
| parent | d91a1de7315373271bce72088a4c73007f2154e8 (diff) | |
| parent | 4c5be79b8015510618ad1df7451c50e3f2659978 (diff) | |
| download | garage-707d85f60293099e75e5aa821c0ee66796fdaa5b.tar.gz garage-707d85f60293099e75e5aa821c0ee66796fdaa5b.zip | |
Merge pull request 'sync garage v0.9 with garage v0.8' (#657) from sync-08-09 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/657
Diffstat (limited to 'src/api/s3')
| -rw-r--r-- | src/api/s3/post_object.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs index 542b7a81..f9eccb7f 100644 --- a/src/api/s3/post_object.rs +++ b/src/api/s3/post_object.rs @@ -15,6 +15,7 @@ use serde::Deserialize; use garage_model::garage::Garage; +use crate::s3::cors::*; use crate::s3::error::*; use crate::s3::put::{get_headers, save_stream}; use crate::s3::xml as s3_xml; @@ -242,7 +243,7 @@ pub async fn handle_post_object( let etag = format!("\"{}\"", md5); - let resp = if let Some(mut target) = params + let mut resp = if let Some(mut target) = params .get("success_action_redirect") .and_then(|h| h.to_str().ok()) .and_then(|u| url::Url::parse(u).ok()) @@ -262,8 +263,7 @@ pub async fn handle_post_object( } else { let path = head .uri - .into_parts() - .path_and_query + .path_and_query() .map(|paq| paq.path().to_string()) .unwrap_or_else(|| "/".to_string()); let authority = head @@ -308,6 +308,13 @@ pub async fn handle_post_object( } }; + let matching_cors_rule = + find_matching_cors_rule(&bucket, &Request::from_parts(head, Body::empty()))?; + if let Some(rule) = matching_cors_rule { + add_cors_headers(&mut resp, rule) + .ok_or_internal_error("Invalid bucket CORS configuration")?; + } + Ok(resp) } |