struts git commit: Disallows dot in action name

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/support-2-3 9f2cae2f1 -> 54e8bf1f7


Disallows dot in action name


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54e8bf1f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54e8bf1f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54e8bf1f

Branch: refs/heads/support-2-3
Commit: 54e8bf1f7537ce0391884fbd06525219f069f120
Parents: 9f2cae2
Author: Lukasz Lenart 
Authored: Mon May 23 16:02:25 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon May 23 16:02:25 2016 +0200

--
 .../struts2/dispatcher/mapper/DefaultActionMapper.java  |  2 +-
 .../dispatcher/mapper/DefaultActionMapperTest.java  | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/54e8bf1f/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index d696d13..cacc82c 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
 protected boolean allowSlashesInActionNames = false;
 protected boolean alwaysSelectFullNamespace = false;
 protected PrefixTrie prefixTrie = null;
-protected Pattern allowedActionNames = 
Pattern.compile("[a-zA-Z0-9._!/\\-]*");
+protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]+((.htm[l]?)|(.action))?$");
 private boolean allowActionPrefix = false;
 private boolean allowActionCrossNamespaceAccess = false;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/54e8bf1f/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
 
b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
index 270b80d..0f1baef 100644
--- 
a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+++ 
b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
@@ -163,8 +163,8 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 
 public void testGetMappingWithNamespaceSlash() throws Exception {
 
-req.setupGetRequestURI("/my.hh/abc.action");
-req.setupGetServletPath("/my.hh/abc.action");
+req.setupGetRequestURI("/my-hh/abc.action");
+req.setupGetServletPath("/my-hh/abc.action");
 req.setupGetAttribute(null);
 req.addExpectedGetAttributeName("javax.servlet.include.servlet_path");
 
@@ -181,7 +181,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 mapping = mapper.getMapping(req, configManager);
 
 assertEquals("", mapping.getNamespace());
-assertEquals("my.hh/abc", mapping.getName());
+assertEquals("my-hh/abc", mapping.getName());
 }
 
 public void testGetMappingWithUnknownNamespace() throws Exception {
@@ -855,7 +855,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 expected = t;
 }
 assertTrue(expected instanceof StrutsException);
