mirror-github-bspeice/dtparse
1
0
Fork 0
mirror of https://github.com/bspeice/dtparse synced 2025-04-04 13:01:29 -04:00
Code Issues Releases Wiki Activity

Enhanced time zone check

Browse Source
This commit is contained in:
taichong 2024-07-17 15:59:52 +08:00
parent fbf77b442d
commit 7992536061
2 changed files with 63 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib.rs
View File

@ -851,13 +851,29 @@ impl Parser {
min_offset = Some(l[i + 1][2..4].parse::<i32>()?); min_offset = Some(l[i + 1][2..4].parse::<i32>()?);
} else if i + 2 < len_l && l[i + 2] == ":" { } else if i + 2 < len_l && l[i + 2] == ":" {
// -03:00 // -03:00
hour_offset = Some(l[i + 1].parse::<i32>()?); let hour_offset_len = l[i + 1].len();
// if timezone is wrong format like "-03:" just return a Err, should not panic. // -003:00 need err
min_offset = if i + 3 > l.len() - 1 { if hour_offset_len <= 2 {
return Err(ParseError::TimezoneUnsupported); let range_len = min(hour_offset_len, 2);
hour_offset = Some(l[i + 1][..range_len].parse::<i32>()?);
} else { } else {
Some(l[i + 3].parse::<i32>()?) return Err(ParseError::TimezoneUnsupported);
}; }
// if timezone is wrong format like "-03:" just return a Err, should not panic.
if i + 3 > l.len() - 1 {
return Err(ParseError::TimezoneUnsupported);
}
let min_offset_len = l[i + 3].len();
// -09:003 need err
if min_offset_len <= 2 {
let range_len = min(min_offset_len, 2);
min_offset = Some(l[i + 3][..range_len].parse::<i32>()?);
} else {
return Err(ParseError::TimezoneUnsupported);
}
i += 2; i += 2;
} else if timezone_len <= 2 { } else if timezone_len <= 2 {
// -[0]3 // -[0]3
@ -866,6 +882,11 @@ impl Parser {
min_offset = Some(0); min_offset = Some(0);
} }
// like +09123
if hour_offset.is_none() && min_offset.is_none() {
return Err(ParseError::TimezoneUnsupported);
}
res.tzoffset = res.tzoffset =
Some(signal * (hour_offset.unwrap() * 3600 + min_offset.unwrap() * 60)); Some(signal * (hour_offset.unwrap() * 3600 + min_offset.unwrap() * 60));

37
src/tests/fuzzing.rs
View File

@ -115,7 +115,42 @@ fn github_46() {
parse("2000-01-01 12:00:00+00:"), parse("2000-01-01 12:00:00+00:"),
Err(ParseError::TimezoneUnsupported) Err(ParseError::TimezoneUnsupported)
); );
let parse_result = parse("2000-01-01 12:00:00+0811"); assert_eq!(
parse("2000-01-01 12:00:00+09123"),
Err(ParseError::TimezoneUnsupported)
);
assert_eq!(
parse("2000-01-01 13:00:00+00:003"),
Err(ParseError::TimezoneUnsupported)
);
assert_eq!(
parse("2000-01-01 13:00:00+009:03"),
Err(ParseError::TimezoneUnsupported)
);
assert_eq!(
parse("2000-01-01 13:00:00+xx:03"),
Err(ParseError::InvalidNumeric(
"invalid digit found in string".to_owned()
))
);
assert_eq!(
parse("2000-01-01 13:00:00+00:yz"),
Err(ParseError::InvalidNumeric(
"invalid digit found in string".to_owned()
))
);
let mut parse_result = parse("2000-01-01 13:00:00+00:03");
match parse_result {
Ok((dt, offset)) => {
assert_eq!(format!("{:?}", dt), "2000-01-01T13:00:00".to_string());
assert_eq!(format!("{:?}", offset), "Some(+00:03)".to_string());
}
Err(_) => {
panic!();
}
};
parse_result = parse("2000-01-01 12:00:00+0811");
match parse_result { match parse_result {
Ok((dt, offset)) => { Ok((dt, offset)) => {
assert_eq!(format!("{:?}", dt), "2000-01-01T12:00:00".to_string()); assert_eq!(format!("{:?}", dt), "2000-01-01T12:00:00".to_string());