gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-31 01:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix get s3 body bytes use store_all_unlimited

Browse Source
This commit is contained in:
weisd
2025-01-15 21:45:23 +08:00
parent c62ceef1d3
commit 821ff036be
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/admin/handlers/group.rs
+7 -2
View File
@@ -33,8 +33,13 @@ impl Operation for UpdateGroupMembers {
async fn call(&self, req: S3Request<Body>, _params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> { async fn call(&self, req: S3Request<Body>, _params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
warn!("handle UpdateGroupMembers"); warn!("handle UpdateGroupMembers");
let Some(body) = req.input.bytes() else { let mut input = req.input;
return Err(s3_error!(InvalidRequest, "get body failed")); let body = match input.store_all_unlimited().await {
Ok(b) => b,
Err(e) => {
warn!("get body failed, e: {:?}", e);
return Err(s3_error!(InvalidRequest, "get body failed"));
}
}; };
let args: GroupAddRemove = serde_json::from_slice(&body) let args: GroupAddRemove = serde_json::from_slice(&body)
rustfs/src/admin/handlers/service_account.rs
+7 -2
View File
@@ -32,8 +32,13 @@ impl Operation for AddServiceAccount {
}; };
let _is_owner = true; // 先按true处理，后期根据请求决定。 let _is_owner = true; // 先按true处理，后期根据请求决定。
let Some(body) = req.input.bytes() else { let mut input = req.input;
return Err(s3_error!(InvalidRequest, "get body failed")); let body = match input.store_all_unlimited().await {
Ok(b) => b,
Err(e) => {
warn!("get body failed, e: {:?}", e);
return Err(s3_error!(InvalidRequest, "get body failed"));
}
}; };
let mut create_req: AddServiceAccountReq = let mut create_req: AddServiceAccountReq =
rustfs/src/admin/handlers/user.rs
-4
View File
@@ -53,10 +53,6 @@ impl Operation for AddUser {
} }
}; };
// let Some(body) = req.input.bytes() else {
// return Err(s3_error!(InvalidRequest, "get body failed"));
// };
// let body_bytes = decrypt_data(input_cred.secret_key.expose().as_bytes(), &body) // let body_bytes = decrypt_data(input_cred.secret_key.expose().as_bytes(), &body)
// .map_err(|e| S3Error::with_message(S3ErrorCode::InvalidArgument, format!("decrypt_data err {}", e)))?; // .map_err(|e| S3Error::with_message(S3ErrorCode::InvalidArgument, format!("decrypt_data err {}", e)))?;