Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add allowed methods to handleUnknownAction #99

Merged
merged 2 commits into from
Jun 12, 2016
Merged

add allowed methods to handleUnknownAction #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d92fd0
add allowed methods to ActionBuilder
justinjmiller Jun 9, 2016
dd3b80f
add GlobalAllowedMethods getter to PackageConfig and modified getActi…
justinjmiller Jun 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,13 @@ public List<ExceptionMappingConfig> getGlobalExceptionMappingConfigs() {
return globalExceptionMappingConfigs;
}

/**
* gets the GlobalAllowedMethods local to this package
*
* @return a Set of method names allowed to be executed if strict method invocation is enabled
*/
public Set<String> getGlobalAllowedMethods() { return globalAllowedMethods; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this return unmodifiable collections?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I will do it after merge


public boolean isStrictMethodInvocation() {
return strictMethodInvocation;
}
Expand Down
7 changes: 5 additions & 2 deletions plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public ConventionUnknownHandler(Configuration configuration, ObjectFactory objec

this.redirectToSlash = Boolean.parseBoolean(redirectToSlash);

allowedMethods = TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse");
allowedMethods = TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse,index");
}

public ActionConfig handleUnknownAction(String namespace, String actionName)
Expand Down Expand Up @@ -219,7 +219,10 @@ protected ActionConfig buildActionConfig(String path, ResultTypeConfig resultTyp
results.put(Action.SUCCESS, config);

return new ActionConfig.Builder(defaultParentPackageName, "execute", ActionSupport.class.getName()).
addInterceptors(interceptors).addResultConfigs(results).build();
addInterceptors(interceptors).
addResultConfigs(results).
addAllowedMethod(pkg.getGlobalAllowedMethods()).
build();
}

private Result scanResultsByExtension(String ns, String actionName, String pathPrefix,
Expand Down