Repository: struts Updated Branches: refs/heads/master ee83d4a6d -> e0003f047 refs/heads/support-2-3 7c4bb7e7b -> ff4cdd967
WW-4585 Struts2 Rest plugin doesn't handle JSESSIONID with DMI Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e0003f04 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e0003f04 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e0003f04 Branch: refs/heads/master Commit: e0003f0471f98d5986844cd799555618aae88fce Parents: ee83d4a Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Thu Jan 14 20:01:57 2016 +0200 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Thu Jan 14 20:01:57 2016 +0200 ---------------------------------------------------------------------- .../apache/struts2/rest/RestActionMapper.java | 15 ++++++++-- .../struts2/rest/RestActionMapperTest.java | 29 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e0003f04/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java ---------------------------------------------------------------------- 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 816843a..d25b725 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); } http://git-wip-us.apache.org/repos/asf/struts/blob/e0003f04/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java ---------------------------------------------------------------------- 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 8d39cc1..9903265 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/");
