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 2013/09/25 03:33:24 UTC
git commit: KNOX-149 - addressed config changes and default
processing mode
Updated Branches:
refs/heads/master 45b70a1a8 -> 5064bd305
KNOX-149 - addressed config changes and default processing mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/5064bd30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/5064bd30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/5064bd30
Branch: refs/heads/master
Commit: 5064bd3055dd86095bd36b2d55c99f9977d654f5
Parents: 45b70a1
Author: Larry McCay <lm...@hortonworks.com>
Authored: Tue Sep 24 21:31:20 2013 -0400
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Tue Sep 24 21:31:20 2013 -0400
----------------------------------------------------------------------
.../hadoop/gateway/filter/AclsAuthorizationFilter.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/5064bd30/gateway-provider-security-authz-acls/src/main/java/org/apache/hadoop/gateway/filter/AclsAuthorizationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/hadoop/gateway/filter/AclsAuthorizationFilter.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/hadoop/gateway/filter/AclsAuthorizationFilter.java
index ab22db7..a0fddee 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/hadoop/gateway/filter/AclsAuthorizationFilter.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/hadoop/gateway/filter/AclsAuthorizationFilter.java
@@ -54,12 +54,15 @@ public class AclsAuthorizationFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
resourceRole = getInitParameter(filterConfig, "resource.role");
log.initializingForResourceRole(resourceRole);
- aclProcessingMode = getInitParameter(filterConfig, resourceRole + ".acl.processing.mode");
+ aclProcessingMode = getInitParameter(filterConfig, resourceRole + ".acl.mode");
if (aclProcessingMode == null) {
- aclProcessingMode = "OR";
+ aclProcessingMode = getInitParameter(filterConfig, "acl.mode");
+ if (aclProcessingMode == null) {
+ aclProcessingMode = "AND";
+ }
}
log.aclProcessingMode(aclProcessingMode);
- String acls = getInitParameter(filterConfig, resourceRole + ".acls");
+ String acls = getInitParameter(filterConfig, resourceRole + ".acl");
parseAcls(acls);
}