Skip to content

Commit

Permalink
Deny offset when parsing to NaiveDateTime
Browse files Browse the repository at this point in the history
  • Loading branch information
pitdicker committed Jun 8, 2023
1 parent cf75bf0 commit 2b4646d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
5 changes: 4 additions & 1 deletion src/format/parsed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,9 @@ impl Parsed {
/// from date and time fields or a single [`timestamp`](#structfield.timestamp) field.
/// Either way those fields have to be consistent to each other.
pub fn to_naive_datetime_with_offset(&self, offset: i32) -> ParseResult<NaiveDateTime> {
if self.offset.is_some() {
return Err(BAD_FORMAT);
}
self.to_naive_datetime_with_offset_inner(offset, true)
}

Expand Down Expand Up @@ -653,7 +656,7 @@ impl Parsed {

// `guessed_offset` should be correct when `self.timestamp` is given.
// it will be 0 otherwise, but this is fine as the algorithm ignores offset for that case.
let datetime = self.to_naive_datetime_with_offset(guessed_offset)?;
let datetime = self.to_naive_datetime_with_offset_inner(guessed_offset, false)?;
match tz.from_local_datetime(&datetime) {
LocalResult::None => Err(IMPOSSIBLE),
LocalResult::Single(t) => {
Expand Down
15 changes: 10 additions & 5 deletions src/naive/datetime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,18 @@ impl NaiveDateTime {
/// Ok(NaiveDate::from_ymd_opt(2015, 9, 5).unwrap().and_hms_micro_opt(13, 23, 45, 678_900).unwrap()));
/// ```
///
/// Offset is ignored for the purpose of parsing.
/// An included offset will return an error, parse to a `DateTime<FixedOffset>` first.
///
/// ```
/// # use chrono::{NaiveDateTime, NaiveDate};
/// # let parse_from_str = NaiveDateTime::parse_from_str;
/// assert_eq!(parse_from_str("2014-5-17T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
/// Ok(NaiveDate::from_ymd_opt(2014, 5, 17).unwrap().and_hms_opt(12, 34, 56).unwrap()));
/// use chrono::{DateTime, NaiveDateTime, NaiveDate, FixedOffset};
/// use chrono::format::ParseErrorKind;
///
/// let r = NaiveDateTime::parse_from_str("2014-5-17T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z");
/// assert_eq!(r.unwrap_err().kind(), ParseErrorKind::BadFormat);
/// let dt =
/// DateTime::<FixedOffset>::parse_from_str("2014-5-17T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z");
/// assert_eq!(dt.unwrap().naive_local(),
/// NaiveDate::from_ymd_opt(2014, 5, 17).unwrap().and_hms_opt(12, 34, 56).unwrap());
/// ```
///
/// [Leap seconds](./struct.NaiveTime.html#leap-second-handling) are correctly handled by
Expand Down
7 changes: 3 additions & 4 deletions src/naive/datetime/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,6 @@ fn test_datetime_parse_from_str() {
let ymdhmsn = |y, m, d, h, n, s, nano| {
NaiveDate::from_ymd_opt(y, m, d).unwrap().and_hms_nano_opt(h, n, s, nano).unwrap()
};
assert_eq!(
NaiveDateTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z"),
Ok(ymdhms(2014, 5, 7, 12, 34, 56))
); // ignore offset
assert_eq!(
NaiveDateTime::parse_from_str("2015-W06-1 000000", "%G-W%V-%u%H%M%S"),
Ok(ymdhms(2015, 2, 2, 0, 0, 0))
Expand Down Expand Up @@ -284,6 +280,9 @@ fn test_datetime_parse_from_str() {
NaiveDateTime::parse_from_str("1437742189.918273645", "%s%.9f"),
Ok(ymdhmsn(2015, 7, 24, 12, 49, 49, 918273645))
);
assert!(
NaiveDateTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z").is_err()
);
}

#[test]
Expand Down
4 changes: 1 addition & 3 deletions src/naive/time/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,7 @@ fn test_time_parse_from_str() {

assert!(NaiveTime::parse_from_str("2014-5-7T12:34:56", "%Y-%m-%dT%H:%M:%S").is_err());
assert!(NaiveTime::parse_from_str("12:34:56+09:30", "%%H:%M:%S%z").is_err());
assert!(
NaiveTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z").is_err()
);
assert!(NaiveTime::parse_from_str("2014-5-7T12:34:56+09:30", "%Y-%m-%dT%H:%M:%S%z").is_err());
}

#[test]
Expand Down

0 comments on commit 2b4646d

Please sign in to comment.