Skip to content

Repository navigation

[Aikido] Fix date-prefix route normalization bypass in build_route_from_url #742

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

Closed
aikido-autofix wants to merge 1 commit into from
Closed

[Aikido] Fix date-prefix route normalization bypass in build_route_from_url #742

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 aikido_zen/helpers/build_route_from_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

ULID_REGEX = re.compile(r"^[0-9A-HJKMNP-TV-Z]{26}$", re.I)
NUMBER_REGEX = re.compile(r"^\d+$")
DATE_REGEX = re.compile(r"^\d{4}-\d{2}-\d{2}|\d{2}-\d{2}-\d{4}$")
DATE_REGEX = re.compile(r"^(?:\d{4}-\d{2}-\d{2}|\d{2}-\d{2}-\d{4})$")
EMAIL_REGEX = re.compile(
r"^[a-zA-Z0-9.!#$%&\'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
)
Expand Down
10 changes: 10 additions & 0 deletions aikido_zen/helpers/build_route_from_url_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ def test_replace_dates():
assert build_route_from_url("/posts/01-05-2023") == "/posts/:date"


def test_does_not_replace_date_with_suffix():
# Segments that start with a date but have additional characters should not be replaced
assert (
build_route_from_url("/internal/2024-01-01-export")
== "/internal/2024-01-01-export"
)
assert build_route_from_url("/api/2023-12-31-backup") == "/api/2023-12-31-backup"
assert build_route_from_url("/data/01-01-2024-report") == "/data/01-01-2024-report"


def test_matches_arrays():
assert build_route_from_url("/posts/3,000") == "/posts/:array(number)"
assert build_route_from_url("/posts/0,1,2,3,4") == "/posts/:array(number)"
Expand Down
Loading