You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2021/11/16 05:47:35 UTC

[ranger] branch master updated: Revert "RANGER-3508: enhanced script condition expression for easier access to user/group/tag/resource attributes"

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

madhan 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 efee667  Revert "RANGER-3508: enhanced script condition expression for easier access to user/group/tag/resource attributes"
efee667 is described below

commit efee667c26fc70b5d075e796d630952b7fa2bbc9
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Mon Nov 15 21:46:49 2021 -0800

    Revert "RANGER-3508: enhanced script condition expression for easier access to user/group/tag/resource attributes"
    
    This reverts commit a0363eaba9f708088fd0a83f5c89bda5bec58b3c, which was merged by mistake.
---
 .../policyevaluator/RangerDefaultRowFilterPolicyItemEvaluator.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultRowFilterPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultRowFilterPolicyItemEvaluator.java
index 1ef3a9e..0831dde 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultRowFilterPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultRowFilterPolicyItemEvaluator.java
@@ -24,21 +24,16 @@ import org.apache.ranger.plugin.model.RangerPolicy.RangerRowFilterPolicyItem;
 import org.apache.ranger.plugin.model.RangerServiceDef;
 import org.apache.ranger.plugin.policyengine.RangerAccessResult;
 import org.apache.ranger.plugin.policyengine.RangerPolicyEngineOptions;
-import org.apache.ranger.plugin.policyengine.RangerRequestScriptEvaluator;
 import org.apache.ranger.plugin.policyresourcematcher.RangerPolicyResourceMatcher;
 
 
 public class RangerDefaultRowFilterPolicyItemEvaluator extends RangerDefaultPolicyItemEvaluator implements RangerRowFilterPolicyItemEvaluator {
 	final private RangerRowFilterPolicyItem rowFilterPolicyItem;
-	final private boolean                   isDynamicEvalNeeded;
 
 	public RangerDefaultRowFilterPolicyItemEvaluator(RangerServiceDef serviceDef, RangerPolicy policy, RangerRowFilterPolicyItem policyItem, int policyItemIndex, RangerPolicyEngineOptions options) {
-		super(serviceDef, policy, policyItem, RangerPolicyItemEvaluator.POLICY_ITEM_TYPE_ROWFILTER, policyItemIndex, options);
+		super(serviceDef, policy, policyItem, RangerPolicyItemEvaluator.POLICY_ITEM_TYPE_DATAMASK, policyItemIndex, options);
 
 		rowFilterPolicyItem = policyItem;
-		isDynamicEvalNeeded = rowFilterPolicyItem != null &&
-				              rowFilterPolicyItem.getRowFilterInfo() != null &&
-				              RangerRequestScriptEvaluator.needsJsonCtxEnabled(rowFilterPolicyItem.getRowFilterInfo().getFilterExpr());
 	}
 
 	@Override