Skip to content

fix(api_gateway): allow whitespace in routes' path parameter #1099

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

Merged
merged 3 commits into from
Apr 8, 2022
Merged

fix(api_gateway): allow whitespace in routes' path parameter #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9530c8
fix(parameters): allow whitespace in routes' path parmeter
sthuber90 Apr 8, 2022
45a7588
pull whitespace path param in own test
sthuber90 Apr 8, 2022
9208667
chore: ensure whitespace yields a successful ret
heitorlessa Apr 8, 2022
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 aws_lambda_powertools/event_handler/api_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
_DYNAMIC_ROUTE_PATTERN = r"(<\w+>)"
_SAFE_URI = "-._~()'!*:@,;" # https://www.ietf.org/rfc/rfc3986.txt
# API GW/ALB decode non-safe URI chars; we must support them too
_UNSAFE_URI = "%<>\[\]{}|^" # noqa: W605
_UNSAFE_URI = "%<> \[\]{}|^" # noqa: W605
_NAMED_GROUP_BOUNDARY_PATTERN = fr"(?P\1[{_SAFE_URI}{_UNSAFE_URI}\\w]+)"


Expand Down
36 changes: 36 additions & 0 deletions tests/functional/event_handler/test_api_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,42 @@ def get_network_account(account_id: str, network_id: str):
app.resolve(event, {})


def test_similar_dynamic_routes_with_whitespaces():
# GIVEN
app = ApiGatewayResolver()
event = deepcopy(LOAD_GW_EVENT)

# WHEN
# r'^/accounts/(?P<account_id>\\w+\\b)$' # noqa: E800
@app.get("/accounts/<account_id>")
def get_account(account_id: str):
assert account_id == "single account"

# r'^/accounts/(?P<account_id>\\w+\\b)/source_networks$' # noqa: E800
@app.get("/accounts/<account_id>/source_networks")
def get_account_networks(account_id: str):
assert account_id == "nested account"

# r'^/accounts/(?P<account_id>\\w+\\b)/source_networks/(?P<network_id>\\w+\\b)$' # noqa: E800
@app.get("/accounts/<account_id>/source_networks/<network_id>")
def get_network_account(account_id: str, network_id: str):
assert account_id == "nested account"
assert network_id == "network 123"

# THEN
event["resource"] = "/accounts/{account_id}"
event["path"] = "/accounts/single account"
assert app.resolve(event, {})["statusCode"] == 200

event["resource"] = "/accounts/{account_id}/source_networks"
event["path"] = "/accounts/nested account/source_networks"
assert app.resolve(event, {})["statusCode"] == 200

event["resource"] = "/accounts/{account_id}/source_networks/{network_id}"
event["path"] = "/accounts/nested account/source_networks/network 123"
assert app.resolve(event, {})["statusCode"] == 200


@pytest.mark.parametrize(
"req",
[
Expand Down