http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java index ddbe4c6..680fa67 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXGroupGroup; +import org.apache.ranger.view.VXGroupGroup; +import org.apache.ranger.view.VXGroupGroupList; public abstract class XGroupGroupServiceBase<T extends XXGroupGroup, V extends VXGroupGroup> extends AbstractBaseResourceService<T, V> {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java index c1e8956..6a45555 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java @@ -24,21 +24,20 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.ranger.biz.*; import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.PropertiesUtil; import org.apache.ranger.common.SearchField; import org.apache.ranger.common.SortField; import org.apache.ranger.common.StringUtil; -import org.apache.ranger.common.XACommonEnums; -import org.apache.ranger.common.SortField.SORT_ORDER; import org.apache.ranger.common.view.VTrxLogAttr; -import org.apache.ranger.db.XADaoManager; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.util.XAEnumUtil; -import org.apache.ranger.view.*; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXAsset; +import org.apache.ranger.entity.XXGroup; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.util.RangerEnumUtil; +import org.apache.ranger.view.VXGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -50,10 +49,10 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { public static Long createdByUserId = 1L; @Autowired - XADaoManager xADaoManager; + RangerDaoManager rangerDaoManager; @Autowired - XAEnumUtil xaEnumUtil; + RangerEnumUtil xaEnumUtil; @Autowired StringUtil stringUtil; @@ -77,7 +76,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { @Override protected void validateForCreate(VXGroup vObj) { - XXGroup xxGroup = xADaoManager.getXXGroup().findByGroupName( + XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName( vObj.getName()); if (xxGroup != null) { throw restErrorUtil.createRESTException("XGroup already exists", @@ -94,7 +93,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { } public VXGroup getGroupByGroupName(String groupName) { - XXGroup xxGroup = xADaoManager.getXXGroup().findByGroupName(groupName); + XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(groupName); if (xxGroup == null) { throw restErrorUtil.createRESTException( @@ -104,7 +103,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { } public VXGroup createXGroupWithOutLogin(VXGroup vxGroup) { - XXGroup xxGroup = xADaoManager.getXXGroup().findByGroupName( + XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName( vxGroup.getName()); boolean groupExists = true; @@ -114,7 +113,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { } xxGroup = mapViewToEntityBean(vxGroup, xxGroup, 0); - XXPortalUser xXPortalUser = xADaoManager.getXXPortalUser().getById(createdByUserId); + XXPortalUser xXPortalUser = rangerDaoManager.getXXPortalUser().getById(createdByUserId); if (xXPortalUser != null) { xxGroup.setAddedByUserId(createdByUserId); xxGroup.setUpdatedByUserId(createdByUserId); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java index b6cb0ca..c3eebc0 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXGroup; +import org.apache.ranger.view.VXGroup; +import org.apache.ranger.view.VXGroupList; public abstract class XGroupServiceBase<T extends XXGroup, V extends VXGroup> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java index 720a389..4af9049 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java @@ -28,12 +28,16 @@ import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.PropertiesUtil; import org.apache.ranger.common.SearchField; -import org.apache.ranger.common.XACommonEnums; import org.apache.ranger.common.view.VTrxLogAttr; -import org.apache.ranger.db.XADaoManager; -import org.apache.ranger.entity.*; -import org.apache.ranger.util.XAEnumUtil; -import org.apache.ranger.view.*; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXAsset; +import org.apache.ranger.entity.XXGroup; +import org.apache.ranger.entity.XXGroupUser; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.entity.XXUser; +import org.apache.ranger.util.RangerEnumUtil; +import org.apache.ranger.view.VXGroupUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -46,10 +50,10 @@ public class XGroupUserService extends public static Long createdByUserId = 1L; @Autowired - XADaoManager xADaoManager; + RangerDaoManager rangerDaoManager; @Autowired - XAEnumUtil xaEnumUtil; + RangerEnumUtil xaEnumUtil; static HashMap<String, VTrxLogAttr> trxLogAttrs = new HashMap<String, VTrxLogAttr>(); static { @@ -84,7 +88,7 @@ public class XGroupUserService extends XXGroup xGroup = daoManager.getXXGroup().findByGroupName(vxGroupUser.getName()); vxGroupUser.setParentGroupId(xGroup.getId()); xxGroupUser = mapViewToEntityBean(vxGroupUser, xxGroupUser, 0); - XXPortalUser xXPortalUser = xADaoManager.getXXPortalUser().getById(createdByUserId); + XXPortalUser xXPortalUser = rangerDaoManager.getXXPortalUser().getById(createdByUserId); if (xXPortalUser != null) { xxGroupUser.setAddedByUserId(createdByUserId); xxGroupUser.setUpdatedByUserId(createdByUserId); @@ -117,11 +121,11 @@ public class XGroupUserService extends // } Long groupId = vObj.getParentGroupId(); - XXGroup xGroup = xADaoManager.getXXGroup().getById(groupId); + XXGroup xGroup = rangerDaoManager.getXXGroup().getById(groupId); String groupName = xGroup.getName(); Long userId = vObj.getUserId(); - XXUser xUser = xADaoManager.getXXUser().getById(userId); + XXUser xUser = rangerDaoManager.getXXUser().getById(userId); String userName = xUser.getName(); List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>(); @@ -148,7 +152,7 @@ public class XGroupUserService extends value = xaEnumUtil.getLabel(enumName, enumValue); } else { value = ""+field.get(vObj); - XXGroup xXGroup = xADaoManager.getXXGroup().getById(Long.parseLong(value)); + XXGroup xXGroup = rangerDaoManager.getXXGroup().getById(Long.parseLong(value)); value = xXGroup.getName(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java index a27cf44..25779f2 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXGroupUser; +import org.apache.ranger.view.VXGroupUser; +import org.apache.ranger.view.VXGroupUserList; public abstract class XGroupUserServiceBase<T extends XXGroupUser, V extends VXGroupUser> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java index ce1a2a1..146a953 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java @@ -24,15 +24,21 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.commons.lang.ArrayUtils; import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.SearchField; import org.apache.ranger.common.view.VTrxLogAttr; -import org.apache.ranger.db.XADaoManager; -import org.apache.ranger.entity.*; -import org.apache.ranger.util.XAEnumUtil; -import org.apache.ranger.view.*; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXGroup; +import org.apache.ranger.entity.XXPermMap; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.entity.XXUser; +import org.apache.ranger.util.RangerEnumUtil; +import org.apache.ranger.view.VXGroup; +import org.apache.ranger.view.VXPermMap; +import org.apache.ranger.view.VXPermMapList; +import org.apache.ranger.view.VXUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -48,10 +54,10 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { XUserService xUserService; @Autowired - XAEnumUtil xaEnumUtil; + RangerEnumUtil xaEnumUtil; @Autowired - XADaoManager xADaoManager; + RangerDaoManager rangerDaoManager; static HashMap<String, VTrxLogAttr> trxLogAttrs = new HashMap<String, VTrxLogAttr>(); static { @@ -160,11 +166,11 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { if(isGroupPolicy){ groupId = vObj.getGroupId(); - XXGroup xGroup = xADaoManager.getXXGroup().getById(groupId); + XXGroup xGroup = rangerDaoManager.getXXGroup().getById(groupId); groupName = xGroup.getName(); } else { userId = vObj.getUserId(); - XXUser xUser = xADaoManager.getXXUser().getById(userId); + XXUser xUser = rangerDaoManager.getXXUser().getById(userId); userName = xUser.getName(); } @@ -195,8 +201,8 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { // } // } } - Long assetId = xADaoManager.getXXResource().getById(vObj.getResourceId()).getAssetId(); - int policyType = xADaoManager.getXXAsset().getById(assetId).getAssetType(); + Long assetId = rangerDaoManager.getXXResource().getById(vObj.getResourceId()).getAssetId(); + int policyType = rangerDaoManager.getXXAsset().getById(assetId).getAssetType(); if(policyType != AppConstants.ASSET_KNOX){ if(fieldName.equals("ipAddress")) continue; @@ -215,7 +221,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { value = xaEnumUtil.getLabel(enumName, enumValue); } else { value = ""+field.get(vObj); -// XXUser xUser = xADaoManager.getXXUser().getById(Long.parseLong(value)); +// XXUser xUser = rangerDaoManager.getXXUser().getById(Long.parseLong(value)); // value = xUser.getName(); if(fieldName.equals("ipAddress") && action.equalsIgnoreCase("update")){ prevValue = ""+field.get(mObj); @@ -273,7 +279,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { XXPortalUser xXPortalUser=null; if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); + xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); if(xXPortalUser!=null){ mObj.setAddedByUserId(xXPortalUser.getId()); } @@ -281,7 +287,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { } if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy()); + xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy()); if(xXPortalUser!=null){ mObj.setUpdatedByUserId(xXPortalUser.getId()); } @@ -297,13 +303,13 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { if(mObj!=null && vObj!=null){ XXPortalUser xXPortalUser=null; if(stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); + xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); if(xXPortalUser!=null){ vObj.setOwner(xXPortalUser.getLoginId()); } } if(stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); + xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); if(xXPortalUser!=null){ vObj.setUpdatedBy(xXPortalUser.getLoginId()); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java index 3ff0d72..afcd307 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXPermMap; +import org.apache.ranger.view.VXPermMap; +import org.apache.ranger.view.VXPermMapList; public abstract class XPermMapServiceBase<T extends XXPermMap, V extends VXPermMap> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java index b242f0b..a8fe1de 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java @@ -20,12 +20,12 @@ package org.apache.ranger.service; import org.apache.ranger.common.SearchField; -import org.apache.ranger.common.SortField; import org.apache.ranger.common.SearchField.DATA_TYPE; import org.apache.ranger.common.SearchField.SEARCH_TYPE; +import org.apache.ranger.common.SortField; import org.apache.ranger.common.SortField.SORT_ORDER; -import org.apache.ranger.entity.*; -import org.apache.ranger.view.*; +import org.apache.ranger.entity.XXPolicyExportAudit; +import org.apache.ranger.view.VXPolicyExportAudit; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java index 6b05c9e..af58706 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXPolicyExportAudit; +import org.apache.ranger.view.VXPolicyExportAudit; +import org.apache.ranger.view.VXPolicyExportAuditList; public abstract class XPolicyExportAuditServiceBase<T extends XXPolicyExportAudit, V extends VXPolicyExportAudit> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java index b95a3e3..42de408 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java @@ -37,7 +37,7 @@ import org.apache.ranger.common.PropertiesUtil; import org.apache.ranger.common.RESTErrorUtil; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.StringUtil; -import org.apache.ranger.db.XADaoManager; +import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.entity.XXAsset; import org.apache.ranger.entity.XXGroup; import org.apache.ranger.entity.XXPermMap; @@ -67,7 +67,7 @@ public class XPolicyService extends PublicAPIServiceBase<VXResource, VXPolicy> { StringUtil stringUtil; @Autowired - XADaoManager xaDaoMgr; + RangerDaoManager xaDaoMgr; @Autowired XPermMapService xPermMapService; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java index aafedfe..9dffbcb 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java @@ -27,9 +27,11 @@ import java.util.List; import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.StringUtil; import org.apache.ranger.common.view.VTrxLogAttr; -import org.apache.ranger.entity.*; -import org.apache.ranger.util.XAEnumUtil; -import org.apache.ranger.view.*; +import org.apache.ranger.entity.XXAsset; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.util.RangerEnumUtil; +import org.apache.ranger.view.VXPortalUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -40,7 +42,7 @@ public class XPortalUserService extends XPortalUserServiceBase<XXPortalUser, VXPortalUser> { @Autowired - XAEnumUtil xaEnumUtil; + RangerEnumUtil xaEnumUtil; @Autowired StringUtil stringUtil; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java index 602e87d..c5fdec9 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.view.VXPortalUser; +import org.apache.ranger.view.VXPortalUserList; public abstract class XPortalUserServiceBase<T extends XXPortalUser, V extends VXPortalUser> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java b/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java index 5f00ced..fcaa4d8 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java @@ -28,8 +28,8 @@ import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.PropertiesUtil; import org.apache.ranger.common.RESTErrorUtil; +import org.apache.ranger.common.RangerCommonEnums; import org.apache.ranger.common.SearchCriteria; -import org.apache.ranger.common.XACommonEnums; import org.apache.ranger.view.VXAsset; import org.apache.ranger.view.VXAssetList; import org.apache.ranger.view.VXRepository; @@ -61,7 +61,7 @@ public class XRepositoryService extends vRepo.setConfig(vXAsset.getConfig()); int actStatus = vXAsset.getActiveStatus(); - boolean isAct = (actStatus == XACommonEnums.STATUS_DISABLED) ? false + boolean isAct = (actStatus == RangerCommonEnums.STATUS_DISABLED) ? false : true; vRepo.setIsActive(isAct); @@ -81,8 +81,8 @@ public class XRepositoryService extends .getRepositoryType())); vXAsset.setConfig(vXRepo.getConfig()); - int actStatus = (!vXRepo.getIsActive()) ? XACommonEnums.STATUS_DISABLED - : XACommonEnums.STATUS_ENABLED; + int actStatus = (!vXRepo.getIsActive()) ? RangerCommonEnums.STATUS_DISABLED + : RangerCommonEnums.STATUS_ENABLED; vXAsset.setActiveStatus(actStatus); @@ -97,8 +97,8 @@ public class XRepositoryService extends ArrayList<Integer> statusList = new ArrayList<Integer>(); if (statusObj == null) { - statusList.add(XACommonEnums.STATUS_DISABLED); - statusList.add(XACommonEnums.STATUS_ENABLED); + statusList.add(RangerCommonEnums.STATUS_DISABLED); + statusList.add(RangerCommonEnums.STATUS_ENABLED); } else { boolean status = restErrorUtil.parseBoolean( request.getParameter("status"), "Invalid value for " http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java index 3ee48a5..b85ae55 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java @@ -19,7 +19,6 @@ package org.apache.ranger.service; -import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -28,25 +27,36 @@ import java.util.List; import java.util.Map.Entry; import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.ranger.biz.XABizUtil; +import org.apache.ranger.biz.RangerBizUtil; import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.ContextUtil; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.PropertiesUtil; +import org.apache.ranger.common.RangerConstants; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.SearchField; +import org.apache.ranger.common.SearchField.DATA_TYPE; +import org.apache.ranger.common.SearchField.SEARCH_TYPE; import org.apache.ranger.common.SortField; import org.apache.ranger.common.StringUtil; import org.apache.ranger.common.UserSessionBase; -import org.apache.ranger.common.XAConstants; -import org.apache.ranger.common.SearchField.DATA_TYPE; -import org.apache.ranger.common.SearchField.SEARCH_TYPE; import org.apache.ranger.common.view.VTrxLogAttr; -import org.apache.ranger.db.XADaoManager; -import org.apache.ranger.entity.*; -import org.apache.ranger.util.XAEnumUtil; -import org.apache.ranger.view.*; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXAsset; +import org.apache.ranger.entity.XXGroup; +import org.apache.ranger.entity.XXPermMap; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXResource; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.entity.XXUser; +import org.apache.ranger.util.RangerEnumUtil; +import org.apache.ranger.view.VXAuditMap; +import org.apache.ranger.view.VXAuditMapList; +import org.apache.ranger.view.VXPermMap; +import org.apache.ranger.view.VXPermMapList; +import org.apache.ranger.view.VXResource; +import org.apache.ranger.view.VXResourceList; +import org.apache.ranger.view.VXResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -68,12 +78,12 @@ public class XResourceService extends StringUtil stringUtil; @Autowired - XADaoManager xADaoManager; + RangerDaoManager rangerDaoManager; @Autowired - XABizUtil xaBizUtil; + RangerBizUtil xaBizUtil; @Autowired - XAEnumUtil xaEnumUtil; + RangerEnumUtil xaEnumUtil; @Autowired XPolicyService xPolicyService; @@ -185,7 +195,7 @@ public class XResourceService extends Long assetId = vObj.getAssetId(); int assetType; if(assetId != null){ - XXAsset xAsset = xADaoManager.getXXAsset().getById(assetId); + XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId); if(xAsset != null){ assetType = xAsset.getAssetType(); } else { @@ -326,7 +336,7 @@ public class XResourceService extends } private void populateAssetProperties(VXResource vXResource) { - XXAsset xxAsset = xADaoManager.getXXAsset().getById( + XXAsset xxAsset = rangerDaoManager.getXXAsset().getById( vXResource.getAssetId()); if (xxAsset != null) { vXResource.setAssetName(xxAsset.getName()); @@ -420,7 +430,7 @@ public class XResourceService extends XXPortalUser xXPortalUser= null; if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); + xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); if(xXPortalUser!=null){ mObj.setAddedByUserId(xXPortalUser.getId()); } @@ -428,7 +438,7 @@ public class XResourceService extends } if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy()); + xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy()); if(xXPortalUser!=null){ mObj.setUpdatedByUserId(xXPortalUser.getId()); } @@ -447,13 +457,13 @@ public class XResourceService extends if(mObj!=null && vObj!=null){ XXPortalUser xXPortalUser= null; if(stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser=xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); + xXPortalUser=rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); if(xXPortalUser!=null){ vObj.setOwner(xXPortalUser.getLoginId()); } } if(stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); + xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); if(xXPortalUser!=null){ vObj.setUpdatedBy(xXPortalUser.getLoginId()); } @@ -468,7 +478,7 @@ public class XResourceService extends */ public void checkAccess(VXResource vXResource) { - XXAsset xxAsset = xADaoManager.getXXAsset().getById( + XXAsset xxAsset = rangerDaoManager.getXXAsset().getById( vXResource.getAssetId()); if (xxAsset == null) { throw restErrorUtil @@ -531,7 +541,7 @@ public class XResourceService extends resourceTypeList); if (!access) { - XXUser xxUser = xADaoManager.getXXUser().getById( + XXUser xxUser = rangerDaoManager.getXXUser().getById( vxPermMap.getUserId()); throw restErrorUtil.createRESTException( xxUser.getName() + " may not have " @@ -553,7 +563,7 @@ public class XResourceService extends vXResource.getIsRecursive(), assetType, resourceTypeList); if (!access) { - XXGroup xxGroup = xADaoManager.getXXGroup() + XXGroup xxGroup = rangerDaoManager.getXXGroup() .getById(vxPermMap.getGroupId()); throw restErrorUtil.createRESTException(xxGroup .getName() + " may not have " + AppConstants @@ -644,19 +654,19 @@ public class XResourceService extends int isRecursive, List<Integer> resourceTypeList) { HashMap<String, Object> accessMap = new HashMap<String, Object>(); boolean isAccess = false; - List<XXGroup> xGroupList = xADaoManager.getXXGroup().findByUserId( + List<XXGroup> xGroupList = rangerDaoManager.getXXGroup().findByUserId( userId); boolean isRecursivlyAllowed = false; List<XXResource> xXResourceList = null; if (assetType == AppConstants.ASSET_HDFS) { - xXResourceList = xADaoManager.getXXResource().findByAssetId( + xXResourceList = rangerDaoManager.getXXResource().findByAssetId( assetId); //this code block is to add record of 'public' group in group_user mapping list. - XXGroup xXGroupPublic = xADaoManager.getXXGroup(). - findByGroupName(XAConstants.GROUP_PUBLIC); + XXGroup xXGroupPublic = rangerDaoManager.getXXGroup(). + findByGroupName(RangerConstants.GROUP_PUBLIC); if (xXGroupPublic != null && xXGroupPublic.getName().trim() - .equalsIgnoreCase(XAConstants.GROUP_PUBLIC)) { + .equalsIgnoreCase(RangerConstants.GROUP_PUBLIC)) { if(xGroupList!=null){ xGroupList.add(xXGroupPublic); }else{ @@ -665,7 +675,7 @@ public class XResourceService extends } } } else { - xXResourceList = xADaoManager.getXXResource() + xXResourceList = rangerDaoManager.getXXResource() .findByAssetIdAndResourceTypes(assetId, resourceTypeList); } String expandedName = xaBizUtil.replaceMetaChars(path); @@ -715,7 +725,7 @@ public class XResourceService extends } if (matchFound) { // get the perms for this resource - List<XXPermMap> permMapList = xADaoManager.getXXPermMap() + List<XXPermMap> permMapList = rangerDaoManager.getXXPermMap() .findByResourceId(xResource.getId()); for (XXPermMap permMap : permMapList) { if (permMap.getPermType() == permType) { @@ -751,10 +761,10 @@ public class XResourceService extends List<XXResource> xXResourceList = new ArrayList<XXResource>(); if (assetType == AppConstants.ASSET_HDFS) { - xXResourceList = xADaoManager.getXXResource().findByAssetId( + xXResourceList = rangerDaoManager.getXXResource().findByAssetId( assetId); } else { - xXResourceList = xADaoManager.getXXResource() + xXResourceList = rangerDaoManager.getXXResource() .findByAssetIdAndResourceTypes(assetId, resourceTypeList); } @@ -805,7 +815,7 @@ public class XResourceService extends } if (matchFound) { // get the perms for this resource - List<XXPermMap> permMapList = xADaoManager.getXXPermMap() + List<XXPermMap> permMapList = rangerDaoManager.getXXPermMap() .findByResourceId(xResource.getId()); for (XXPermMap permMap : permMapList) { if (permMap.getPermType() == permType) { @@ -945,7 +955,7 @@ public class XResourceService extends return null; } - XXAsset xAsset = xADaoManager.getXXAsset().getById(vObj.getAssetId()); + XXAsset xAsset = rangerDaoManager.getXXAsset().getById(vObj.getAssetId()); String parentObjectName = xAsset.getName(); List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java index 39b0838..4c123ef 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXResource; +import org.apache.ranger.view.VXResource; +import org.apache.ranger.view.VXResourceList; public abstract class XResourceServiceBase<T extends XXResource, V extends VXResource> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java index 8a61aea..7edce5b 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java @@ -26,13 +26,10 @@ import java.util.List; import java.util.Map; import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.ParameterExpression; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.Metamodel; import javax.persistence.metamodel.SingularAttribute; @@ -41,10 +38,12 @@ import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.SearchField; import org.apache.ranger.common.SortField; import org.apache.ranger.common.SortField.SORT_ORDER; -import org.apache.ranger.db.XADaoManager; -import org.apache.ranger.entity.*; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXTrxLog; import org.apache.ranger.entity.view.VXXTrxLog; -import org.apache.ranger.view.*; +import org.apache.ranger.view.VXTrxLog; +import org.apache.ranger.view.VXTrxLogList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -53,7 +52,7 @@ import org.springframework.stereotype.Service; @Scope("singleton") public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { @Autowired - XADaoManager xADaoManager; + RangerDaoManager rangerDaoManager; public XTrxLogService(){ searchFields.add(new SearchField("attributeName", "obj.attributeName", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL)); @@ -191,7 +190,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { VXTrxLog trxLog = mapCustomViewToViewObj(xTrxLog); xXPortalUser=null; if(trxLog.getUpdatedBy()!=null){ - xXPortalUser= xADaoManager.getXXPortalUser().getById( + xXPortalUser= rangerDaoManager.getXXPortalUser().getById( Long.parseLong(trxLog.getUpdatedBy())); } if(xXPortalUser!=null){ @@ -419,7 +418,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { XXPortalUser xXPortalUser=null; if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); + xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); if(xXPortalUser!=null){ mObj.setAddedByUserId(xXPortalUser.getId()); } @@ -427,7 +426,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { } if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy()); + xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy()); if(xXPortalUser!=null){ mObj.setUpdatedByUserId(xXPortalUser.getId()); } @@ -443,13 +442,13 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { if(mObj!=null && vObj!=null){ XXPortalUser xXPortalUser=null; if(stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); + xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); if(xXPortalUser!=null){ vObj.setOwner(xXPortalUser.getLoginId()); } } if(stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); + xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); if(xXPortalUser!=null){ vObj.setUpdatedBy(xXPortalUser.getLoginId()); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java index 5b5cd43..e23ee6c 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.view.VXTrxLog; +import org.apache.ranger.view.VXTrxLogList; public abstract class XTrxLogServiceBase<T extends XXTrxLog, V extends VXTrxLog> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XUserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java index 1f09e61..5e4875f 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java @@ -22,25 +22,28 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.ranger.biz.XABizUtil; +import org.apache.ranger.biz.RangerBizUtil; import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.PropertiesUtil; +import org.apache.ranger.common.RangerConstants; import org.apache.ranger.common.SearchField; import org.apache.ranger.common.SortField; import org.apache.ranger.common.StringUtil; -import org.apache.ranger.common.XACommonEnums; -import org.apache.ranger.common.XAConstants; import org.apache.ranger.common.view.VTrxLogAttr; -import org.apache.ranger.db.XADaoManager; -import org.apache.ranger.entity.*; -import org.apache.ranger.util.XAEnumUtil; -import org.apache.ranger.view.*; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXGroupUser; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXPortalUserRole; +import org.apache.ranger.entity.XXTrxLog; +import org.apache.ranger.entity.XXUser; +import org.apache.ranger.util.RangerEnumUtil; +import org.apache.ranger.view.VXPortalUser; +import org.apache.ranger.view.VXUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -52,7 +55,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> { public static Long createdByUserId = 1L; @Autowired - XADaoManager daoManager; + RangerDaoManager daoManager; @Autowired XPermMapService xPermMapService; @@ -61,10 +64,10 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> { StringUtil stringUtil; @Autowired - XAEnumUtil xaEnumUtil; + RangerEnumUtil xaEnumUtil; @Autowired - XABizUtil xaBizUtil; + RangerBizUtil xaBizUtil; String hiddenPasswordString; @@ -242,7 +245,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> { } } if(userRoleList==null || userRoleList.size()==0){ - userRoleList.add(XAConstants.ROLE_USER); + userRoleList.add(RangerConstants.ROLE_USER); } vObj.setUserRoleList(userRoleList); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java index 41dfff3..b8a4487 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.ranger.common.*; -import org.apache.ranger.entity.*; -import org.apache.ranger.service.*; -import org.apache.ranger.view.*; +import org.apache.ranger.common.SearchCriteria; +import org.apache.ranger.entity.XXUser; +import org.apache.ranger.view.VXUser; +import org.apache.ranger.view.VXUserList; public abstract class XUserServiceBase<T extends XXUser, V extends VXUser> extends AbstractBaseResourceService<T, V> { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java new file mode 100644 index 0000000..6087d35 --- /dev/null +++ b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java @@ -0,0 +1,278 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + package org.apache.ranger.service.filter; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; + +import org.apache.log4j.Logger; +import org.apache.ranger.common.PropertiesUtil; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; + +import com.sun.jersey.api.container.filter.LoggingFilter; +import com.sun.jersey.api.uri.UriTemplate; +import com.sun.jersey.spi.container.ContainerRequest; +import com.sun.jersey.spi.container.ContainerResponse; + +public class RangerRESTAPIFilter extends LoggingFilter { + Logger logger = Logger.getLogger(RangerRESTAPIFilter.class); + static boolean initDone = false; + + boolean logStdOut = true; + HashMap<String, String> regexPathMap = new HashMap<String, String>(); + HashMap<String, Pattern> regexPatternMap = new HashMap<String, Pattern>(); + List<String> regexList = new ArrayList<String>(); + List<String> loggedRestPathErrors = new ArrayList<String>(); + private final Object lock = new Object(); + + void init() { + if (initDone) { + return; + } + synchronized (lock) { + if (initDone) { + return; + } + + logStdOut = PropertiesUtil.getBooleanProperty( + "xa.restapi.log.enabled", initDone); + + // Build hash map + try { + loadPathPatterns(); + } catch (Throwable t) { + logger.error( + "Error parsing REST classes for PATH patterns. Error ignored, but should be fixed immediately", + t); + } + initDone = true; + } + + } + + /* + * (non-Javadoc) + * + * @see + * com.sun.jersey.spi.container.ContainerRequestFilter#filter(com.sun.jersey + * .spi.container.ContainerRequest) + */ + @Override + public ContainerRequest filter(ContainerRequest request) { + if (!initDone) { + init(); + } + if (logStdOut) { + String path = request.getRequestUri().getPath(); + + // mediaType=multipart/form-data;boundary=----WebKitFormBoundaryTHan76r5AkgpAuVG + if (request.getMediaType() != null) { + // logger.info("DELETE ME: mediaType=" + request.getMediaType() + // + ", getType()" + request.getMediaType().getType() + // + ", getSubType()=" + // + request.getMediaType().getSubtype()); + } else { + logger.info("DELETE ME: mediaType is null. path=" + path); + } + if ((request.getMediaType() == null || !request.getMediaType() + .getType().equals("multipart")) + && !path.endsWith("/service/general/logs")) { + try { + request = super.filter(request); + } catch (Throwable t) { + logger.error("Error FILTER logging. path=" + path, t); + } + } + } + + return request; + } + + /* + * (non-Javadoc) + * + * @see + * com.sun.jersey.spi.container.ContainerResponseFilter#filter(com.sun.jersey + * .spi.container.ContainerRequest, + * com.sun.jersey.spi.container.ContainerResponse) + */ + @Override + public ContainerResponse filter(ContainerRequest request, + ContainerResponse response) { + if (logStdOut) { + // If it is image, then don't call super + if (response.getMediaType() != null) { + // logger.info("DELETE ME: Response= mediaType=" + // + response.getMediaType() + ", getType()" + // + response.getMediaType().getType() + ", getSubType()=" + // + response.getMediaType().getSubtype()); + } else { + logger.info("DELETE ME: Response= mediaType is null"); + } + if (response.getMediaType() == null + || !response.getMediaType().getType().equals("image")) { + + response = super.filter(request, response); + } + } + + return response; + } + + private void loadPathPatterns() throws ClassNotFoundException { + String pkg = "org.apache.ranger.service"; + // List<Class> cList = findClasses(new File(dir), pkg); + @SuppressWarnings("rawtypes") + List<Class> cList = findClasses(pkg); + for (@SuppressWarnings("rawtypes") + Class klass : cList) { + Annotation[] annotations = klass.getAnnotations(); + for (Annotation annotation : annotations) { + if (!(annotation instanceof Path)) { + continue; + } + Path path = (Path) annotation; + if (path.value().startsWith("crud")) { + continue; + } + // logger.info("path=" + path.value()); + // Loop over the class methods + for (Method m : klass.getMethods()) { + Annotation[] methodAnnotations = m.getAnnotations(); + String httpMethod = null; + String servicePath = null; + for (int ma = 0; ma < methodAnnotations.length; ma++) { + if (methodAnnotations[ma] instanceof GET) { + httpMethod = "GET"; + } else if (methodAnnotations[ma] instanceof PUT) { + httpMethod = "PUT"; + } else if (methodAnnotations[ma] instanceof POST) { + httpMethod = "POST"; + } else if (methodAnnotations[ma] instanceof DELETE) { + httpMethod = "DELETE"; + } else if (methodAnnotations[ma] instanceof Path) { + servicePath = ((Path) methodAnnotations[ma]) + .value(); + } + } + + if (httpMethod == null) { + continue; + } + + String fullPath = path.value(); + String regEx = httpMethod + ":" + path.value(); + if (servicePath != null) { + if (!servicePath.startsWith("/")) { + servicePath = "/" + servicePath; + } + UriTemplate ut = new UriTemplate(servicePath); + regEx = httpMethod + ":" + path.value() + + ut.getPattern().getRegex(); + fullPath += servicePath; + } + Pattern regexPattern = Pattern.compile(regEx); + + if (regexPatternMap.containsKey(regEx)) { + logger.warn("Duplicate regex=" + regEx + ", fullPath=" + + fullPath); + } + regexList.add(regEx); + regexPathMap.put(regEx, fullPath); + regexPatternMap.put(regEx, regexPattern); + + logger.info("path=" + path.value() + ", servicePath=" + + servicePath + ", fullPath=" + fullPath + + ", regEx=" + regEx); + } + } + } + // ReOrder list + int i = 0; + for (i = 0; i < 10; i++) { + boolean foundMatches = false; + List<String> tmpList = new ArrayList<String>(); + for (int x = 0; x < regexList.size(); x++) { + boolean foundMatch = false; + String rX = regexList.get(x); + for (int y = 0; y < x; y++) { + String rY = regexList.get(y); + Matcher matcher = regexPatternMap.get(rY).matcher(rX); + if (matcher.matches()) { + foundMatch = true; + foundMatches = true; + // logger.info("rX " + rX + " matched with rY=" + rY + // + ". Moving rX to the top. Loop count=" + i); + break; + } + } + if (foundMatch) { + tmpList.add(0, rX); + } else { + tmpList.add(rX); + } + } + regexList = tmpList; + if (!foundMatches) { + logger.info("Done rearranging. loopCount=" + i); + break; + } + } + if (i == 10) { + logger.warn("Couldn't rearrange even after " + i + " loops"); + } + + logger.info("Loaded " + regexList.size() + " API methods."); + // for (String regEx : regexList) { + // logger.info("regEx=" + regEx); + // } + } + + @SuppressWarnings("rawtypes") + private List<Class> findClasses(String packageName) + throws ClassNotFoundException { + List<Class> classes = new ArrayList<Class>(); + + ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider( + true); + + // scanner.addIncludeFilter(new + // AnnotationTypeFilter(<TYPE_YOUR_ANNOTATION_HERE>.class)); + + for (BeanDefinition bd : scanner.findCandidateComponents(packageName)) { + classes.add(Class.forName(bd.getBeanClassName())); + } + + return classes; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java b/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java deleted file mode 100644 index 300608e..0000000 --- a/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - package org.apache.ranger.service.filter; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.MultivaluedMap; - -import org.apache.log4j.Logger; -import org.apache.ranger.common.PropertiesUtil; -import org.apache.ranger.security.context.XAContextHolder; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; - -import com.sun.jersey.api.container.filter.LoggingFilter; -import com.sun.jersey.api.uri.UriTemplate; -import com.sun.jersey.spi.container.ContainerRequest; -import com.sun.jersey.spi.container.ContainerResponse; - -public class XARESTAPIFilter extends LoggingFilter { - Logger logger = Logger.getLogger(XARESTAPIFilter.class); - static boolean initDone = false; - - boolean logStdOut = true; - HashMap<String, String> regexPathMap = new HashMap<String, String>(); - HashMap<String, Pattern> regexPatternMap = new HashMap<String, Pattern>(); - List<String> regexList = new ArrayList<String>(); - List<String> loggedRestPathErrors = new ArrayList<String>(); - private final Object lock = new Object(); - - void init() { - if (initDone) { - return; - } - synchronized (lock) { - if (initDone) { - return; - } - - logStdOut = PropertiesUtil.getBooleanProperty( - "xa.restapi.log.enabled", initDone); - - // Build hash map - try { - loadPathPatterns(); - } catch (Throwable t) { - logger.error( - "Error parsing REST classes for PATH patterns. Error ignored, but should be fixed immediately", - t); - } - initDone = true; - } - - } - - /* - * (non-Javadoc) - * - * @see - * com.sun.jersey.spi.container.ContainerRequestFilter#filter(com.sun.jersey - * .spi.container.ContainerRequest) - */ - @Override - public ContainerRequest filter(ContainerRequest request) { - if (!initDone) { - init(); - } - if (logStdOut) { - String path = request.getRequestUri().getPath(); - - // mediaType=multipart/form-data;boundary=----WebKitFormBoundaryTHan76r5AkgpAuVG - if (request.getMediaType() != null) { - // logger.info("DELETE ME: mediaType=" + request.getMediaType() - // + ", getType()" + request.getMediaType().getType() - // + ", getSubType()=" - // + request.getMediaType().getSubtype()); - } else { - logger.info("DELETE ME: mediaType is null. path=" + path); - } - if ((request.getMediaType() == null || !request.getMediaType() - .getType().equals("multipart")) - && !path.endsWith("/service/general/logs")) { - try { - request = super.filter(request); - } catch (Throwable t) { - logger.error("Error FILTER logging. path=" + path, t); - } - } - } - - return request; - } - - /* - * (non-Javadoc) - * - * @see - * com.sun.jersey.spi.container.ContainerResponseFilter#filter(com.sun.jersey - * .spi.container.ContainerRequest, - * com.sun.jersey.spi.container.ContainerResponse) - */ - @Override - public ContainerResponse filter(ContainerRequest request, - ContainerResponse response) { - if (logStdOut) { - // If it is image, then don't call super - if (response.getMediaType() != null) { - // logger.info("DELETE ME: Response= mediaType=" - // + response.getMediaType() + ", getType()" - // + response.getMediaType().getType() + ", getSubType()=" - // + response.getMediaType().getSubtype()); - } else { - logger.info("DELETE ME: Response= mediaType is null"); - } - if (response.getMediaType() == null - || !response.getMediaType().getType().equals("image")) { - - response = super.filter(request, response); - } - } - - return response; - } - - private void loadPathPatterns() throws ClassNotFoundException { - String pkg = "org.apache.ranger.service"; - // List<Class> cList = findClasses(new File(dir), pkg); - @SuppressWarnings("rawtypes") - List<Class> cList = findClasses(pkg); - for (@SuppressWarnings("rawtypes") - Class klass : cList) { - Annotation[] annotations = klass.getAnnotations(); - for (Annotation annotation : annotations) { - if (!(annotation instanceof Path)) { - continue; - } - Path path = (Path) annotation; - if (path.value().startsWith("crud")) { - continue; - } - // logger.info("path=" + path.value()); - // Loop over the class methods - for (Method m : klass.getMethods()) { - Annotation[] methodAnnotations = m.getAnnotations(); - String httpMethod = null; - String servicePath = null; - for (int ma = 0; ma < methodAnnotations.length; ma++) { - if (methodAnnotations[ma] instanceof GET) { - httpMethod = "GET"; - } else if (methodAnnotations[ma] instanceof PUT) { - httpMethod = "PUT"; - } else if (methodAnnotations[ma] instanceof POST) { - httpMethod = "POST"; - } else if (methodAnnotations[ma] instanceof DELETE) { - httpMethod = "DELETE"; - } else if (methodAnnotations[ma] instanceof Path) { - servicePath = ((Path) methodAnnotations[ma]) - .value(); - } - } - - if (httpMethod == null) { - continue; - } - - String fullPath = path.value(); - String regEx = httpMethod + ":" + path.value(); - if (servicePath != null) { - if (!servicePath.startsWith("/")) { - servicePath = "/" + servicePath; - } - UriTemplate ut = new UriTemplate(servicePath); - regEx = httpMethod + ":" + path.value() - + ut.getPattern().getRegex(); - fullPath += servicePath; - } - Pattern regexPattern = Pattern.compile(regEx); - - if (regexPatternMap.containsKey(regEx)) { - logger.warn("Duplicate regex=" + regEx + ", fullPath=" - + fullPath); - } - regexList.add(regEx); - regexPathMap.put(regEx, fullPath); - regexPatternMap.put(regEx, regexPattern); - - logger.info("path=" + path.value() + ", servicePath=" - + servicePath + ", fullPath=" + fullPath - + ", regEx=" + regEx); - } - } - } - // ReOrder list - int i = 0; - for (i = 0; i < 10; i++) { - boolean foundMatches = false; - List<String> tmpList = new ArrayList<String>(); - for (int x = 0; x < regexList.size(); x++) { - boolean foundMatch = false; - String rX = regexList.get(x); - for (int y = 0; y < x; y++) { - String rY = regexList.get(y); - Matcher matcher = regexPatternMap.get(rY).matcher(rX); - if (matcher.matches()) { - foundMatch = true; - foundMatches = true; - // logger.info("rX " + rX + " matched with rY=" + rY - // + ". Moving rX to the top. Loop count=" + i); - break; - } - } - if (foundMatch) { - tmpList.add(0, rX); - } else { - tmpList.add(rX); - } - } - regexList = tmpList; - if (!foundMatches) { - logger.info("Done rearranging. loopCount=" + i); - break; - } - } - if (i == 10) { - logger.warn("Couldn't rearrange even after " + i + " loops"); - } - - logger.info("Loaded " + regexList.size() + " API methods."); - // for (String regEx : regexList) { - // logger.info("regEx=" + regEx); - // } - } - - @SuppressWarnings("rawtypes") - private List<Class> findClasses(String packageName) - throws ClassNotFoundException { - List<Class> classes = new ArrayList<Class>(); - - ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider( - true); - - // scanner.addIncludeFilter(new - // AnnotationTypeFilter(<TYPE_YOUR_ANNOTATION_HERE>.class)); - - for (BeanDefinition bd : scanner.findCandidateComponents(packageName)) { - classes.add(Class.forName(bd.getBeanClassName())); - } - - return classes; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java index dddb48f..1ed340e 100644 --- a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java @@ -26,9 +26,9 @@ import org.apache.log4j.Logger; import org.apache.ranger.common.PropertiesUtil; import org.apache.ranger.security.standalone.StandaloneSecurityHandler; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.stereotype.Component; /** *
