Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Constrain timezone parsing #1000

Merged
merged 2 commits into from Apr 3, 2023
Merged

Constrain timezone parsing #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76fe02e
Constrain timezone parsing
jtmoon79 Mar 24, 2023
921f8bc
cargo fmt updates
jtmoon79 Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
130 changes: 59 additions & 71 deletions src/datetime/tests.rs
View file
Open in desktop
Expand Up @@ -809,11 +809,7 @@ fn test_parse_datetime_utc() {
"2001-02-03T04:05:06Z",
"2001-02-03T04:05:06+0000",
"2001-02-03T04:05:06-00:00",
"2001-02-03T04:05:06-00 00",
"2001-02-03T04:05:06-01:00",
"2001-02-03T04:05:06-01: 00",
"2001-02-03T04:05:06-01 :00",
"2001-02-03T04:05:06-01 : 00",
"2012-12-12T12:12:12Z",
"2015-02-18T23:16:09.153Z",
"2015-2-18T23:16:09.153Z",
Expand Down Expand Up @@ -860,31 +856,35 @@ fn test_parse_datetime_utc() {
"+1441497364", // valid datetime, wrong format
"+1441497364Z", // valid datetime, wrong format
"2014/02/03 04:05:06Z", // valid datetime, wrong format
"2001-02-03T04:05:0600:00", // valid datetime, timezone too close
"2015-15-15T15:15:15Z", // invalid datetime
"2012-12-12T12:12:12x", // invalid timezone
"2012-123-12T12:12:12Z", // invalid month
"2012-12-77T12:12:12Z", // invalid day
"2012-12-12T26:12:12Z", // invalid hour
"2012-12-12T12:61:12Z", // invalid minute
"2012-12-12T12:12:62Z", // invalid second
"2012-12-12 T12:12:12Z", // space after date
"2012-12-12t12:12:12Z", // wrong divider 't'
"2012-12-12T12:12:12ZZ", // trailing literal 'Z'
"+802701-12-12T12:12:12Z", // invalid year (out of bounds)
"+ 2012-12-12T12:12:12Z", // invalid space before year
"2012 -12-12T12:12:12Z", // space after year
"2012 -12-12T12:12:12Z", // multi space after year
"2012- 12-12T12:12:12Z", // space after year divider
"2012- 12-12T12:12:12Z", // multi space after year divider
"2012-12-12T 12:12:12Z", // space after date-time divider
"2012-12-12T12 :12:12Z", // space after hour
"2012-12-12T12 :12:12Z", // multi space after hour
"2012-12-12T12: 12:12Z", // space before minute
"2012-12-12T12: 12:12Z", // multi space before minute
"2012-12-12T12 : 12:12Z", // space space before and after hour-minute divider
"2012-12-12T12:12:12Z ", // trailing space
" 2012-12-12T12:12:12Z", // leading space
"2001-02-03T04:05:0600:00", // valid datetime, timezone too close
"2015-15-15T15:15:15Z", // invalid datetime
"2012-12-12T12:12:12x", // invalid timezone
"2012-123-12T12:12:12Z", // invalid month
"2012-12-77T12:12:12Z", // invalid day
"2012-12-12T26:12:12Z", // invalid hour
"2012-12-12T12:61:12Z", // invalid minute
"2012-12-12T12:12:62Z", // invalid second
"2012-12-12 T12:12:12Z", // space after date
"2012-12-12t12:12:12Z", // wrong divider 't'
"2012-12-12T12:12:12ZZ", // trailing literal 'Z'
"+802701-12-12T12:12:12Z", // invalid year (out of bounds)
"+ 2012-12-12T12:12:12Z", // invalid space before year
"2012 -12-12T12:12:12Z", // space after year
"2012 -12-12T12:12:12Z", // multi space after year
"2012- 12-12T12:12:12Z", // space after year divider
"2012- 12-12T12:12:12Z", // multi space after year divider
"2012-12-12T 12:12:12Z", // space after date-time divider
"2012-12-12T12 :12:12Z", // space after hour
"2012-12-12T12 :12:12Z", // multi space after hour
"2012-12-12T12: 12:12Z", // space before minute
"2012-12-12T12: 12:12Z", // multi space before minute
"2012-12-12T12 : 12:12Z", // space space before and after hour-minute divider
"2012-12-12T12:12:12Z ", // trailing space
" 2012-12-12T12:12:12Z", // leading space
"2001-02-03T04:05:06-00 00", // invalid timezone spacing
"2001-02-03T04:05:06-01: 00", // invalid timezone spacing
"2001-02-03T04:05:06-01 :00", // invalid timezone spacing
"2001-02-03T04:05:06-01 : 00", // invalid timezone spacing
"2001-02-03T04:05:06-01 : 00", // invalid timezone spacing
"2001-02-03T04:05:06-01 : :00", // invalid timezone spacing
" +82701 - 05 - 6 T 15 : 9 : 60.898989898989 Z", // valid datetime, wrong format
Expand Down Expand Up @@ -1040,27 +1040,23 @@ fn test_datetime_parse_from_str() {
),
Ok(dt),
);
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 00",
"%b %d %Y %H:%M:%S %z"
),
Ok(dt),
);
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 00",
"%b %d %Y %H:%M:%S %z"
)
.is_err());
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09:00",
"%b %d %Y %H:%M:%S %z"
),
Ok(dt),
);
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00",
"%b %d %Y %H:%M:%S %z"
),
Ok(dt),
);
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00",
"%b %d %Y %H:%M:%S %z"
)
.is_err());
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 --0900",
Expand Down Expand Up @@ -1161,27 +1157,21 @@ fn test_datetime_parse_from_str() {
),
Ok(dt),
);
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 00",
"%b %d %Y %H:%M:%S %:z"
),
Ok(dt),
);
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00",
"%b %d %Y %H:%M:%S %:z"
),
Ok(dt),
);
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00:",
"%b %d %Y %H:%M:%S %:z:"
),
Ok(dt),
);
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 00",
"%b %d %Y %H:%M:%S %:z"
)
.is_err());
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00",
"%b %d %Y %H:%M:%S %:z"
)
.is_err());
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00:",
"%b %d %Y %H:%M:%S %:z:"
)
.is_err());
// wrong timezone data
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09",
Expand Down Expand Up @@ -1230,13 +1220,11 @@ fn test_datetime_parse_from_str() {
),
Ok(dt),
);
assert_eq!(
DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00",
"%b %d %Y %H:%M:%S %::z"
),
Ok(dt),
);
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09 : 00",
"%b %d %Y %H:%M:%S %::z"
)
.is_err());
// mismatching colon expectations
assert!(DateTime::<FixedOffset>::parse_from_str(
"Aug 09 2013 23:54:35 -09:00:00",
Expand Down
42 changes: 21 additions & 21 deletions src/format/parse.rs
View file
Open in desktop
Expand Up @@ -453,14 +453,14 @@ where
| &TimezoneOffset => {
s = scan::trim1(s);
let offset =
try_consume!(scan::timezone_offset(s, scan::maybe_colon_or_space));
try_consume!(scan::timezone_offset(s, scan::consume_colon_maybe));
parsed.set_offset(i64::from(offset)).map_err(|e| (s, e))?;
}

&TimezoneOffsetColonZ | &TimezoneOffsetZ => {
s = scan::trim1(s);
let offset =
try_consume!(scan::timezone_offset_zulu(s, scan::maybe_colon_or_space));
try_consume!(scan::timezone_offset_zulu(s, scan::consume_colon_maybe));
parsed.set_offset(i64::from(offset)).map_err(|e| (s, e))?;
}

Expand All @@ -470,7 +470,7 @@ where
s = scan::trim1(s);
let offset = try_consume!(scan::timezone_offset_permissive(
s,
scan::maybe_colon_or_space
scan::consume_colon_maybe
));
parsed.set_offset(i64::from(offset)).map_err(|e| (s, e))?;
}
Expand Down Expand Up @@ -929,7 +929,7 @@ fn test_parse() {
check!("+12:34:5", [fix!(TimezoneOffset)]; TOO_LONG);
check!("+12:34:56", [fix!(TimezoneOffset)]; TOO_LONG);
check!("+12:34:56:", [fix!(TimezoneOffset)]; TOO_LONG);
check!("+12 34", [fix!(TimezoneOffset)]; offset: 45_240);
check!("+12 34", [fix!(TimezoneOffset)]; INVALID);
check!("+12 34", [fix!(TimezoneOffset)]; INVALID);
check!("12:34", [fix!(TimezoneOffset)]; INVALID);
check!("12:34:56", [fix!(TimezoneOffset)]; INVALID);
Expand All @@ -956,15 +956,15 @@ fn test_parse() {
check!("+00:99", [fix!(TimezoneOffset)]; OUT_OF_RANGE);
check!("#12:34", [fix!(TimezoneOffset)]; INVALID);
check!("+12:34 ", [fix!(TimezoneOffset)]; TOO_LONG);
check!("+12 34 ", [fix!(TimezoneOffset)]; TOO_LONG);
check!("+12 34 ", [fix!(TimezoneOffset)]; INVALID);
check!(" +12:34", [fix!(TimezoneOffset)]; offset: 45_240);
check!(" -12:34", [fix!(TimezoneOffset)]; offset: -45_240);
check!(" +12:34", [fix!(TimezoneOffset)]; INVALID);
check!(" -12:34", [fix!(TimezoneOffset)]; INVALID);
check!("\t -12:34", [fix!(TimezoneOffset)]; INVALID);
check!("-12: 34", [fix!(TimezoneOffset)]; offset: -45_240);
check!("-12 :34", [fix!(TimezoneOffset)]; offset: -45_240);
check!("-12 : 34", [fix!(TimezoneOffset)]; offset: -45_240);
check!("-12: 34", [fix!(TimezoneOffset)]; INVALID);
check!("-12 :34", [fix!(TimezoneOffset)]; INVALID);
check!("-12 : 34", [fix!(TimezoneOffset)]; INVALID);
check!("-12 : 34", [fix!(TimezoneOffset)]; INVALID);
check!("-12 : 34", [fix!(TimezoneOffset)]; INVALID);
check!("-12: 34", [fix!(TimezoneOffset)]; INVALID);
Expand Down Expand Up @@ -1037,10 +1037,10 @@ fn test_parse() {
check!("+12:34:56:78", [fix!(TimezoneOffsetColon)]; TOO_LONG);
check!("+12:3456", [fix!(TimezoneOffsetColon)]; TOO_LONG);
check!("+1234:56", [fix!(TimezoneOffsetColon)]; TOO_LONG);
check!("+12 34", [fix!(TimezoneOffsetColon)]; offset: 45_240);
check!("+12: 34", [fix!(TimezoneOffsetColon)]; offset: 45_240);
check!("+12 :34", [fix!(TimezoneOffsetColon)]; offset: 45_240);
check!("+12 : 34", [fix!(TimezoneOffsetColon)]; offset: 45_240);
check!("+12 34", [fix!(TimezoneOffsetColon)]; INVALID);
check!("+12: 34", [fix!(TimezoneOffsetColon)]; INVALID);
check!("+12 :34", [fix!(TimezoneOffsetColon)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetColon)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetColon)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetColon)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetColon)]; INVALID);
Expand Down Expand Up @@ -1119,18 +1119,18 @@ fn test_parse() {
check!("+12::34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12:3456", [fix!(TimezoneOffsetZ)]; TOO_LONG);
check!("+1234:56", [fix!(TimezoneOffsetZ)]; TOO_LONG);
check!("+12 34", [fix!(TimezoneOffsetZ)]; offset: 45_240);
check!("+12 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12: 34", [fix!(TimezoneOffsetZ)]; offset: 45_240);
check!("+12 :34", [fix!(TimezoneOffsetZ)]; offset: 45_240);
check!("+12 : 34", [fix!(TimezoneOffsetZ)]; offset: 45_240);
check!("+12: 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12 :34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12 : 34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("12:34 ", [fix!(TimezoneOffsetZ)]; INVALID);
check!(" 12:34", [fix!(TimezoneOffsetZ)]; INVALID);
check!("+12:34 ", [fix!(TimezoneOffsetZ)]; TOO_LONG);
check!("+12 34 ", [fix!(TimezoneOffsetZ)]; TOO_LONG);
check!("+12 34 ", [fix!(TimezoneOffsetZ)]; INVALID);
check!(" +12:34", [fix!(TimezoneOffsetZ)]; offset: 45_240);
check!("+12345", [fix!(TimezoneOffsetZ), num!(Day)]; offset: 45_240, day: 5);
check!("+12:345", [fix!(TimezoneOffsetZ), num!(Day)]; offset: 45_240, day: 5);
Expand Down Expand Up @@ -1202,11 +1202,11 @@ fn test_parse() {
check!("+12:34:56:", [internal_fix!(TimezoneOffsetPermissive)]; TOO_LONG);
check!("+12:34:56:7", [internal_fix!(TimezoneOffsetPermissive)]; TOO_LONG);
check!("+12:34:56:78", [internal_fix!(TimezoneOffsetPermissive)]; TOO_LONG);
check!("+12 34", [internal_fix!(TimezoneOffsetPermissive)]; offset: 45_240);
check!("+12 34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12 34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12 :34", [internal_fix!(TimezoneOffsetPermissive)]; offset: 45_240);
check!("+12: 34", [internal_fix!(TimezoneOffsetPermissive)]; offset: 45_240);
check!("+12 : 34", [internal_fix!(TimezoneOffsetPermissive)]; offset: 45_240);
check!("+12 :34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12: 34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12 : 34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12 :34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12: 34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
check!("+12 : 34", [internal_fix!(TimezoneOffsetPermissive)]; INVALID);
Expand Down