Add date verification to presigned urls (#196)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
fix #96 fix #162 by returning Forbidden instead Bad Request Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #196 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>
This commit is contained in:
parent
178e35f868
commit
e55fa38c99
6 changed files with 67 additions and 35 deletions
|
@ -91,6 +91,9 @@ async fn handler(
|
||||||
|
|
||||||
async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
|
async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
|
||||||
let (api_key, content_sha256) = check_payload_signature(&garage, &req).await?;
|
let (api_key, content_sha256) = check_payload_signature(&garage, &req).await?;
|
||||||
|
let api_key = api_key.ok_or_else(|| {
|
||||||
|
Error::Forbidden("Garage does not support anonymous access yet".to_string())
|
||||||
|
})?;
|
||||||
|
|
||||||
let authority = req
|
let authority = req
|
||||||
.headers()
|
.headers()
|
||||||
|
|
|
@ -206,11 +206,7 @@ where
|
||||||
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
|
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
|
||||||
match self {
|
match self {
|
||||||
Ok(x) => Ok(x),
|
Ok(x) => Ok(x),
|
||||||
Err(e) => Err(Error::BadRequest(format!(
|
Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
|
||||||
"{}: {}",
|
|
||||||
reason.as_ref(),
|
|
||||||
e.to_string()
|
|
||||||
))),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -487,7 +487,7 @@ impl CopyPreconditionHeaders {
|
||||||
.get("x-amz-copy-source-if-modified-since")
|
.get("x-amz-copy-source-if-modified-since")
|
||||||
.map(|x| x.to_str())
|
.map(|x| x.to_str())
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.map(|x| httpdate::parse_http_date(x))
|
.map(httpdate::parse_http_date)
|
||||||
.transpose()
|
.transpose()
|
||||||
.ok_or_bad_request("Invalid date in x-amz-copy-source-if-modified-since")?,
|
.ok_or_bad_request("Invalid date in x-amz-copy-source-if-modified-since")?,
|
||||||
copy_source_if_none_match: req
|
copy_source_if_none_match: req
|
||||||
|
@ -505,7 +505,7 @@ impl CopyPreconditionHeaders {
|
||||||
.get("x-amz-copy-source-if-unmodified-since")
|
.get("x-amz-copy-source-if-unmodified-since")
|
||||||
.map(|x| x.to_str())
|
.map(|x| x.to_str())
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.map(|x| httpdate::parse_http_date(x))
|
.map(httpdate::parse_http_date)
|
||||||
.transpose()
|
.transpose()
|
||||||
.ok_or_bad_request("Invalid date in x-amz-copy-source-if-unmodified-since")?,
|
.ok_or_bad_request("Invalid date in x-amz-copy-source-if-unmodified-since")?,
|
||||||
})
|
})
|
||||||
|
|
|
@ -121,7 +121,7 @@ pub async fn handle_list(
|
||||||
key: uriencode_maybe(key, query.common.urlencode_resp),
|
key: uriencode_maybe(key, query.common.urlencode_resp),
|
||||||
last_modified: s3_xml::Value(msec_to_rfc3339(info.last_modified)),
|
last_modified: s3_xml::Value(msec_to_rfc3339(info.last_modified)),
|
||||||
size: s3_xml::IntValue(info.size as i64),
|
size: s3_xml::IntValue(info.size as i64),
|
||||||
etag: s3_xml::Value(format!("\"{}\"", info.etag.to_string())),
|
etag: s3_xml::Value(format!("\"{}\"", info.etag)),
|
||||||
storage_class: s3_xml::Value("STANDARD".to_string()),
|
storage_class: s3_xml::Value("STANDARD".to_string()),
|
||||||
})
|
})
|
||||||
.collect(),
|
.collect(),
|
||||||
|
|
|
@ -20,7 +20,7 @@ use crate::error::*;
|
||||||
pub async fn check_payload_signature(
|
pub async fn check_payload_signature(
|
||||||
garage: &Garage,
|
garage: &Garage,
|
||||||
request: &Request<Body>,
|
request: &Request<Body>,
|
||||||
) -> Result<(Key, Option<Hash>), Error> {
|
) -> Result<(Option<Key>, Option<Hash>), Error> {
|
||||||
let mut headers = HashMap::new();
|
let mut headers = HashMap::new();
|
||||||
for (key, val) in request.headers() {
|
for (key, val) in request.headers() {
|
||||||
headers.insert(key.to_string(), val.to_str()?.to_string());
|
headers.insert(key.to_string(), val.to_str()?.to_string());
|
||||||
|
@ -34,24 +34,24 @@ pub async fn check_payload_signature(
|
||||||
|
|
||||||
let authorization = if let Some(authorization) = headers.get("authorization") {
|
let authorization = if let Some(authorization) = headers.get("authorization") {
|
||||||
parse_authorization(authorization, &headers)?
|
parse_authorization(authorization, &headers)?
|
||||||
|
} else if let Some(algorithm) = headers.get("x-amz-algorithm") {
|
||||||
|
parse_query_authorization(algorithm, &headers)?
|
||||||
} else {
|
} else {
|
||||||
parse_query_authorization(&headers)?
|
let content_sha256 = headers.get("x-amz-content-sha256");
|
||||||
};
|
if let Some(content_sha256) = content_sha256.filter(|c| "UNSIGNED-PAYLOAD" != c.as_str()) {
|
||||||
|
let sha256 = hex::decode(content_sha256)
|
||||||
let date = headers
|
.ok()
|
||||||
.get("x-amz-date")
|
.and_then(|bytes| Hash::try_from(&bytes))
|
||||||
.ok_or_bad_request("Missing X-Amz-Date field")?;
|
.ok_or_bad_request("Invalid content sha256 hash")?;
|
||||||
let date: NaiveDateTime =
|
return Ok((None, Some(sha256)));
|
||||||
NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
|
} else {
|
||||||
let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
|
return Ok((None, None));
|
||||||
|
|
||||||
if Utc::now() - date > Duration::hours(24) {
|
|
||||||
return Err(Error::BadRequest("Date is too old".to_string()));
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let scope = format!(
|
let scope = format!(
|
||||||
"{}/{}/s3/aws4_request",
|
"{}/{}/s3/aws4_request",
|
||||||
date.format(SHORT_DATE),
|
authorization.date.format(SHORT_DATE),
|
||||||
garage.config.s3_api.s3_region
|
garage.config.s3_api.s3_region
|
||||||
);
|
);
|
||||||
if authorization.scope != scope {
|
if authorization.scope != scope {
|
||||||
|
@ -74,10 +74,10 @@ pub async fn check_payload_signature(
|
||||||
&authorization.signed_headers,
|
&authorization.signed_headers,
|
||||||
&authorization.content_sha256,
|
&authorization.content_sha256,
|
||||||
);
|
);
|
||||||
let string_to_sign = string_to_sign(&date, &scope, &canonical_request);
|
let string_to_sign = string_to_sign(&authorization.date, &scope, &canonical_request);
|
||||||
|
|
||||||
let mut hmac = signing_hmac(
|
let mut hmac = signing_hmac(
|
||||||
&date,
|
&authorization.date,
|
||||||
&key_p.secret_key,
|
&key_p.secret_key,
|
||||||
&garage.config.s3_api.s3_region,
|
&garage.config.s3_api.s3_region,
|
||||||
"s3",
|
"s3",
|
||||||
|
@ -104,7 +104,7 @@ pub async fn check_payload_signature(
|
||||||
Some(Hash::try_from(&bytes).ok_or_bad_request("Invalid content sha256 hash")?)
|
Some(Hash::try_from(&bytes).ok_or_bad_request("Invalid content sha256 hash")?)
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok((key, content_sha256))
|
Ok((Some(key), content_sha256))
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Authorization {
|
struct Authorization {
|
||||||
|
@ -113,6 +113,7 @@ struct Authorization {
|
||||||
signed_headers: String,
|
signed_headers: String,
|
||||||
signature: String,
|
signature: String,
|
||||||
content_sha256: String,
|
content_sha256: String,
|
||||||
|
date: DateTime<Utc>,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_authorization(
|
fn parse_authorization(
|
||||||
|
@ -147,6 +148,17 @@ fn parse_authorization(
|
||||||
.get("x-amz-content-sha256")
|
.get("x-amz-content-sha256")
|
||||||
.ok_or_bad_request("Missing X-Amz-Content-Sha256 field")?;
|
.ok_or_bad_request("Missing X-Amz-Content-Sha256 field")?;
|
||||||
|
|
||||||
|
let date = headers
|
||||||
|
.get("x-amz-date")
|
||||||
|
.ok_or_bad_request("Missing X-Amz-Date field")?;
|
||||||
|
let date: NaiveDateTime =
|
||||||
|
NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
|
||||||
|
let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
|
||||||
|
|
||||||
|
if Utc::now() - date > Duration::hours(24) {
|
||||||
|
return Err(Error::BadRequest("Date is too old".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
let auth = Authorization {
|
let auth = Authorization {
|
||||||
key_id,
|
key_id,
|
||||||
scope,
|
scope,
|
||||||
|
@ -159,15 +171,16 @@ fn parse_authorization(
|
||||||
.ok_or_bad_request("Could not find Signature in Authorization field")?
|
.ok_or_bad_request("Could not find Signature in Authorization field")?
|
||||||
.to_string(),
|
.to_string(),
|
||||||
content_sha256: content_sha256.to_string(),
|
content_sha256: content_sha256.to_string(),
|
||||||
|
date,
|
||||||
};
|
};
|
||||||
Ok(auth)
|
Ok(auth)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_query_authorization(headers: &HashMap<String, String>) -> Result<Authorization, Error> {
|
fn parse_query_authorization(
|
||||||
let algo = headers
|
algorithm: &str,
|
||||||
.get("x-amz-algorithm")
|
headers: &HashMap<String, String>,
|
||||||
.ok_or_bad_request("X-Amz-Algorithm not found in query parameters")?;
|
) -> Result<Authorization, Error> {
|
||||||
if algo != "AWS4-HMAC-SHA256" {
|
if algorithm != "AWS4-HMAC-SHA256" {
|
||||||
return Err(Error::BadRequest(
|
return Err(Error::BadRequest(
|
||||||
"Unsupported authorization method".to_string(),
|
"Unsupported authorization method".to_string(),
|
||||||
));
|
));
|
||||||
|
@ -188,12 +201,36 @@ fn parse_query_authorization(headers: &HashMap<String, String>) -> Result<Author
|
||||||
.map(|x| x.as_str())
|
.map(|x| x.as_str())
|
||||||
.unwrap_or("UNSIGNED-PAYLOAD");
|
.unwrap_or("UNSIGNED-PAYLOAD");
|
||||||
|
|
||||||
|
let duration = headers
|
||||||
|
.get("x-amz-expires")
|
||||||
|
.ok_or_bad_request("X-Amz-Expires not found in query parameters")?
|
||||||
|
.parse()
|
||||||
|
.map_err(|_| Error::BadRequest("X-Amz-Expires is not a number".to_string()))?;
|
||||||
|
|
||||||
|
if duration > 7 * 24 * 3600 {
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
"X-Amz-Exprires may not exceed a week".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let date = headers
|
||||||
|
.get("x-amz-date")
|
||||||
|
.ok_or_bad_request("Missing X-Amz-Date field")?;
|
||||||
|
let date: NaiveDateTime =
|
||||||
|
NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
|
||||||
|
let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
|
||||||
|
|
||||||
|
if Utc::now() - date > Duration::seconds(duration) {
|
||||||
|
return Err(Error::BadRequest("Date is too old".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
Ok(Authorization {
|
Ok(Authorization {
|
||||||
key_id,
|
key_id,
|
||||||
scope,
|
scope,
|
||||||
signed_headers: signed_headers.to_string(),
|
signed_headers: signed_headers.to_string(),
|
||||||
signature: signature.to_string(),
|
signature: signature.to_string(),
|
||||||
content_sha256: content_sha256.to_string(),
|
content_sha256: content_sha256.to_string(),
|
||||||
|
date,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,11 +31,7 @@ where
|
||||||
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
|
fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
|
||||||
match self {
|
match self {
|
||||||
Ok(x) => Ok(x),
|
Ok(x) => Ok(x),
|
||||||
Err(e) => Err(Error::BadRequest(format!(
|
Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
|
||||||
"{}: {}",
|
|
||||||
reason.as_ref(),
|
|
||||||
e.to_string()
|
|
||||||
))),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue