Repository: ranger Updated Branches: refs/heads/master 576b62ad0 -> 58fc47e62
RANGER-1884: Default Policy is not created for Ranger KMS and Tag service Signed-off-by: Mehul Parikh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/58fc47e6 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/58fc47e6 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/58fc47e6 Branch: refs/heads/master Commit: 58fc47e6247500f8c67c55d933ce99c3c47a97ef Parents: 576b62a Author: Bhavik Patel <[email protected]> Authored: Mon Nov 13 12:44:07 2017 +0530 Committer: Mehul Parikh <[email protected]> Committed: Wed Nov 15 10:16:47 2017 +0530 ---------------------------------------------------------------------- .../org/apache/ranger/plugin/service/RangerBaseService.java | 5 ++++- .../java/org/apache/ranger/services/kms/RangerServiceKMS.java | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/58fc47e6/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java index 25f9985..d99f478 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBaseService.java @@ -252,7 +252,10 @@ public abstract class RangerBaseService { List<String> ret = new ArrayList<>(); Map<String, String> serviceConfig = service.getConfigs(); if (serviceConfig != null ) { - ret.add(serviceConfig.get("username")); + String serviceConfigUser = serviceConfig.get("username"); + if (StringUtils.isNotBlank(serviceConfigUser)){ + ret.add(serviceConfig.get("username")); + } String defaultUsers = serviceConfig.get("default.policy.users"); if (!StringUtils.isEmpty(defaultUsers)) { List<String> defaultUserList = new ArrayList<>(Arrays.asList(StringUtils.split(defaultUsers,","))); http://git-wip-us.apache.org/repos/asf/ranger/blob/58fc47e6/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java ---------------------------------------------------------------------- diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java index cd368e4..579f639 100644 --- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java +++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/RangerServiceKMS.java @@ -29,6 +29,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.service.RangerBaseService; import org.apache.ranger.plugin.service.ResourceLookupContext; import org.apache.ranger.services.kms.client.KMSResourceMgr; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -128,7 +129,9 @@ public class RangerServiceKMS extends RangerBaseService { List<RangerPolicy.RangerPolicyItem> policyItems = defaultPolicy.getPolicyItems(); for (RangerPolicy.RangerPolicyItem item : policyItems) { List<String> users = item.getUsers(); - users.add(adminUser); + if(StringUtils.isNotBlank(adminUser)){ + users.add(adminUser); + } item.setUsers(users); } @@ -156,7 +159,6 @@ public class RangerServiceKMS extends RangerBaseService { if (LOG.isDebugEnabled()) { LOG.debug("<== RangerServiceKMS.getDefaultRangerPolicies() : " + ret); } - return ret; }
