From 5eaef08e52fbb46e1659b46435172d8e52b8b090 Mon Sep 17 00:00:00 2001
From: Aleksandr Mashchenko <amashchenko@apache.org>
Date: Thu, 14 Jan 2016 20:01:57 +0200
Subject: [PATCH] WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with
 DMI

---
 .../apache/struts2/rest/RestActionMapper.java | 15 ++++++++--
 .../struts2/rest/RestActionMapperTest.java    | 29 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
index 816843ad1..d25b725ea 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
@@ -308,9 +308,20 @@ public class RestActionMapper extends DefaultActionMapper {
     private void handleDynamicMethodInvocation(ActionMapping mapping, String name) {
         int exclamation = name.lastIndexOf("!");
         if (exclamation != -1) {
-            mapping.setName(name.substring(0, exclamation));
+            String actionName = name.substring(0, exclamation);
+            String actionMethod = name.substring(exclamation + 1);
+
+            // WW-4585
+            // add any ; appendix to name, it will be handled later in getMapping method
+            int scPos = actionMethod.indexOf(';');
+            if (scPos != -1) {
+                actionName = actionName + actionMethod.substring(scPos);
+                actionMethod = actionMethod.substring(0, scPos);
+            }
+
+            mapping.setName(actionName);
             if (allowDynamicMethodCalls) {
-                mapping.setMethod(name.substring(exclamation + 1));
+                mapping.setMethod(actionMethod);
             } else {
                 mapping.setMethod(null);
             }
diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
index 8d39cc19a..9903265c1 100644
--- a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
+++ b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
@@ -179,6 +179,35 @@ public class RestActionMapperTest extends TestCase {
         assertEquals("show", mapping.getMethod());
     }
 
+    public void testGetJsessionIdSemicolonMappingWithMethod() throws Exception {
+        req.setRequestURI("/myapp/animals/dog/fido!update;jsessionid=29fefpv23do1g");
+        req.setServletPath("/animals/dog/fido");
+        req.setMethod("GET");
+        
+        ActionMapping mapping = mapper.getMapping(req, configManager);
+
+        assertEquals("/animals", mapping.getNamespace());
+        assertEquals("dog", mapping.getName());
+        assertEquals("fido", ((String[]) mapping.getParams().get("id"))[0]);
+        assertEquals("show", mapping.getMethod());
+    }
+
+    public void testGetJsessionIdSemicolonMappingWithMethodAllowDMI() throws Exception {
+        req.setRequestURI("/myapp/animals/dog/fido!update;jsessionid=29fefpv23do1g");
+        req.setServletPath("/animals/dog/fido");
+        req.setMethod("GET");
+        
+        // allow DMI
+        mapper.setAllowDynamicMethodCalls("true");
+        
+        ActionMapping mapping = mapper.getMapping(req, configManager);
+
+        assertEquals("/animals", mapping.getNamespace());
+        assertEquals("dog", mapping.getName());
+        assertEquals("fido", ((String[]) mapping.getParams().get("id"))[0]);
+        assertEquals("update", mapping.getMethod());
+    }
+
     public void testParseNameAndNamespace() {
         tryUri("/foo/23", "", "foo/23");
         tryUri("/foo/", "", "foo/");