fix(event_handler): expanding safe URI characters to include +$& (aws-powertools#3026)

nejcskofic · web-flow · commit e51f6fff25f5 · 2023-08-29T19:54:14.000+01:00
diff --git a/aws_lambda_powertools/event_handler/api_gateway.py b/aws_lambda_powertools/event_handler/api_gateway.py
@@ -41,7 +41,7 @@
 logger = logging.getLogger(__name__)
 
 _DYNAMIC_ROUTE_PATTERN = r"(<\w+>)"
-_SAFE_URI = "-._~()'!*:@,;="  # https://www.ietf.org/rfc/rfc3986.txt
+_SAFE_URI = "-._~()'!*:@,;=+&$"  # https://www.ietf.org/rfc/rfc3986.txt
 # API GW/ALB decode non-safe URI chars; we must support them too
 _UNSAFE_URI = r"%<> \[\]{}|^"
 _NAMED_GROUP_BOUNDARY_PATTERN = rf"(?P\1[{_SAFE_URI}{_UNSAFE_URI}\\w]+)"
diff --git a/tests/functional/event_handler/test_api_gateway.py b/tests/functional/event_handler/test_api_gateway.py
@@ -989,7 +989,7 @@ def get_network_account(account_id: str, network_id: str):
     [
         pytest.param(123456789, id="num"),
         pytest.param("user@example.com", id="email"),
-        pytest.param("-._~'!*:@,;()=", id="safe-rfc3986"),
+        pytest.param("-._~'!*:@,;()=+&$", id="safe-rfc3986"),
         pytest.param("%<>[]{}|^", id="unsafe-rfc3986"),
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -989,7 +989,7 @@ def get_network_account(account_id: str, network_id: str):`
`989`	`989`	`[`
`990`	`990`	`pytest.param(123456789, id="num"),`
`991`	`991`	`pytest.param("[email protected]", id="email"),`
`992`		`- pytest.param("-._~'!*:@,;()=", id="safe-rfc3986"),`
	`992`	`+ pytest.param("-._~'!*:@,;()=+&$", id="safe-rfc3986"),`
`993`	`993`	`pytest.param("%<>[]{}\|^", id="unsafe-rfc3986"),`
`994`	`994`	`],`
`995`	`995`	`)`