Skip to content

fix: reject repeated duration components in the Rust parser #1005

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

Open
vzer200 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: reject repeated duration components in the Rust parser #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 11 additions & 27 deletions rust/src/parsing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ impl<'a> Parser<'a> {
let mut duration: ParsedDuration = ParsedDuration::new();
let mut got_t: bool = false;
let mut last_had_fraction = false;
let mut last_unit = None;

loop {
match self.current {
Expand All @@ -609,6 +610,7 @@ impl<'a> Parser<'a> {
}

got_t = true;
last_unit = None;
}
_c => {
let (value, op_fraction) = self.parse_duration_number_frac()?;
Expand All @@ -620,18 +622,18 @@ impl<'a> Parser<'a> {
last_had_fraction = true;
}

let units = if got_t { "HMS" } else { "YMWD" };
let unit = units.find(self.current).ok_or_else(|| {
self.parse_error("Invalid duration time unit".to_string())
})?;
if last_unit.is_some_and(|last| unit <= last) {
return Err(self.parse_error("Duration units out of order".to_string()));
}
last_unit = Some(unit);

if got_t {
match self.current {
'H' => {
if duration.minutes != 0
|| duration.seconds != 0
|| duration.microseconds != 0
{
return Err(
self.parse_error("Duration units out of order".to_string())
);
}

duration.hours += value;

if let Some(fraction) = op_fraction {
Expand All @@ -650,12 +652,6 @@ impl<'a> Parser<'a> {
}
}
'M' => {
if duration.seconds != 0 || duration.microseconds != 0 {
return Err(
self.parse_error("Duration units out of order".to_string())
);
}

duration.minutes += value;

if let Some(fraction) = op_fraction {
Expand Down Expand Up @@ -693,12 +689,6 @@ impl<'a> Parser<'a> {
));
}

if duration.months != 0 || duration.days != 0 {
return Err(
self.parse_error("Duration units out of order".to_string())
);
}

duration.years = value;
}
'M' => {
Expand All @@ -709,12 +699,6 @@ impl<'a> Parser<'a> {
));
}

if duration.days != 0 {
return Err(
self.parse_error("Duration units out of order".to_string())
);
}

duration.months = value;
}
'W' => {
Expand Down
45 changes: 45 additions & 0 deletions tests/parsing/test_parsing_duration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,51 @@ def test_parse_duration_invalid_order():
parse("PT1S1H")


@pytest.mark.parametrize(
"text",
[
"P1Y2Y",
"P12M4M",
"P1W2W",
"P1D2D",
"PT1H2H",
"PT12M3M1M",
"PT1S2S",
"P0Y0Y",
"P0M0M",
"P0W0W",
"P0D0D",
"PT0H0H",
"PT0M0M",
"PT0S0S",
"P0M1Y",
"P0D1M",
"P0D1Y",
"PT0M1H",
"PT0S1M",
"PT0S1H",
],
)
def test_parse_duration_repeated_or_reordered_components(text: str) -> None:
with pytest.raises(ParserError):
parse(text)


@pytest.mark.parametrize("text", ["P0Y0M0DT0H0M0S", "P0W"])
def test_parse_duration_zero_components(text: str) -> None:
parsed = parse(text)
assert (
parsed.years,
parsed.months,
parsed.weeks,
parsed.remaining_days,
parsed.hours,
parsed.minutes,
parsed.remaining_seconds,
parsed.microseconds,
) == (0, 0, 0, 0, 0, 0, 0, 0)


def test_parse_duration_invalid():
with pytest.raises(ParserError):
parse("P1Dasdfasdf")
Expand Down