clippy

src/api/error.rs

@@ -206,11 +206,7 @@ where
 	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
 		match self {
 			Ok(x) => Ok(x),
-			Err(e) => Err(Error::BadRequest(format!(
-				"{}: {}",
-				reason.as_ref(),
-				e.to_string()
-			))),
+			Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
 		}
 	}
 }

src/api/s3_copy.rs

@@ -487,7 +487,7 @@ impl CopyPreconditionHeaders {
 				.get("x-amz-copy-source-if-modified-since")
 				.map(|x| x.to_str())
 				.transpose()?
-				.map(|x| httpdate::parse_http_date(x))
+				.map(httpdate::parse_http_date)
 				.transpose()
 				.ok_or_bad_request("Invalid date in x-amz-copy-source-if-modified-since")?,
 			copy_source_if_none_match: req
@@ -505,7 +505,7 @@ impl CopyPreconditionHeaders {
 				.get("x-amz-copy-source-if-unmodified-since")
 				.map(|x| x.to_str())
 				.transpose()?
-				.map(|x| httpdate::parse_http_date(x))
+				.map(httpdate::parse_http_date)
 				.transpose()
 				.ok_or_bad_request("Invalid date in x-amz-copy-source-if-unmodified-since")?,
 		})

src/api/s3_list.rs

@@ -121,7 +121,7 @@ pub async fn handle_list(
 				key: uriencode_maybe(key, query.common.urlencode_resp),
 				last_modified: s3_xml::Value(msec_to_rfc3339(info.last_modified)),
 				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()),
 			})
 			.collect(),

src/api/signature/payload.rs

@@ -38,20 +38,9 @@ pub async fn check_payload_signature(
 		parse_query_authorization(&headers)?
 	};
 
-	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 scope = format!(
 		"{}/{}/s3/aws4_request",
-		date.format(SHORT_DATE),
+		authorization.date.format(SHORT_DATE),
 		garage.config.s3_api.s3_region
 	);
 	if authorization.scope != scope {
@@ -74,10 +63,10 @@ pub async fn check_payload_signature(
 		&authorization.signed_headers,
 		&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(
-		&date,
+		&authorization.date,
 		&key_p.secret_key,
 		&garage.config.s3_api.s3_region,
 		"s3",
@@ -113,6 +102,7 @@ struct Authorization {
 	signed_headers: String,
 	signature: String,
 	content_sha256: String,
+	date: DateTime<Utc>,
 }
 
 fn parse_authorization(
@@ -147,6 +137,17 @@ fn parse_authorization(
 		.get("x-amz-content-sha256")
 		.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 {
 		key_id,
 		scope,
@@ -159,6 +160,7 @@ fn parse_authorization(
 			.ok_or_bad_request("Could not find Signature in Authorization field")?
 			.to_string(),
 		content_sha256: content_sha256.to_string(),
+		date,
 	};
 	Ok(auth)
 }
@@ -188,12 +190,36 @@ fn parse_query_authorization(headers: &HashMap<String, String>) -> Result<Author
 		.map(|x| x.as_str())
 		.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 {
 		key_id,
 		scope,
 		signed_headers: signed_headers.to_string(),
 		signature: signature.to_string(),
 		content_sha256: content_sha256.to_string(),
+		date,
 	})
 }
 

src/model/helper/error.rs

@@ -31,11 +31,7 @@ where
 	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
 		match self {
 			Ok(x) => Ok(x),
-			Err(e) => Err(Error::BadRequest(format!(
-				"{}: {}",
-				reason.as_ref(),
-				e.to_string()
-			))),
+			Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
 		}
 	}
 }