Repository: ranger Updated Branches: refs/heads/master c24c9bdfd -> 6890976ee
RANGER-1766 Execute grant all command failure in beeline mode when user used Ranger hive plugin. Signed-off-by: Colm O hEigeartaigh <cohei...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/6890976e Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6890976e Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6890976e Branch: refs/heads/master Commit: 6890976ee99a2f05fbec214003c67da7b2eb466d Parents: c24c9bd Author: peng.jianhua <peng.jian...@zte.com.cn> Authored: Thu Sep 7 09:30:59 2017 +0800 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Sep 7 10:17:01 2017 +0100 ---------------------------------------------------------------------- .../authorization/hive/authorizer/RangerHiveAuthorizer.java | 3 +++ .../authorization/hive/authorizer/RangerHiveResource.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/6890976e/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java index 1c7a9d0..c131f02 100644 --- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java +++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java @@ -837,6 +837,9 @@ public class RangerHiveAuthorizer extends RangerHiveAuthorizerBase { private HiveObjectType getObjectType(HivePrivilegeObject hiveObj, HiveOperationType hiveOpType) { HiveObjectType objType = HiveObjectType.NONE; + if (hiveObj.getType() == null) { + return HiveObjectType.DATABASE; + } switch(hiveObj.getType()) { case DATABASE: http://git-wip-us.apache.org/repos/asf/ranger/blob/6890976e/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java index d04d3bf..e4eafc6 100644 --- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java +++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveResource.java @@ -46,9 +46,12 @@ public class RangerHiveResource extends RangerAccessResourceImpl { switch(objectType) { case DATABASE: + if (databaseorUrl == null) { + databaseorUrl = "*"; + } setValue(KEY_DATABASE, databaseorUrl); break; - + case FUNCTION: if (databaseorUrl == null) { databaseorUrl = "";
