ranger git commit: RANGER-2045: Hive table columns with no explicit allow policy are listed with 'desc table' command - fix regression

[abhay]

Repository: ranger
Updated Branches:
  refs/heads/ranger-1.0 f58b53ab4 -> 88a1f


RANGER-2045: Hive table columns with no explicit allow policy are listed with 
'desc table' command - fix regression


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/88a1
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/88a1
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/88a1

Branch: refs/heads/ranger-1.0
Commit: 88a1ffbc230fa9204d2e8a0464bfcf024180
Parents: f58b53a
Author: Abhay Kulkarni 
Authored: Sat Apr 7 09:38:54 2018 -0700
Committer: Abhay Kulkarni 
Committed: Sat Apr 7 11:04:37 2018 -0700

--
 .../plugin/policyevaluator/RangerDefaultPolicyEvaluator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ranger/blob/88a1/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
--
diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
index b787799..ab4a9d2 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
@@ -185,7 +185,7 @@ public class RangerDefaultPolicyEvaluator extends 
RangerAbstractPolicyEvaluator
if (request.isAccessTypeAny()) {
isMatched = matchType != 
RangerPolicyResourceMatcher.MatchType.NONE;
} else if 
(request.getResourceMatchingScope() == 
RangerAccessRequest.ResourceMatchingScope.SELF_OR_DESCENDANTS) {
-   isMatched = matchType == 
RangerPolicyResourceMatcher.MatchType.SELF || matchType == 
RangerPolicyResourceMatcher.MatchType.DESCENDANT;
+   isMatched = matchType != 
RangerPolicyResourceMatcher.MatchType.NONE;
} else {
isMatched = matchType == 
RangerPolicyResourceMatcher.MatchType.SELF || matchType == 
RangerPolicyResourceMatcher.MatchType.ANCESTOR;
}

ranger git commit: RANGER-2045: Hive table columns with no explicit allow policy are listed with 'desc table' command - fix regression

[abhay]

Repository: ranger
Updated Branches:
  refs/heads/master e65a3e812 -> fe854a061


RANGER-2045: Hive table columns with no explicit allow policy are listed with 
'desc table' command - fix regression


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/fe854a06
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/fe854a06
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/fe854a06

Branch: refs/heads/master
Commit: fe854a061e0948f27437fb5d9e6f24f0cac0f372
Parents: e65a3e8
Author: Abhay Kulkarni 
Authored: Sat Apr 7 09:38:54 2018 -0700
Committer: Abhay Kulkarni 
Committed: Sat Apr 7 09:38:54 2018 -0700

--
 .../plugin/policyevaluator/RangerDefaultPolicyEvaluator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ranger/blob/fe854a06/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
--
diff --git 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
index 56dc0f6..c539cc0 100644
--- 
a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
+++ 
b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java
@@ -216,7 +216,7 @@ public class RangerDefaultPolicyEvaluator extends 
RangerAbstractPolicyEvaluator
if (request.isAccessTypeAny()) {
isMatched = matchType != 
RangerPolicyResourceMatcher.MatchType.NONE;
} else if 
(request.getResourceMatchingScope() == 
RangerAccessRequest.ResourceMatchingScope.SELF_OR_DESCENDANTS) {
-   isMatched = matchType == 
RangerPolicyResourceMatcher.MatchType.SELF || matchType == 
RangerPolicyResourceMatcher.MatchType.DESCENDANT;
+   isMatched = matchType != 
RangerPolicyResourceMatcher.MatchType.NONE;
} else {
isMatched = matchType == 
RangerPolicyResourceMatcher.MatchType.SELF || matchType == 
RangerPolicyResourceMatcher.MatchType.ANCESTOR;
}