Skip to content

Fix convert_from_dapr_duration silently accepting an empty string #1221

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
magic-peach wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

Fix convert_from_dapr_duration silently accepting an empty string #1221

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
2 changes: 1 addition & 1 deletion dapr/serializers/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def convert_from_dapr_duration(duration: str) -> timedelta:
"""

matched = DAPR_DURATION_PARSER.match(duration)
if not matched or matched.lastindex == 0:
if not matched or matched.lastindex is None:
raise ValueError(f"Invalid Dapr Duration format: '{duration}'")

days = 0.0
Expand Down
10 changes: 10 additions & 0 deletions tests/serializers/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ def test_convert_invalid_duration(self):
"Invalid Dapr Duration format: '{}'".format('invalid'),
)

def test_convert_empty_duration_raises(self):
# An empty string matches the regex trivially (every group is optional), so
# matched.lastindex stays None instead of becoming a real group index.
with self.assertRaises(ValueError) as exeception_context:
convert_from_dapr_duration('')
self.assertEqual(
exeception_context.exception.args[0],
"Invalid Dapr Duration format: ''",
)

def test_convert_timedelta_to_dapr_duration(self):
duration = convert_to_dapr_duration(
timedelta(hours=4, minutes=15, seconds=40, milliseconds=123, microseconds=35)
Expand Down