mirror of
https://github.com/actix/actix-web.git
synced 2025-04-27 20:04:43 +00:00
e634e64847
* Use `OffsetDateTime` instead of `PrimitiveDateTime`
* Parse time strings with `PrimitiveDateTime::parse` instead of `OffsetDateTime::parse`
* Remove unused `time` dependency from actix-multipart
* Fix a few errors with time related tests from the `time` upgrade
* Implement logic to convert a RFC 850 two-digit year into a full length year, and organize time parsing related functions
* Upgrade `time` to 0.2.2
* Correctly parse C's asctime time format using time 0.2's new format patterns
* Update CHANGES.md
* Use `time` without any of its deprecated functions
* Enforce a UTC time offset when converting an `OffsetDateTime` into a Header value
* Use the more readable version of `Duration::seconds(0)`, `Duration::zero()`
* Remove unneeded conversion of time::Duration to std::time::Duration
* Use `OffsetDateTime::as_seconds_f64` instead of manually calculating the amount of seconds from nanoseconds
* Replace a few additional instances of `Duration::seconds(0)` with `Duration::zero()`
* Truncate any nanoseconds from a supplied `Duration` within `Cookie::set_max_age` to ensure two Cookies with the same amount whole seconds equate to one another
* Fix the actix-http:🍪:do_not_panic_on_large_max_ages test
* Convert `Cookie::max_age` and `Cookie::expires` examples to `time` 0.2
Mainly minor changes. Type inference can be used alongside the new
`time::parse` method, such that the type doesn't need to be specified.
This will be useful if a refactoring takes place that changes the type.
There are also new macros, which are used where possible.
One change that is not immediately obvious, in `HttpDate`, there was an
unnecessary conditional. As the time crate allows for negative durations
(and can perform arithmetic with such), the if/else can be removed
entirely.
Time v0.2.3 also has some bug fixes, which is why I am not using a more
general v0.2 in Cargo.toml.
v0.2.3 has been yanked, as it was backwards imcompatible. This version
reverts the breaking change, while still supporting rustc back to
1.34.0.
* Add missing `time::offset` macro import
* Fix type confusion when using `time::parse` followed by `using_offset`
* Update `time` to 0.2.5
* Update CHANGES.md
Co-authored-by: Jacob Pratt <the.z.cuber@gmail.com>
94 lines
2.5 KiB
Rust
94 lines
2.5 KiB
Rust
use std::fmt::{self, Display};
|
|
use std::io::Write;
|
|
use std::str::FromStr;
|
|
use std::time::{SystemTime, UNIX_EPOCH};
|
|
|
|
use bytes::{buf::BufMutExt, BytesMut};
|
|
use http::header::{HeaderValue, InvalidHeaderValue};
|
|
use time::{PrimitiveDateTime, OffsetDateTime, offset};
|
|
|
|
use crate::error::ParseError;
|
|
use crate::header::IntoHeaderValue;
|
|
use crate::time_parser;
|
|
|
|
/// A timestamp with HTTP formatting and parsing
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
|
|
pub struct HttpDate(OffsetDateTime);
|
|
|
|
impl FromStr for HttpDate {
|
|
type Err = ParseError;
|
|
|
|
fn from_str(s: &str) -> Result<HttpDate, ParseError> {
|
|
match time_parser::parse_http_date(s) {
|
|
Some(t) => Ok(HttpDate(t.using_offset(offset!(UTC)))),
|
|
None => Err(ParseError::Header)
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Display for HttpDate {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
fmt::Display::fmt(&self.0.format("%a, %d %b %Y %H:%M:%S GMT"), f)
|
|
}
|
|
}
|
|
|
|
impl From<OffsetDateTime> for HttpDate {
|
|
fn from(dt: OffsetDateTime) -> HttpDate {
|
|
HttpDate(dt)
|
|
}
|
|
}
|
|
|
|
impl From<SystemTime> for HttpDate {
|
|
fn from(sys: SystemTime) -> HttpDate {
|
|
HttpDate(PrimitiveDateTime::from(sys).using_offset(offset!(UTC)))
|
|
}
|
|
}
|
|
|
|
impl IntoHeaderValue for HttpDate {
|
|
type Error = InvalidHeaderValue;
|
|
|
|
fn try_into(self) -> Result<HeaderValue, Self::Error> {
|
|
let mut wrt = BytesMut::with_capacity(29).writer();
|
|
write!(wrt, "{}", self.0.to_offset(offset!(UTC)).format("%a, %d %b %Y %H:%M:%S GMT")).unwrap();
|
|
HeaderValue::from_maybe_shared(wrt.get_mut().split().freeze())
|
|
}
|
|
}
|
|
|
|
impl From<HttpDate> for SystemTime {
|
|
fn from(date: HttpDate) -> SystemTime {
|
|
let dt = date.0;
|
|
let epoch = OffsetDateTime::unix_epoch();
|
|
|
|
UNIX_EPOCH + (dt - epoch)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::HttpDate;
|
|
use time::{PrimitiveDateTime, date, time, offset};
|
|
|
|
#[test]
|
|
fn test_date() {
|
|
let nov_07 = HttpDate(PrimitiveDateTime::new(
|
|
date!(1994-11-07),
|
|
time!(8:48:37)
|
|
).using_offset(offset!(UTC)));
|
|
|
|
assert_eq!(
|
|
"Sun, 07 Nov 1994 08:48:37 GMT".parse::<HttpDate>().unwrap(),
|
|
nov_07
|
|
);
|
|
assert_eq!(
|
|
"Sunday, 07-Nov-94 08:48:37 GMT"
|
|
.parse::<HttpDate>()
|
|
.unwrap(),
|
|
nov_07
|
|
);
|
|
assert_eq!(
|
|
"Sun Nov 7 08:48:37 1994".parse::<HttpDate>().unwrap(),
|
|
nov_07
|
|
);
|
|
assert!("this-is-no-date".parse::<HttpDate>().is_err());
|
|
}
|
|
}
|