Skip to content

7.1.x url mapping greedy extension 3 #15522

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

Open
codeconsole wants to merge 3 commits into
base: 7.1.x
Choose a base branch
from
+15 −2
Open

7.1.x url mapping greedy extension 3 #15522

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
a5e0326
fix for UrlMapping greedy extension matching across path segments
codeconsole Mar 21, 2026
a7cb32e
Merge branch '7.1.x' into 7.1.x-url-mapping-greedy-extension-3
codeconsole Mar 21, 2026
e928a30
Merge branch '7.1.x' into 7.1.x-url-mapping-greedy-extension-3
jamesfredley Mar 21, 2026
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 grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/RegexUrlMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ protected Pattern convertToRegex(String url) {
// For /(*)?+(\.(*))? we want regex: /(.+?)?(?:\.([^/.]+))? (optional, greedy)
// Only apply greedy regex if this logical URL actually includes the greedy token
String processed = urlEnd
Copy link
Contributor

@jamesfredley jamesfredley Mar 21, 2026

Choose a reason for hiding this comment

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

Nit: these comments still reference the old regex (.+?). Now that the pattern is [^/]+?, the comments should be updated to match:

// For /(*)+(\.(*))?  we want regex: /([^/]+?)(?:\.([^/.]+))?  (required, greedy)
// For /(*)?+(\.(*))?  we want regex: /([^/]+?)?(?:\.([^/.]+))? (optional, greedy)

.replace("/(*)?(\\.(*))?", "/(.+?)?(?:\\.([^/.]+))?") // Optional greedy: (*)?+
.replace("/(*)(\\.(*))?", "/(.+?)(?:\\.([^/.]+))?"); // Required greedy: (*)+
.replace("/(*)?(\\.(*))?", "/([^/]+?)?(?:\\.([^/.]+))?") // Optional greedy: (*)?+
.replace("/(*)(\\.(*))?", "/([^/]+?)(?:\\.([^/.]+))?"); // Required greedy: (*)+
pattern += processed;
} else {
pattern += urlEnd
Expand Down
13 changes: 13 additions & 0 deletions ...url-mappings/src/test/groovy/grails/web/mapping/UrlMappingsWithGreedyExtensionSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,19 @@ class UrlMappingsWithGreedyExtensionSpec extends AbstractUrlMappingsSpec {
urlMappingsHolder.match('/file.name.csv').parameters.format == 'csv'
}

void "Test that greedy parameter does not match across path segments"() {
given: "A URL mapping with required greedy parameter"
def urlMappingsHolder = getUrlMappingsHolder {
"/$id+(.$format)?"(controller: "user", action: "profile")
}

when: "Matching a URL with a path separator"
def info = urlMappingsHolder.match('/9002/show')

then: "The greedy parameter should not match across path segments"
info == null
}

void "Test that UrlMappingData reports greedy extension correctly"() {
given: "A URL mapping with greedy parameter"
def urlMappingsHolder = getUrlMappingsHolder {
Expand Down
Loading