Repository: incubator-ranger Updated Branches: refs/heads/master f8b4d4a9a -> 0b7bc92bc
RANGER-410: fix to preserve default audit handler in BasePlugin Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0b7bc92b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0b7bc92b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0b7bc92b Branch: refs/heads/master Commit: 0b7bc92bcdac82559f9a4981ab4e4aed915e9eff Parents: f8b4d4a Author: Madhan Neethiraj <[email protected]> Authored: Sun Apr 19 10:42:42 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Sun Apr 19 10:59:44 2015 -0700 ---------------------------------------------------------------------- .../plugin/policyengine/RangerPolicyEngine.java | 8 ----- .../policyengine/RangerPolicyEngineImpl.java | 21 ----------- .../ranger/plugin/service/RangerBasePlugin.java | 38 +++----------------- 3 files changed, 5 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0b7bc92b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java index 3634768..4605a8d 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngine.java @@ -50,17 +50,9 @@ public interface RangerPolicyEngine { List<RangerContextEnricher> getContextEnrichers(); - void setDefaultAuditHandler(RangerAuditHandler auditHandler); - - RangerAuditHandler getDefaultAuditHandler(); - RangerAccessResult createAccessResult(RangerAccessRequest request); - RangerAccessResult isAccessAllowed(RangerAccessRequest request); - - Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessRequest> requests); - RangerAccessResult isAccessAllowed(RangerAccessRequest request, RangerAuditHandler auditHandler); Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessRequest> requests, RangerAuditHandler auditHandler); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0b7bc92b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java index 5956759..efb0649 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java @@ -41,7 +41,6 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine { private final RangerPolicyRepository policyRepository; - private RangerAuditHandler defaultAuditHandler = null; public RangerPolicyEngineImpl(ServicePolicies servicePolicies) { this(servicePolicies, null); @@ -94,31 +93,11 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine { } @Override - public void setDefaultAuditHandler(RangerAuditHandler auditHandler) { - this.defaultAuditHandler = auditHandler; - } - - @Override - public RangerAuditHandler getDefaultAuditHandler() { - return defaultAuditHandler; - } - - @Override public RangerAccessResult createAccessResult(RangerAccessRequest request) { return new RangerAccessResult(this.getServiceName(), policyRepository.getServiceDef(), request); } @Override - public RangerAccessResult isAccessAllowed(RangerAccessRequest request) { - return isAccessAllowed(request, defaultAuditHandler); - } - - @Override - public Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessRequest> requests) { - return isAccessAllowed(requests, defaultAuditHandler); - } - - @Override public RangerAccessResult isAccessAllowed(RangerAccessRequest request, RangerAuditHandler auditHandler) { if(LOG.isDebugEnabled()) { LOG.debug("==> RangerPolicyEngineImpl.isAccessAllowed(" + request + ")"); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0b7bc92b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java index 203cf5e..51d1ae0 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java @@ -54,6 +54,7 @@ public class RangerBasePlugin { private PolicyRefresher refresher = null; private RangerPolicyEngine policyEngine = null; private RangerPolicyEngineOptions policyEngineOptions = new RangerPolicyEngineOptions(); + private RangerAuditHandler defaultAuditHandler = null; public RangerBasePlugin(String serviceType, String appId) { @@ -128,49 +129,21 @@ public class RangerBasePlugin { } public void setDefaultAuditHandler(RangerAuditHandler auditHandler) { - RangerPolicyEngine policyEngine = this.policyEngine; - - if(policyEngine != null) { - policyEngine.setDefaultAuditHandler(auditHandler); - } + this.defaultAuditHandler = auditHandler; } public RangerAuditHandler getDefaultAuditHandler() { - RangerPolicyEngine policyEngine = this.policyEngine; - - if(policyEngine != null) { - return policyEngine.getDefaultAuditHandler(); - } - - return null; + return this.defaultAuditHandler; } public RangerAccessResult isAccessAllowed(RangerAccessRequest request) { - RangerPolicyEngine policyEngine = this.policyEngine; - - if(policyEngine != null) { - enrichRequest(request, policyEngine); - - return policyEngine.isAccessAllowed(request); - } - - return null; + return isAccessAllowed(request, defaultAuditHandler); } - public Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessRequest> requests) { - RangerPolicyEngine policyEngine = this.policyEngine; - - if(policyEngine != null) { - enrichRequests(requests, policyEngine); - - return policyEngine.isAccessAllowed(requests); - } - - return null; + return isAccessAllowed(requests, defaultAuditHandler); } - public RangerAccessResult isAccessAllowed(RangerAccessRequest request, RangerAuditHandler auditHandler) { RangerPolicyEngine policyEngine = this.policyEngine; @@ -183,7 +156,6 @@ public class RangerBasePlugin { return null; } - public Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessRequest> requests, RangerAuditHandler auditHandler) { RangerPolicyEngine policyEngine = this.policyEngine;
