starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-10-26 08:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add _default_ syntax to solve URI normalization issues with signing

Browse Source
This commit is contained in:
Diego Imbert
2025-08-21 13:39:13 +02:00
parent 6c71c11b76
commit 26665cac3e
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-api/src/s3_proxy.rs
+20 -8
View File
@@ -46,12 +46,15 @@ async fn get_object(
Extension(auth_cache): Extension<Arc<AuthCache>>,
req: Request<Body>,
) -> Result<Response> {
let uri = format!("/api/w/{}/s3_proxy{}", w_id, req.uri().to_string());
let uri = format!("/api/w/{w_id}/s3_proxy/{storage_str}/{object_key}");
let token = get_token(req.headers(), req.method().as_str(), &uri).await?;
let Some(authed) = auth_cache.get_authed(Some(w_id.clone()), &token).await else {
return Err(Error::NotAuthorized("Invalid token".to_string()));
};
let storage = Some(storage_str.clone()).filter(|s| !s.is_empty());
let storage = match storage_str.as_str() {
"_default_" => None,
_ => Some(storage_str.clone()),
};
let (_, s3_resource) =
get_workspace_s3_resource(&authed, &db, Some(user_db), &token, &w_id, storage).await?;
@@ -75,12 +78,15 @@ async fn put_object(
Extension(auth_cache): Extension<Arc<AuthCache>>,
req: Request<Body>,
) -> Result<Response> {
let uri = format!("/api/w/{}/s3_proxy{}", w_id, req.uri().to_string());
let uri = format!("/api/w/{w_id}/s3_proxy/{storage_str}/{object_key}");
let token = get_token(req.headers(), req.method().as_str(), &uri).await?;
let Some(authed) = auth_cache.get_authed(Some(w_id.clone()), &token).await else {
return Err(Error::NotAuthorized("Invalid token".to_string()));
};
let storage = Some(storage_str.clone()).filter(|s| !s.is_empty());
let storage = match storage_str.as_str() {
"_default_" => None,
_ => Some(storage_str.clone()),
};
let (_, s3_resource) =
get_workspace_s3_resource(&authed, &db, Some(user_db), &token, &w_id, storage).await?;
@@ -125,12 +131,15 @@ async fn post_object(
Extension(auth_cache): Extension<Arc<AuthCache>>,
req: Request<Body>,
) -> Result<Response> {
let uri = format!("/api/w/{}/s3_proxy{}", w_id, req.uri().to_string());
let uri = format!("/api/w/{w_id}/s3_proxy/{storage_str}/{object_key}");
let token = get_token(req.headers(), req.method().as_str(), &uri).await?;
let Some(authed) = auth_cache.get_authed(Some(w_id.clone()), &token).await else {
return Err(Error::NotAuthorized("Invalid token".to_string()));
};
let storage = Some(storage_str.clone()).filter(|s| !s.is_empty());
let storage = match storage_str.as_str() {
"_default_" => None,
_ => Some(storage_str.clone()),
};
let (_, s3_resource) =
get_workspace_s3_resource(&authed, &db, Some(user_db), &token, &w_id, storage).await?;
@@ -158,12 +167,15 @@ async fn delete_object(
Extension(auth_cache): Extension<Arc<AuthCache>>,
req: Request<Body>,
) -> Result<()> {
let uri = format!("/api/w/{}/s3_proxy{}", w_id, req.uri().to_string());
let uri = format!("/api/w/{w_id}/s3_proxy/{storage_str}/{object_key}");
let token = get_token(req.headers(), req.method().as_str(), &uri).await?;
let Some(authed) = auth_cache.get_authed(Some(w_id.clone()), &token).await else {
return Err(Error::NotAuthorized("Invalid token".to_string()));
};
let storage = Some(storage_str.clone()).filter(|s| !s.is_empty());
let storage = match storage_str.as_str() {
"_default_" => None,
_ => Some(storage_str.clone()),
};
delete_s3_file_internal(
&authed,