Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10703. HttpServer2 creates multiple authentication filters. Contributed by Benoy Antony.

This commit is contained in:
Haohui Mai 2015-03-18 22:31:59 -07:00
parent bf6295bed8
commit 19b298f612
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -1121,6 +1121,9 @@ Release 2.7.0 - UNRELEASED
ZKDelegationTokenSecretManager go down when old token cannot be deleted. ZKDelegationTokenSecretManager go down when old token cannot be deleted.
(Arun Suresh via atm) (Arun Suresh via atm)
HADOOP-10703. HttpServer2 creates multiple authentication filters.
(Benoy Antony via wheat9)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

43
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
View File

@ -594,15 +594,18 @@ public final class HttpServer2 implements FilterContainer {
public void addFilter(String name, String classname, public void addFilter(String name, String classname,
Map<String, String> parameters) { Map<String, String> parameters) {
FilterHolder filterHolder = getFilterHolder(name, classname, parameters);
final String[] USER_FACING_URLS = { "*.html", "*.jsp" }; final String[] USER_FACING_URLS = { "*.html", "*.jsp" };
defineFilter(webAppContext, name, classname, parameters, USER_FACING_URLS); FilterMapping fmap = getFilterMapping(name, USER_FACING_URLS);
defineFilter(webAppContext, filterHolder, fmap);
LOG.info( LOG.info(
"Added filter " + name + " (class=" + classname + ") to context " + webAppContext.getDisplayName()); "Added filter " + name + " (class=" + classname + ") to context " + webAppContext.getDisplayName());
final String[] ALL_URLS = { "/*" }; final String[] ALL_URLS = { "/*" };
fmap = getFilterMapping(name, ALL_URLS);
for (Map.Entry<Context, Boolean> e : defaultContexts.entrySet()) { for (Map.Entry<Context, Boolean> e : defaultContexts.entrySet()) {
if (e.getValue()) { if (e.getValue()) {
Context ctx = e.getKey(); Context ctx = e.getKey();
defineFilter(ctx, name, classname, parameters, ALL_URLS); defineFilter(ctx, filterHolder, fmap);
LOG.info("Added filter " + name + " (class=" + classname LOG.info("Added filter " + name + " (class=" + classname
+ ") to context " + ctx.getDisplayName()); + ") to context " + ctx.getDisplayName());
} }
@ -614,9 +617,11 @@ public final class HttpServer2 implements FilterContainer {
public void addGlobalFilter(String name, String classname, public void addGlobalFilter(String name, String classname,
Map<String, String> parameters) { Map<String, String> parameters) {
final String[] ALL_URLS = { "/*" }; final String[] ALL_URLS = { "/*" };
defineFilter(webAppContext, name, classname, parameters, ALL_URLS); FilterHolder filterHolder = getFilterHolder(name, classname, parameters);
FilterMapping fmap = getFilterMapping(name, ALL_URLS);
defineFilter(webAppContext, filterHolder, fmap);
for (Context ctx : defaultContexts.keySet()) { for (Context ctx : defaultContexts.keySet()) {
defineFilter(ctx, name, classname, parameters, ALL_URLS); defineFilter(ctx, filterHolder, fmap);
} }
LOG.info("Added global filter '" + name + "' (class=" + classname + ")"); LOG.info("Added global filter '" + name + "' (class=" + classname + ")");
} }
@ -626,17 +631,35 @@ public final class HttpServer2 implements FilterContainer {
*/ */
public static void defineFilter(Context ctx, String name, public static void defineFilter(Context ctx, String name,
String classname, Map<String,String> parameters, String[] urls) { String classname, Map<String,String> parameters, String[] urls) {
FilterHolder filterHolder = getFilterHolder(name, classname, parameters);
FilterMapping fmap = getFilterMapping(name, urls);
defineFilter(ctx, filterHolder, fmap);
}
FilterHolder holder = new FilterHolder(); /**
holder.setName(name); * Define a filter for a context and set up default url mappings.
holder.setClassName(classname); */
holder.setInitParameters(parameters); private static void defineFilter(Context ctx, FilterHolder holder,
FilterMapping fmap) {
ServletHandler handler = ctx.getServletHandler();
handler.addFilter(holder, fmap);
}
private static FilterMapping getFilterMapping(String name, String[] urls) {
FilterMapping fmap = new FilterMapping(); FilterMapping fmap = new FilterMapping();
fmap.setPathSpecs(urls); fmap.setPathSpecs(urls);
fmap.setDispatches(Handler.ALL); fmap.setDispatches(Handler.ALL);
fmap.setFilterName(name); fmap.setFilterName(name);
ServletHandler handler = ctx.getServletHandler(); return fmap;
handler.addFilter(holder, fmap); }
private static FilterHolder getFilterHolder(String name, String classname,
Map<String, String> parameters) {
FilterHolder holder = new FilterHolder();
holder.setName(name);
holder.setClassName(classname);
holder.setInitParameters(parameters);
return holder;
} }
/** /**