Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

nuking the compatibility mode stuff that disabled the ! and method: support for the time being. we'll come up with a more secure option (probably annotation) soon. (tests pass now too)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@436991 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Lightbody
2006-08-25 22:30:36 +00:00
parent c04035d034
commit de6c2f944a
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/Form.java
+6 -3
View File
@@ -223,9 +223,12 @@ public class Form extends ClosingUIBean {
}
String actionMethod = "";
int endIdx = action.lastIndexOf("!");
actionMethod = action.substring(endIdx + 1, action.length());
action = action.substring(0, endIdx);
// todo: this logic is flawed - the only concept of ! should be in DefaultActionMapper
if (action.indexOf("!") != -1) {
int endIdx = action.lastIndexOf("!");
actionMethod = action.substring(endIdx + 1, action.length());
action = action.substring(0, endIdx);
}
Configuration config = Dispatcher.getInstance().getConfigurationManager().getConfiguration();
final ActionConfig actionConfig = config.getRuntimeConfiguration().getActionConfig(namespace, action);
core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+9 -8
View File
@@ -79,7 +79,8 @@ public class DefaultActionMapperTest extends StrutsTestCase {
ActionMapping mapping = mapper.getMapping(req, config);
assertEquals("/my/namespace", mapping.getNamespace());
assertEquals("actionName!add", mapping.getName());
assertEquals("actionName", mapping.getName());
assertEquals("add", mapping.getMethod());
}
public void testGetMappingWithSlashedName() throws Exception {
@@ -266,7 +267,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("/myNamespace");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myNamespace/myActionName.action", uri);
assertEquals("/myNamespace/myActionName!myMethod.action", uri);
}
public void testGetUriFromActionMapper2() throws Exception {
@@ -277,7 +278,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("/");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myActionName.action", uri);
assertEquals("/myActionName!myMethod.action", uri);
}
public void testGetUriFromActionMapper3() throws Exception {
@@ -288,7 +289,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myActionName.action", uri);
assertEquals("/myActionName!myMethod.action", uri);
}
@@ -321,7 +322,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("/myNamespace");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myNamespace/myActionName.action?test=bla", uri);
assertEquals("/myNamespace/myActionName!myMethod.action?test=bla", uri);
}
public void testGetUriFromActionMapper7() throws Exception {
@@ -332,7 +333,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("/");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myActionName.action?test=bla", uri);
assertEquals("/myActionName!myMethod.action?test=bla", uri);
}
public void testGetUriFromActionMapper8() throws Exception {
@@ -343,7 +344,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myActionName.action?test=bla", uri);
assertEquals("/myActionName!myMethod.action?test=bla", uri);
}
@@ -374,7 +375,7 @@ public class DefaultActionMapperTest extends StrutsTestCase {
actionMapping.setNamespace("/");
String uri = mapper.getUriFromActionMapping(actionMapping);
assertEquals("/myActionName.action.action", uri);
assertEquals("/myActionName.action", uri);
}
public void testGetUriFromActionMapper12() throws Exception {