Merge branch '7.1.x' into 7.0.x-gormservice-dev-racecondition

Author: codeconsole

grails-doc/src/en/guide/upgrading/upgrading60x.adoc

@@ -754,3 +754,109 @@ grails:
 * **8.0**: `SimpleEnumMarshaller` will become the default
 
 The legacy `org.grails.web.converters.marshaller.json.EnumMarshaller` and `org.grails.web.converters.marshaller.xml.EnumMarshaller` classes are marked as `@Deprecated(forRemoval = true, since = "7.0.2")` and will be removed in Grails 8.0.
+
+===== 12.27 Greedy Extension Parameter Matching in URL Mappings
+
+Grails 7.1 introduces a new greedy extension parameter marker (`+`) for URL mappings that provides more intuitive handling of file extensions in URLs with multiple dots.
+
+====== The Problem with Default Behavior
+
+By default, Grails URL mappings with optional extensions split at the **first** dot in the path:
+
+[source,groovy]
+----
+"/$id(.$format)?"(controller: 'user', action: 'profile')
+----
+
+When matching the URL `/test.test.json`:
+- `id` = `test` (stops at first dot)
+- `format` = `test.json` (everything after first dot)
+
+This can be problematic when IDs legitimately contain dots, such as file names, qualified class names, or version numbers.
+
+====== New Greedy Matching Behavior
+
+The new `+` marker enables **greedy** matching, which splits at the **last** dot instead:
+
+[source,groovy]
+----
+"/$id+(.$format)?"(controller: 'user', action: 'profile')
+----
+
+Now the same URL `/test.test.json` matches as:
+- `id` = `test.test` (everything up to last dot)
+- `format` = `json` (extension after last dot)
+
+====== Syntax
+
+The `+` marker is added after the variable name and before the optional marker:
+
+**Required parameter with greedy extension:**
+[source,groovy]
+----
+"/$id+(.$format)?"(controller: 'file', action: 'download')
+----
+
+**Optional parameter with greedy extension:**
+[source,groovy]
+----
+"/$id+?(.$format)?"(controller: 'resource', action: 'show')
+----
+
+====== Use Cases
+
+Greedy extension matching is particularly useful for:
+
+1. **File downloads with complex names:**
++
+[source,groovy]
+----
+"/files/$filename+(.$format)?"(controller: 'file', action: 'download')
+----
++
+Matches `/files/document.final.v2.pdf` → `filename=document.final.v2`, `format=pdf`
+
+2. **Versioned resources:**
++
+[source,groovy]
+----
+"/api/$resource+(.$format)?"(controller: 'api', action: 'show')
+----
++
+Matches `/api/user.service.v1.json` → `resource=user.service.v1`, `format=json`
+
+3. **Qualified class names:**
++
+[source,groovy]
+----
+"/docs/$className+(.$format)?"(controller: 'documentation', action: 'show')
+----
++
+Matches `/docs/com.example.MyClass.html` → `className=com.example.MyClass`, `format=html`
+
+====== Behavior Details
+
+- **With dots:** The greedy marker splits at the **last** dot, treating everything before as the parameter value and everything after as the extension
+- **Without dots:** URLs without any dots match entirely as the parameter with no format
+- **Extension optional:** When the extension is marked optional `(.$format)?`, URLs work both with and without extensions
+
+**Examples:**
+
+[source,groovy]
+----
+"/$id+(.$format)?"(controller: 'resource', action: 'show')
+
+// URL Matches:
+/test.test.json    → id='test.test', format='json'
+/test.json         → id='test', format='json'
+/simpletest        → id='simpletest', format=null
+/foo.bar.baz.xml   → id='foo.bar.baz', format='xml'
+----
+
+====== Backward Compatibility
+
+The `+` marker is opt-in and fully backward compatible:
+
+- Existing URL mappings without the `+` marker continue to work as before (splitting at the first dot)
+- No changes are required to existing applications
+- The feature can be adopted incrementally on a per-mapping basis

grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingData.java

@@ -70,4 +70,9 @@ public interface UrlMappingData {
      * @return Whether the pattern has an optional extension
      */
     boolean hasOptionalExtension();
+
+    /**
+     * @return Whether the parameter before the optional extension should use greedy matching (last-dot split)
+     */
+    boolean hasGreedyExtensionParam();
 }

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingData.java

@@ -46,6 +46,7 @@ public class DefaultUrlMappingData implements UrlMappingData {
 
     private List<Boolean> optionalTokens = new ArrayList<>();
     private boolean hasOptionalExtension;
+    private boolean hasGreedyExtensionParam;
 
     public DefaultUrlMappingData(String urlPattern) {
         Assert.hasLength(urlPattern, "Argument [urlPattern] cannot be null or blank");
@@ -65,6 +66,11 @@ public boolean hasOptionalExtension() {
         return hasOptionalExtension;
     }
 
+    @Override
+    public boolean hasGreedyExtensionParam() {
+        return hasGreedyExtensionParam;
+    }
+
     private String[] tokenizeUrlPattern(String urlPattern) {
         // remove starting / and split
         return urlPattern.substring(1).split(SLASH);
@@ -93,7 +99,23 @@ private void parseUrls(List<String> urls, String[] tokens, List<Boolean> optiona
             if (hasOptionalExtension) {
                 int i = lastToken.indexOf(optionalExtensionPattern);
                 optionalExtension = lastToken.substring(i, lastToken.length());
-                tokens[tokens.length - 1] = lastToken.substring(0, i);
+                String beforeExtension = lastToken.substring(0, i);
+
+                // Check if the parameter before the extension ends with + (greedy marker)
+                // Can be either (*)+ for required greedy or (*)+? for optional greedy
+                if (beforeExtension.endsWith("+") || beforeExtension.endsWith("+?")) {
+                    hasGreedyExtensionParam = true;
+                    // Remove the + (keep ? if it follows)
+                    if (beforeExtension.endsWith("+?")) {
+                        // (*)+? -> (*)?  (optional greedy)
+                        beforeExtension = beforeExtension.substring(0, beforeExtension.length() - 2) + "?";
+                    } else {
+                        // (*)+ -> (*)  (required greedy)
+                        beforeExtension = beforeExtension.substring(0, beforeExtension.length() - 1);
+                    }
+                }
+
+                tokens[tokens.length - 1] = beforeExtension;
             }
 
         }

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/RegexUrlMapping.java

@@ -245,6 +245,15 @@ protected Pattern convertToRegex(String url) {
                 // happen any time a URL mapping ends with a pattern like
                 // /$someVariable(.$someExtension)
                 pattern += "/([^/]+)\\.([^/.]+)?";
+            } else if (urlData.hasGreedyExtensionParam() && urlData.hasOptionalExtension()) {
+                // Handle greedy extension param (+ marker): match everything up to the last dot
+                // The key is to make the entire dot+extension group optional using (?: )?
+                // For /(*)+(\.(*))?  we want regex: /(.+?)(?:\.([^/.]+))?  (required, greedy)
+                // For /(*)?+(\.(*))?  we want regex: /(.+?)?(?:\.([^/.]+))? (optional, greedy)
+                String processed = urlEnd
+                        .replace("/(*)?(\\.(*))?", "/(.+?)?(?:\\.([^/.]+))?")   // Optional greedy: (*)?+
+                        .replace("/(*)(\\.(*))?", "/(.+?)(?:\\.([^/.]+))?");    // Required greedy: (*)+
+                pattern += processed;
             } else {
                 pattern += urlEnd
                         .replace("(\\.(*))", "(\\.[^/]+)?")

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeMappingData.java

@@ -61,6 +61,11 @@ public boolean hasOptionalExtension() {
         return false;
     }
 
+    @Override
+    public boolean hasGreedyExtensionParam() {
+        return false;
+    }
+
     public int getResponseCode() {
         return responseCode;
     }