Skip to content

fix: reject invalid trailing characters and unclosed UTC parens in TzinfoParser #1298

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
gaoflow wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −5
Open

fix: reject invalid trailing characters and unclosed UTC parens in TzinfoParser #1298

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
4 changes: 2 additions & 2 deletions arrow/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ class TzinfoParser:
"""

_TZINFO_RE: ClassVar[Pattern[str]] = re.compile(
r"^(?:\(UTC)*([\+\-])?(\d{2})(?:\:?(\d{2}))?"
r"^(?:(\(UTC))*([\+\-])?(\d{2})(?:\:?(\d{2}))?(?(1)\)|$)"
)

@classmethod
Expand Down Expand Up @@ -917,7 +917,7 @@ def parse(cls, tzinfo_string: str) -> dt_tzinfo:
sign: Optional[str]
hours: str
minutes: Union[str, int, None]
sign, hours, minutes = iso_match.groups()
_, sign, hours, minutes = iso_match.groups()
seconds = int(hours) * 3600 + int(minutes or 0) * 60

if sign == "-":
Expand Down
15 changes: 12 additions & 3 deletions tests/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,9 +1323,8 @@ def test_parse_utc(self):
assert self.parser.parse("UTC") == timezone.utc

def test_parse_utc_withoffset(self):
assert self.parser.parse("(UTC+01:00") == timezone(timedelta(seconds=3600))
assert self.parser.parse("(UTC-01:00") == timezone(timedelta(seconds=-3600))
assert self.parser.parse("(UTC+01:00") == timezone(timedelta(seconds=3600))
assert self.parser.parse("(UTC+01:00)") == timezone(timedelta(seconds=3600))
assert self.parser.parse("(UTC-01:00)") == timezone(timedelta(seconds=-3600))
assert self.parser.parse(
"(UTC+01:00) Amsterdam, Berlin, Bern, Rom, Stockholm, Wien"
) == timezone(timedelta(seconds=3600))
Expand All @@ -1352,6 +1351,16 @@ def test_parse_str(self):
def test_parse_fails(self):
with pytest.raises(parser.ParserError):
self.parser.parse("fail")
# invalid trailing characters (issue #1294)
with pytest.raises(parser.ParserError):
self.parser.parse("+03:00.34")
with pytest.raises(parser.ParserError):
self.parser.parse("+03:00 ")
# unclosed UTC parenthetical
with pytest.raises(parser.ParserError):
self.parser.parse("(UTC+01:00")
with pytest.raises(parser.ParserError):
self.parser.parse("(UTC+01:00 Amsterdam, Berlin")


@pytest.mark.usefixtures("dt_parser")
Expand Down
Loading