You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2019/04/24 23:48:24 UTC

[ranger] branch master updated: RANGER-2409:Policy level condition sample matcher initialization issue

This is an automated email from the ASF dual-hosted git repository.

rmani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 456d22d  RANGER-2409:Policy level condition sample matcher initialization issue
456d22d is described below

commit 456d22d172925a1d763597b98e90eea103c70eae
Author: rmani <rm...@hortonworks.com>
AuthorDate: Wed Apr 24 15:26:14 2019 -0700

    RANGER-2409:Policy level condition sample matcher initialization issue
---
 .../RangerPolicyConditionSampleSimpleMatcher.java          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerPolicyConditionSampleSimpleMatcher.java b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerPolicyConditionSampleSimpleMatcher.java
index 857fffe..f0df30d 100644
--- a/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerPolicyConditionSampleSimpleMatcher.java
+++ b/ranger-examples/conditions-enrichers/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerPolicyConditionSampleSimpleMatcher.java
@@ -80,7 +80,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 	@Override
 	public void init() {
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("==> RangerSampleSimpleMatcher.init(" + policyCondition + ")");
+			LOG.debug("==> RangerPolicyConditionSampleSimpleMatcher.init(" + policyCondition + ")");
 		}
 
 		super.init();
@@ -91,7 +91,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 		} else if (conditionDef == null) {
 			LOG.debug("init: null policy condition definition! Will match always!");
 			_allowAny = true;
-		} else if (CollectionUtils.isEmpty(condition.getValues())) {
+		} else if (CollectionUtils.isEmpty(policyCondition.getValues())) {
 			LOG.debug("init: empty conditions collection on policy condition!  Will match always!");
 			_allowAny = true;
 		} else if (MapUtils.isEmpty(conditionDef.getEvaluatorOptions())) {
@@ -108,7 +108,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 		}
 
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("<== RangerSampleSimpleMatcher.init(" + policyCondition + "): values[" + _values + "]");
+			LOG.debug("<== RangerPolicyConditionSampleSimpleMatcher.init(" + policyCondition + "): values[" + _values + "]");
 		}
 	}
 
@@ -116,7 +116,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 	public boolean isMatched(RangerAccessRequest request) {
 
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("==> RangerSampleSimpleMatcher.isMatched(" + request + ")");
+			LOG.debug("==> RangerPolicyConditionSampleSimpleMatcher.isMatched(" + request + ")");
 		}
 
 		boolean matched = false;
@@ -136,7 +136,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 		}
 
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("<== RangerSampleSimpleMatcher.isMatched(" + request+ "): " + matched);
+			LOG.debug("<== RangerPolicyConditionSampleSimpleMatcher.isMatched(" + request+ "): " + matched);
 		}
 
 		return matched;
@@ -144,7 +144,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 
 	String extractValue(final RangerAccessRequest request, String key) {
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("==> RangerSampleSimpleMatcher.extractValue(" + request+ ")");
+			LOG.debug("==> RangerPolicyConditionSampleSimpleMatcher.extractValue(" + request+ ")");
 		}
 
 		String value = null;
@@ -163,7 +163,7 @@ public class RangerPolicyConditionSampleSimpleMatcher extends RangerAbstractCond
 		}
 
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("<== RangerSampleSimpleMatcher.extractValue(" + request+ "): " + value);
+			LOG.debug("<== RangerPolicyConditionSampleSimpleMatcher.extractValue(" + request+ "): " + value);
 		}
 		return value;
 	}