-assertEquals("Action [${action}] does not match allowed action names 
pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
+assertEquals("Action [${action}] does not match allowed action names 
pattern [" + mapper.allowedActionNames.pattern() + "]!", expected.getMessage());
 
 actionName = "${${%{action}}}";
 try {
@@ -865,7 +865,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 expected = t;
 }
 assertTrue(expected instanceof StrutsException);
-assertEquals("Action [${${%{action}}}] does not match allowed action 
names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
+assertEquals("Action [${${%{action}}}] does not match allowed action 
names pattern [" + mapper.allowedActionNames.pattern() + "]!", 
expected.getMessage());
 
 actionName = "${#foo='action',#foo}";
 try {
@@ -875,7 +875,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 expected = t;
 }
 assertTrue(expected instanceof StrutsException);
-assertEquals("Action [${#foo='action',#foo}] does not match allowed 
action names pattern [[a-zA

struts git commit: Disallows dot in action name

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master 880c1d54a -> 9b34a2819


Disallows dot in action name


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9b34a281
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9b34a281
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9b34a281

Branch: refs/heads/master
Commit: 9b34a28190b71f73c26564ce06139aa4e4861e18
Parents: 880c1d5
Author: Lukasz Lenart 
Authored: Mon May 23 16:02:25 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon May 23 16:03:09 2016 +0200

--
 .../struts2/dispatcher/mapper/DefaultActionMapper.java  |  2 +-
 .../dispatcher/mapper/DefaultActionMapperTest.java  | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/9b34a281/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index d0e89be..1396025 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
 protected boolean allowSlashesInActionNames = false;
 protected boolean alwaysSelectFullNamespace = false;
 protected PrefixTrie prefixTrie = null;
-protected Pattern allowedActionNames = 
Pattern.compile("[a-zA-Z0-9._!/\\-]*");
+protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]+((.htm[l]?)|(.action))?$");
 private boolean allowActionPrefix = false;
 private boolean allowActionCrossNamespaceAccess = false;
 

http://git-wip-us.apache.org/repos/asf/struts/blob/9b34a281/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
 
b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
index 69bb7de..b51f569 100644
--- 
a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+++ 
b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
@@ -163,8 +163,8 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 
 public void testGetMappingWithNamespaceSlash() throws Exception {
 
-req.setupGetRequestURI("/my.hh/abc.action");
-req.setupGetServletPath("/my.hh/abc.action");
+req.setupGetRequestURI("/my-hh/abc.action");
+req.setupGetServletPath("/my-hh/abc.action");
 req.setupGetAttribute(null);
 req.addExpectedGetAttributeName("javax.servlet.include.servlet_path");
 
@@ -181,7 +181,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 mapping = mapper.getMapping(req, configManager);
 
 assertEquals("", mapping.getNamespace());
-assertEquals("my.hh/abc", mapping.getName());
+assertEquals("my-hh/abc", mapping.getName());
 }
 
 public void testGetMappingWithUnknownNamespace() throws Exception {
@@ -855,7 +855,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 expected = t;
 }
 assertTrue(expected instanceof StrutsException);
-assertEquals("Action [${action}] does not match allowed action names 
pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
+assertEquals("Action [${action}] does not match allowed action names 
pattern [" + mapper.allowedActionNames.pattern() + "]!", expected.getMessage());
 
 actionName = "${${%{action}}}";
 try {
@@ -865,7 +865,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 expected = t;
 }
 assertTrue(expected instanceof StrutsException);
-assertEquals("Action [${${%{action}}}] does not match allowed action 
names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
+assertEquals("Action [${${%{action}}}] does not match allowed action 
names pattern [" + mapper.allowedActionNames.pattern() + "]!", 
expected.getMessage());
 
 actionName = "${#foo='action',#foo}";
 try {
@@ -875,7 +875,7 @@ public class DefaultActionMapperTest extends 
StrutsInternalTestCase {
 expected = t;
 }
 assertTrue(expected instanceof StrutsException);
-assertEquals("Action [${#foo='action',#foo}] does not match allowed 
action names pattern [[a-zA-Z0-9._!/\

[struts] Git Push Summary

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/struts-2-3-24-2 [deleted] 216e014ef

[struts] Git Push Summary

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/struts-2-3-28-1 [deleted] f8a7d4216

[struts] Git Push Summary

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/struts-2-3-20-2 [deleted] da2734877

struts git commit: Allows empty string as a action name

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/support-2-3 54e8bf1f7 -> 34025eafe


Allows empty string as a action name


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/34025eaf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/34025eaf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/34025eaf

Branch: refs/heads/support-2-3
Commit: 34025eafec80bdff6e5a0fac2ad223329246a595
Parents: 54e8bf1
Author: Lukasz Lenart 
Authored: Mon May 23 17:04:38 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon May 23 17:04:38 2016 +0200

--
 .../org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/34025eaf/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index cacc82c..529e033 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
 protected boolean allowSlashesInActionNames = false;
 protected boolean alwaysSelectFullNamespace = false;
 protected PrefixTrie prefixTrie = null;
-protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]+((.htm[l]?)|(.action))?$");
+protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$");
 private boolean allowActionPrefix = false;
 private boolean allowActionCrossNamespaceAccess = false;
 

struts git commit: Allows empty string as a action name

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master 9b34a2819 -> 095960b56


Allows empty string as a action name


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/095960b5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/095960b5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/095960b5

Branch: refs/heads/master
Commit: 095960b5691d33f127000794b3e79638cf384652
Parents: 9b34a28
Author: Lukasz Lenart 
Authored: Mon May 23 17:04:38 2016 +0200
Committer: Lukasz Lenart 
Committed: Mon May 23 17:05:53 2016 +0200

--
 .../org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/095960b5/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index 1396025..005f9f2 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
 protected boolean allowSlashesInActionNames = false;
 protected boolean alwaysSelectFullNamespace = false;
 protected PrefixTrie prefixTrie = null;
-protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]+((.htm[l]?)|(.action))?$");
+protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$");
 private boolean allowActionPrefix = false;
 private boolean allowActionCrossNamespaceAccess = false;