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 2016/09/15 19:52:13 UTC
[9/9] incubator-ranger git commit: RANGER-1161: trie prefilter
updated to handle empty resource value
RANGER-1161: trie prefilter updated to handle empty resource value
(cherry picked from commit 89e11bcc2a6782dec11f3f88e459dc6aa8691931)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/13e36cf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/13e36cf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/13e36cf1
Branch: refs/heads/ranger-0.6
Commit: 13e36cf1d32c3cb0cef0903e073d80adbe75c2fb
Parents: 46f95f7
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Fri Sep 2 00:11:17 2016 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu Sep 15 12:21:16 2016 -0700
----------------------------------------------------------------------
.../plugin/policyengine/RangerPolicyRepository.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/13e36cf1/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
index 0fd8ed4..51cad3a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
@@ -215,7 +215,9 @@ class RangerPolicyRepository {
}
List<RangerPolicyEvaluator> getPolicyEvaluators(RangerAccessResource resource) {
- return policyResourceTrie == null ? getPolicyEvaluators() : getPolicyEvaluators(policyResourceTrie, resource);
+ String resourceStr = resource == null ? null : resource.getAsString();
+
+ return policyResourceTrie == null || StringUtils.isEmpty(resourceStr) ? getPolicyEvaluators() : getPolicyEvaluators(policyResourceTrie, resource);
}
List<RangerPolicyEvaluator> getDataMaskPolicyEvaluators() {
@@ -223,7 +225,9 @@ class RangerPolicyRepository {
}
List<RangerPolicyEvaluator> getDataMaskPolicyEvaluators(RangerAccessResource resource) {
- return dataMaskResourceTrie == null ? getDataMaskPolicyEvaluators() : getPolicyEvaluators(dataMaskResourceTrie, resource);
+ String resourceStr = resource == null ? null : resource.getAsString();
+
+ return dataMaskResourceTrie == null || StringUtils.isEmpty(resourceStr) ? getDataMaskPolicyEvaluators() : getPolicyEvaluators(dataMaskResourceTrie, resource);
}
List<RangerPolicyEvaluator> getRowFilterPolicyEvaluators() {
@@ -231,7 +235,9 @@ class RangerPolicyRepository {
}
List<RangerPolicyEvaluator> getRowFilterPolicyEvaluators(RangerAccessResource resource) {
- return rowFilterResourceTrie == null ? getRowFilterPolicyEvaluators() : getPolicyEvaluators(rowFilterResourceTrie, resource);
+ String resourceStr = resource == null ? null : resource.getAsString();
+
+ return rowFilterResourceTrie == null || StringUtils.isEmpty(resourceStr) ? getRowFilterPolicyEvaluators() : getPolicyEvaluators(rowFilterResourceTrie, resource);
}
private List<RangerPolicyEvaluator> getPolicyEvaluators(Map<String, RangerResourceTrie> resourceTrie, RangerAccessResource resource) {