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

Fix ReDoS (GHSL-2024-323) #5210

Closed
wants to merge 1 commit into from
Closed

Fix ReDoS (GHSL-2024-323) #5210

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 snapcraft/models/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ def _validate_bus_name(cls, name):
)
@classmethod
def _validate_time(cls, timeval):
if not re.match(r"^[0-9]+(ns|us|ms|s|m)*$", timeval):
if not re.match(r"^[0-9]+(ns|us|s|m)*$", timeval):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that these are timeout strings that get passed unaffected to snapd and parsed using golang's time.ParseDuration, I believe a more correct version of this regex would be:

Suggested change
if not re.match(r"^[0-9]+(ns|us|s|m)*$", timeval):
if not re.match(r"^([0-9]+(ns|us|ms|s|m)){1,5}$" timeval):

raise ValueError(f"{timeval!r} is not a valid time value")

return timeval
Expand Down
Loading