Repository: incubator-ranger Updated Branches: refs/heads/master ea9954f4d -> 2abe4db53
RANGER-449: VXPolicy to RangerPolicy mapping updated to use resourceName only for HDFS policies Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/2abe4db5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/2abe4db5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/2abe4db5 Branch: refs/heads/master Commit: 2abe4db53c0f6be6a49d50a133eb611a116c6dcd Parents: ea9954f Author: Madhan Neethiraj <[email protected]> Authored: Sat May 2 13:55:59 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Sat May 2 13:55:59 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/ranger/common/ServiceUtil.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2abe4db5/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java index b8117fd..09759c3 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java @@ -975,9 +975,11 @@ public class ServiceUtil { ret.setDescription(vXPolicy.getDescription()); ret.setIsEnabled(vXPolicy.getIsEnabled() == true); ret.setIsAuditEnabled(vXPolicy.getIsAuditEnabled()); + + Integer assetType = toAssetType(service.getType()); Boolean isRecursive = Boolean.FALSE; - if ( vXPolicy.getIsRecursive() != null) { + if (assetType == RangerCommonEnums.ASSET_HDFS && vXPolicy.getIsRecursive() != null) { isRecursive = vXPolicy.getIsRecursive(); } @@ -991,7 +993,7 @@ public class ServiceUtil { isColumnExcludes = vXPolicy.getColumnType().equals(RangerCommonEnums.getLabelFor_PolicyType(RangerCommonEnums.POLICY_EXCLUSION)); } - if (vXPolicy.getResourceName() != null ) { + if (assetType == RangerCommonEnums.ASSET_HDFS && vXPolicy.getResourceName() != null ) { toRangerResourceList(vXPolicy.getResourceName(), "path", Boolean.FALSE, isRecursive, ret.getResources()); } @@ -1026,8 +1028,6 @@ public class ServiceUtil { if ( vXPolicy.getPermMapList() != null) { List<VXPermObj> vXPermObjList = vXPolicy.getPermMapList(); - Integer assetType = toAssetType(service.getType()); - for(VXPermObj vXPermObj : vXPermObjList ) { List<String> userList = new ArrayList<String>(); List<String> groupList = new ArrayList<String>(); @@ -1062,8 +1062,6 @@ public class ServiceUtil { } accessList.add(new RangerPolicyItemAccess(perm)); } - - } }
