diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-26 16:46:40 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-26 16:46:40 +0100 |
| commit | 590a0a84505c0bee8ddd8fcd8de6f340319da097 (patch) | |
| tree | 14009c0feea6c27cdf36fe85a21dc22753da8653 /src/api/s3/list.rs | |
| parent | dac254a6e7413498df0e3b626769c2d2be3a4cfb (diff) | |
| parent | 611792ddcf86f0a728e22abaa6e172d3679d5ca6 (diff) | |
| download | garage-590a0a84505c0bee8ddd8fcd8de6f340319da097.tar.gz garage-590a0a84505c0bee8ddd8fcd8de6f340319da097.zip | |
Merge branch 'main' into k2v-watch-range-2
Diffstat (limited to 'src/api/s3/list.rs')
| -rw-r--r-- | src/api/s3/list.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/api/s3/list.rs b/src/api/s3/list.rs index e5f486c8..5cb0d65a 100644 --- a/src/api/s3/list.rs +++ b/src/api/s3/list.rs @@ -3,6 +3,7 @@ use std::collections::{BTreeMap, BTreeSet}; use std::iter::{Iterator, Peekable}; use std::sync::Arc; +use base64::prelude::*; use hyper::{Body, Response}; use garage_util::data::*; @@ -129,11 +130,11 @@ pub async fn handle_list( next_continuation_token: match (query.is_v2, &pagination) { (true, Some(RangeBegin::AfterKey { key })) => Some(s3_xml::Value(format!( "]{}", - base64::encode(key.as_bytes()) + BASE64_STANDARD.encode(key.as_bytes()) ))), (true, Some(RangeBegin::IncludingKey { key, .. })) => Some(s3_xml::Value(format!( "[{}", - base64::encode(key.as_bytes()) + BASE64_STANDARD.encode(key.as_bytes()) ))), _ => None, }, @@ -583,14 +584,16 @@ impl ListObjectsQuery { (Some(token), _) => match &token[..1] { "[" => Ok(RangeBegin::IncludingKey { key: String::from_utf8( - base64::decode(token[1..].as_bytes()) + BASE64_STANDARD + .decode(token[1..].as_bytes()) .ok_or_bad_request("Invalid continuation token")?, )?, fallback_key: None, }), "]" => Ok(RangeBegin::AfterKey { key: String::from_utf8( - base64::decode(token[1..].as_bytes()) + BASE64_STANDARD + .decode(token[1..].as_bytes()) .ok_or_bad_request("Invalid continuation token")?, )?, }), |