svn commit: r1228497 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
Author: jafl
Date: Fri Jan 6 23:19:32 2012
New Revision: 1228497
URL: http://svn.apache.org/viewvc?rev=1228497&view=rev
Log:
WW-3740 apply allowed-methods filter to wildcard actions
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java?rev=1228497&r1=1228496&r2=1228497&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
Fri Jan 6 23:19:32 2012
@@ -109,13 +109,17 @@ public class ActionConfigMatcher extends
*/
@Override public ActionConfig convert(String path, ActionConfig orig,
Map vars) {
-
-String className = convertParam(orig.getClassName(), vars);
+
String methodName = convertParam(orig.getMethodName(), vars);
+if (!orig.isAllowedMethod(methodName)) {
+return null;
+}
+
+String className = convertParam(orig.getClassName(), vars);
String pkgName = convertParam(orig.getPackageName(), vars);
-
+
Map params = replaceParameters(orig.getParams(), vars);
-
+
Map results = new
LinkedHashMap();
for (String name : orig.getResults().keySet()) {
ResultConfig result = orig.getResults().get(name);
@@ -125,7 +129,7 @@ public class ActionConfigMatcher extends
.build();
results.put(name, r);
}
-
+
List exs = new
ArrayList();
for (ExceptionMappingConfig ex : orig.getExceptionMappings()) {
String name = convertParam(ex.getName(), vars);
@@ -135,7 +139,7 @@ public class ActionConfigMatcher extends
ExceptionMappingConfig e = new
ExceptionMappingConfig.Builder(name, exClassName,
exResult).addParams(exParams).build();
exs.add(e);
}
-
+
return new ActionConfig.Builder(pkgName, orig.getName(), className)
.methodName(methodName)
.addParams(params)
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Release Guide edited by muellerc (04:33 PM) https://cwiki.apache.org/confluence/display/CAMEL/Release+Guide Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - Distributed OSGi Reference edited by sergey_beryozkin (07:45 AM) https://cwiki.apache.org/confluence/display/CXF/Distributed+OSGi+Reference Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - JAX-RS Maven Plugins created by sergey_beryozkin (06:08 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Maven+Plugins JAX-RS CORS created by sergey_beryozkin (05:47 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+CORS JAX-RS edited by sergey_beryozkin (05:39 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS JAXRS Services Configuration edited by sergey_beryozkin (05:38 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAXRS+Services+Configuration JAXRS Services Description edited by sergey_beryozkin (02:33 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAXRS+Services+Description Apache DeltaSpike (https://cwiki.apache.org/confluence/display/DeltaSpike) Pages - Temporary Documentation created by gpetracek (06:40 PM) https://cwiki.apache.org/confluence/display/DeltaSpike/Temporary+Documentation SE Feature Ranking edited by gpetracek (08:59 AM) https://cwiki.apache.org/confluence/display/DeltaSpike/SE+Feature+Ranking Apache MyFaces Extensions CDI (https://cwiki.apache.org/confluence/display/EXTCDI) Pages - External edited by gpetracek (02:28 PM) https://cwiki.apache.org/confluence/display/EXTCDI/External Intro edited by gpetracek (02:17 PM) https://cwiki.apache.org/confluence/display/EXTCDI/Intro Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - HiveDeveloperFAQ edited by jwills (06:30 PM) https://cwiki.apache.org/confluence/display/Hive/HiveDeveloperFAQ OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - Apache OFBiz User List edited by business...@gmail.com (04:43 AM) https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Logo Proposals edited by vea1083 (12:03 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/Logo+Proposals Comments https://cwiki.apache.org/confluence/display/OOOUSERS/Application+Branding (3) https://cwiki.apache.org/confluence/display/OOOUSERS/Application+Help (1) Apache Shiro (https://cwiki.apache.org/confluence/display/SHIRO) Pages - CAS edited by lhazlewood (01:39 PM) https://cwiki.apache.org/confluence/display/SHIRO/CAS Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY) Pages - Defining Tapestry IOC Services edited by demey.emman...@gmail.com (03:18 AM) https://cwiki.apache.org/confluence/display/TAPESTRY/Defining+Tapestry+IOC+Services Test Space (https://cwiki.apache.org/confluence/display/test) Pages - Index edited by thomasdelange (02:53 AM) https://cwiki.apache.org/confluence/display/test/Index Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET) Pages - Wicket 6.0 Roadmap created by mgrigorov (06:34 AM) https://cwiki.apache.org/confluence/display/WICKET/Wicket+6.0+Roadmap Websites based on Wicket edited by armh...@gmail.com (08:43 AM) https://cwiki.apache.org/confluence/display/WICKET/Websites+based+on+Wicket Migration to Wicket 6.0 edited by mgrigorov (06:38 AM) https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0 Wicket Ajax edited by mgrigorov (06:37 AM) https://cwiki.apache.org/confluence/display/WICKET/Wicket+Ajax Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
