fix: rfc7231 date format in http headers

Author: hugocaillard

stackslib/src/net/http/response.rs

@@ -346,11 +346,11 @@ impl HttpResponsePreamble {
 }
 
 /// Get an RFC 7231 date that represents the current time
-fn rfc7231_now() -> String {
+fn rfc7231_now() -> Result<String, CodecError> {
     time::OffsetDateTime::now_utc()
         .format(&time::format_description::well_known::Rfc2822)
-        .unwrap()
-        .replace("+0000", "GMT")
+        .map(|date| date.replace("+0000", "GMT"))
+        .map_err(|e| CodecError::GenericError(format!("Failed to format RFC 7231 date: {:?}", e)))
 }
 
 /// Read from a stream until we see '\r\n\r\n', with the purpose of reading an HTTP preamble.
@@ -388,7 +388,7 @@ impl StacksMessageCodec for HttpResponsePreamble {
         if !self.headers.contains_key("date") {
             fd.write_all("Date: ".as_bytes())
                 .map_err(CodecError::WriteError)?;
-            fd.write_all(rfc7231_now().as_bytes())
+            fd.write_all(rfc7231_now()?.as_bytes())
                 .map_err(CodecError::WriteError)?;
             fd.write_all("\r\n".as_bytes())
                 .map_err(CodecError::WriteError)?;

stackslib/src/net/http/tests.rs

@@ -393,16 +393,13 @@ fn test_http_response_preamble_headers() {
     );
     assert!(txt.find("Date: ").is_some(), "Date header is missing");
 
-    // old format
-    // let date_regex = regex::Regex::new(
-    //     r"Date: [A-Za-z]{3}, [A-Za-z]{3} \d{1,2} \d{4} \d{2}:\d{2}:\d{2} GMT\r\n",
-    // )
-    // .unwrap();
-    // new format rfc7231
-    let date_regex =
+    let rfc7231_date_regex =
         regex::Regex::new(r"Date: [A-Za-z]{3}, \d{2} [A-Za-z]{3} \d{4} \d{2}:\d{2}:\d{2} GMT\r\n")
             .unwrap();
-    assert!(date_regex.is_match(&txt), "Date header format is incorrect");
+    assert!(
+        rfc7231_date_regex.is_match(&txt),
+        "Date header format is incorrect"
+    );
     assert!(txt.find("foo: bar\r\n").is_some(), "foo header is missing");
     assert!(
         txt.find("Access-Control-Allow-Origin: *\r\n").is_some(),