You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2014/02/19 20:03:33 UTC
git commit: KNOX-266 fixed filter params and lookup.
Repository: incubator-knox
Updated Branches:
refs/heads/master a346a8efa -> 92cead13b
KNOX-266 fixed filter params and lookup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/92cead13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/92cead13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/92cead13
Branch: refs/heads/master
Commit: 92cead13be1cc2b48af98cc929c8982400ef5b02
Parents: a346a8e
Author: Larry McCay <lm...@hortonworks.com>
Authored: Wed Feb 19 14:03:10 2014 -0500
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Wed Feb 19 14:03:10 2014 -0500
----------------------------------------------------------------------
.../gateway/webappsec/deploy/WebAppSecContributor.java | 10 ++++++++++
.../gateway/webappsec/filter/CSRFPreventionFilter.java | 6 ++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/92cead13/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/deploy/WebAppSecContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/deploy/WebAppSecContributor.java b/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/deploy/WebAppSecContributor.java
index 6a54b9e..0c890c5 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/deploy/WebAppSecContributor.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/deploy/WebAppSecContributor.java
@@ -17,8 +17,10 @@
*/
package org.apache.hadoop.gateway.webappsec.deploy;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.hadoop.gateway.deploy.DeploymentContext;
import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributorBase;
@@ -58,6 +60,14 @@ public class WebAppSecContributor extends
if (webappsec != null && webappsec.isEnabled()) {
Map<String,String> map = provider.getParams();
String csrfEnabled = map.get(CSRF_ENABLED);
+ if (params == null) {
+ params = new ArrayList<FilterParamDescriptor>();
+ }
+ // blindly add all the provider params as filter init params
+ Map<String, String> providerParams = provider.getParams();
+ for(Entry<String, String> entry : providerParams.entrySet()) {
+ params.add( resource.createFilterParam().name( entry.getKey().toLowerCase() ).value( entry.getValue() ) );
+ }
if ( csrfEnabled != null && csrfEnabled.equals("true")) {
resource.addFilter().name( getName() + CSRF_SUFFIX ).role( getRole() ).impl( CSRF_FILTER_CLASSNAME ).params( params );
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/92cead13/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/filter/CSRFPreventionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/filter/CSRFPreventionFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/filter/CSRFPreventionFilter.java
index 6d40252..c84a9ce 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/filter/CSRFPreventionFilter.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/hadoop/gateway/webappsec/filter/CSRFPreventionFilter.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.gateway.webappsec.filter;
import java.io.IOException;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -32,8 +31,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class CSRFPreventionFilter implements Filter {
- private static final String CUSTOM_HEADER_PARAM = "csrf.customHeader";
- private static final String CUSTOM_METHODS_TO_IGNORE_PARAM = "csrf.methodsToIgnore";
+ private static final String CUSTOM_HEADER_PARAM = "csrf.customheader";
+ private static final String CUSTOM_METHODS_TO_IGNORE_PARAM = "csrf.methodstoignore";
private String headerName = "X-XSRF-Header";
private String mti = "GET,OPTIONS,HEAD";
private Set<String> methodsToIgnore = null;
@@ -53,7 +52,6 @@ public class CSRFPreventionFilter implements Filter {
for (int i = 0; i < methods.length; i++) {
methodsToIgnore.add(methods[i]);
}
-
}
@Override