[test-presigned] Use a HeaderMap type for QueryMap
This commit is contained in:
parent
578bc8d703
commit
70622d02f8
1 changed files with 23 additions and 23 deletions
|
@ -31,9 +31,10 @@ pub const AWS4_HMAC_SHA256: &str = "AWS4-HMAC-SHA256";
|
||||||
pub const UNSIGNED_PAYLOAD: &str = "UNSIGNED-PAYLOAD";
|
pub const UNSIGNED_PAYLOAD: &str = "UNSIGNED-PAYLOAD";
|
||||||
pub const STREAMING_AWS4_HMAC_SHA256_PAYLOAD: &str = "STREAMING-AWS4-HMAC-SHA256-PAYLOAD";
|
pub const STREAMING_AWS4_HMAC_SHA256_PAYLOAD: &str = "STREAMING-AWS4-HMAC-SHA256-PAYLOAD";
|
||||||
|
|
||||||
pub type QueryMap = HashMap<String, QueryValue>;
|
pub type QueryMap = HeaderMap<QueryValue>;
|
||||||
|
|
||||||
pub struct QueryValue {
|
pub struct QueryValue {
|
||||||
|
/// Original key with potential uppercase characters,
|
||||||
|
/// for use in signature calculation
|
||||||
key: String,
|
key: String,
|
||||||
value: String,
|
value: String,
|
||||||
}
|
}
|
||||||
|
@ -45,7 +46,7 @@ pub async fn check_payload_signature(
|
||||||
) -> Result<(Option<Key>, Option<Hash>), Error> {
|
) -> Result<(Option<Key>, Option<Hash>), Error> {
|
||||||
let query = parse_query_map(request.uri())?;
|
let query = parse_query_map(request.uri())?;
|
||||||
|
|
||||||
if query.contains_key(X_AMZ_ALGORITHM.as_str()) {
|
if query.contains_key(&X_AMZ_ALGORITHM) {
|
||||||
// We check for presigned-URL-style authentification first, because
|
// We check for presigned-URL-style authentification first, because
|
||||||
// the browser or someting else could inject an Authorization header
|
// the browser or someting else could inject an Authorization header
|
||||||
// that is totally unrelated to AWS signatures.
|
// that is totally unrelated to AWS signatures.
|
||||||
|
@ -126,7 +127,7 @@ async fn check_presigned_signature(
|
||||||
request: &mut Request<Body>,
|
request: &mut Request<Body>,
|
||||||
mut query: QueryMap,
|
mut query: QueryMap,
|
||||||
) -> Result<(Option<Key>, Option<Hash>), Error> {
|
) -> Result<(Option<Key>, Option<Hash>), Error> {
|
||||||
let algorithm = query.get(X_AMZ_ALGORITHM.as_str()).unwrap();
|
let algorithm = query.get(&X_AMZ_ALGORITHM).unwrap();
|
||||||
let authorization = Authorization::parse_presigned(&algorithm.value, &query)?;
|
let authorization = Authorization::parse_presigned(&algorithm.value, &query)?;
|
||||||
|
|
||||||
// Verify that all necessary request headers are included in signed_headers
|
// Verify that all necessary request headers are included in signed_headers
|
||||||
|
@ -140,7 +141,7 @@ async fn check_presigned_signature(
|
||||||
// but the signature cannot be computed from a string that contains itself.
|
// but the signature cannot be computed from a string that contains itself.
|
||||||
// AWS specifies that all query params except X-Amz-Signature are included
|
// AWS specifies that all query params except X-Amz-Signature are included
|
||||||
// in the canonical request.
|
// in the canonical request.
|
||||||
query.remove(X_AMZ_SIGNATURE.as_str());
|
query.remove(&X_AMZ_SIGNATURE);
|
||||||
let canonical_request = canonical_request(
|
let canonical_request = canonical_request(
|
||||||
service,
|
service,
|
||||||
request.method(),
|
request.method(),
|
||||||
|
@ -166,9 +167,7 @@ async fn check_presigned_signature(
|
||||||
// then an InvalidRequest error is raised.
|
// then an InvalidRequest error is raised.
|
||||||
let headers_mut = request.headers_mut();
|
let headers_mut = request.headers_mut();
|
||||||
for (name, value) in query.iter() {
|
for (name, value) in query.iter() {
|
||||||
let name =
|
if let Some(existing) = headers_mut.get(name) {
|
||||||
HeaderName::from_bytes(name.as_bytes()).ok_or_bad_request("Invalid header name")?;
|
|
||||||
if let Some(existing) = headers_mut.get(&name) {
|
|
||||||
if signed_headers.contains(&name) && existing.as_bytes() != value.value.as_bytes() {
|
if signed_headers.contains(&name) && existing.as_bytes() != value.value.as_bytes() {
|
||||||
return Err(Error::bad_request(format!(
|
return Err(Error::bad_request(format!(
|
||||||
"Conflicting values for `{}` in query parameters and request headers",
|
"Conflicting values for `{}` in query parameters and request headers",
|
||||||
|
@ -197,18 +196,19 @@ async fn check_presigned_signature(
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_query_map(uri: &http::uri::Uri) -> Result<QueryMap, Error> {
|
pub fn parse_query_map(uri: &http::uri::Uri) -> Result<QueryMap, Error> {
|
||||||
let mut query = QueryMap::new();
|
let mut query = QueryMap::with_capacity(0);
|
||||||
if let Some(query_str) = uri.query() {
|
if let Some(query_str) = uri.query() {
|
||||||
let query_pairs = url::form_urlencoded::parse(query_str.as_bytes());
|
let query_pairs = url::form_urlencoded::parse(query_str.as_bytes());
|
||||||
for (key, val) in query_pairs {
|
for (key, val) in query_pairs {
|
||||||
let key = key.into_owned();
|
let name =
|
||||||
|
HeaderName::from_bytes(key.as_bytes()).ok_or_bad_request("Invalid header name")?;
|
||||||
|
|
||||||
let value = QueryValue {
|
let value = QueryValue {
|
||||||
key: key.clone(),
|
key: key.to_string(),
|
||||||
value: val.into_owned(),
|
value: val.into_owned(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if query.insert(key.to_lowercase(), value).is_some() {
|
if query.insert(name, value).is_some() {
|
||||||
return Err(Error::bad_request(format!(
|
return Err(Error::bad_request(format!(
|
||||||
"duplicate query parameter: `{}`",
|
"duplicate query parameter: `{}`",
|
||||||
key
|
key
|
||||||
|
@ -475,17 +475,17 @@ impl Authorization {
|
||||||
}
|
}
|
||||||
|
|
||||||
let cred = query
|
let cred = query
|
||||||
.get(X_AMZ_CREDENTIAL.as_str())
|
.get(&X_AMZ_CREDENTIAL)
|
||||||
.ok_or_bad_request("X-Amz-Credential not found in query parameters")?;
|
.ok_or_bad_request("X-Amz-Credential not found in query parameters")?;
|
||||||
let signed_headers = query
|
let signed_headers = query
|
||||||
.get(X_AMZ_SIGNEDHEADERS.as_str())
|
.get(&X_AMZ_SIGNEDHEADERS)
|
||||||
.ok_or_bad_request("X-Amz-SignedHeaders not found in query parameters")?;
|
.ok_or_bad_request("X-Amz-SignedHeaders not found in query parameters")?;
|
||||||
let signature = query
|
let signature = query
|
||||||
.get(X_AMZ_SIGNATURE.as_str())
|
.get(&X_AMZ_SIGNATURE)
|
||||||
.ok_or_bad_request("X-Amz-Signature not found in query parameters")?;
|
.ok_or_bad_request("X-Amz-Signature not found in query parameters")?;
|
||||||
|
|
||||||
let duration = query
|
let duration = query
|
||||||
.get(X_AMZ_EXPIRES.as_str())
|
.get(&X_AMZ_EXPIRES)
|
||||||
.ok_or_bad_request("X-Amz-Expires not found in query parameters")?
|
.ok_or_bad_request("X-Amz-Expires not found in query parameters")?
|
||||||
.value
|
.value
|
||||||
.parse()
|
.parse()
|
||||||
|
@ -498,7 +498,7 @@ impl Authorization {
|
||||||
}
|
}
|
||||||
|
|
||||||
let date = query
|
let date = query
|
||||||
.get(X_AMZ_DATE.as_str())
|
.get(&X_AMZ_DATE)
|
||||||
.ok_or_bad_request("Missing X-Amz-Date field")?;
|
.ok_or_bad_request("Missing X-Amz-Date field")?;
|
||||||
let date = parse_date(&date.value)?;
|
let date = parse_date(&date.value)?;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue