Skip to content

Fix client_registration URI regex not accepting full query string grammar #4563

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
May 30, 2025
Merged

Fix client_registration URI regex not accepting full query string grammar #4563

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
e64cd84
Fix client_registration URI regex not accepting full query string gra…
t3chguy May 13, 2025
2685133
Add tests
t3chguy May 28, 2025
6ecc150
delint
t3chguy May 28, 2025
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
4 changes: 2 additions & 2 deletions policies/client_registration/client_registration.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ allow if {

parse_uri(url) := obj if {
is_string(url)
url_regex := `^(?P<scheme>[a-z][a-z0-9+.-]*):(?://(?P<host>((?:(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])\.)*(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])|127.0.0.1|0.0.0.0|\[::1\])(?::(?P<port>[0-9]+))?))?(?P<path>/[A-Za-z0-9/.-]*)?(?P<query>\?[A-Za-z0-9/.-=]*)?$`
url_regex := `^(?P<scheme>[a-z][a-z0-9+.-]*):(?://(?P<host>((?:(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])\.)*(?:[a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])|127.0.0.1|0.0.0.0|\[::1\])(?::(?P<port>[0-9]+))?))?(?P<path>/[A-Za-z0-9/.-]*)?(?P<query>\?[-a-zA-Z0-9()@:%_+.~#?&/=]*)?$`
[matches] := regex.find_all_string_submatch_n(url_regex, url, 1)
obj := {"scheme": matches[1], "authority": matches[2], "host": matches[3], "port": matches[4], "path": matches[5]}
obj := {"scheme": matches[1], "authority": matches[2], "host": matches[3], "port": matches[4], "path": matches[5], "query": matches[6]}
}

secure_url(_) if {
Expand Down
17 changes: 17 additions & 0 deletions policies/client_registration/client_registration_test.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ test_web_redirect_uri if {
"redirect_uris": ["https://example.com/second/callback", "https://example.com/callback", "https://example.com/callback?query=value"],
}

client_registration.allow with input.client_metadata as {
"application_type": "web",
"client_uri": "http://localhost:8080",
"redirect_uris": ["http://localhost:8080/?no_universal_links=true"],
}
with client_registration.allow_insecure_uris as true

# HTTPS redirect_uri with non-standard port
client_registration.allow with input.client_metadata as {
"application_type": "web",
Expand Down Expand Up @@ -403,3 +410,13 @@ test_reverse_dns_match if {
not client_registration.reverse_dns_match("example.com", "org.example")
not client_registration.reverse_dns_match("test.com", "com.example")
}

test_parse_uri if {
client_uri_query := client_registration.parse_uri("https://example.com:8080/users?query=test")
client_uri_query.authority == "example.com:8080"
client_uri_query.host == "example.com"
client_uri_query.path == "/users"
client_uri_query.scheme == "https"
client_uri_query.port == "8080"
client_uri_query.query == "?query=test"
}
Loading