http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java index 364fef4..5536b3c 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java @@ -24,15 +24,10 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.persistence.Column; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.RangerCommonEnums; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; @@ -60,7 +55,7 @@ public class VXGroup extends VXDataObject implements java.io.Serializable { */ protected int groupType = AppConstants.XA_GROUP_UNKNOWN; - protected int groupSource = XACommonEnums.GROUP_INTERNAL; + protected int groupSource = RangerCommonEnums.GROUP_INTERNAL; /** * Id of the credential store */
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java index faa6aac..37ad010 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java @@ -24,14 +24,9 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java index 1757fbb..afc8470 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java index 83c222b..28b541f 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java index c9da6b2..1068f3f 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java @@ -24,14 +24,9 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java index 6cb1ae1..1741b19 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXLong.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java index 68df898..615371c 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java @@ -24,14 +24,10 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.view.ViewBaseBean; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java index a28a313..f516e95 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java @@ -24,14 +24,10 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.view.ViewBaseBean; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java index d894c33..128c740 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java @@ -24,14 +24,10 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.view.ViewBaseBean; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java index a64e96a..b273da0 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java @@ -24,14 +24,10 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.RangerConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; @@ -87,7 +83,7 @@ public class VXPermMap extends VXDataObject implements java.io.Serializable { * Is recursive * This attribute is of type enum CommonEnums::BooleanValue */ - protected int isRecursive = XAConstants.BOOL_NONE; + protected int isRecursive = RangerConstants.BOOL_NONE; /** * Is wild card */ @@ -103,7 +99,7 @@ public class VXPermMap extends VXDataObject implements java.io.Serializable { public VXPermMap ( ) { permFor = AppConstants.XA_PERM_FOR_UNKNOWN; permType = AppConstants.XA_PERM_TYPE_UNKNOWN; - isRecursive = XAConstants.BOOL_NONE; + isRecursive = RangerConstants.BOOL_NONE; } /** http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java index 065be19..4bf5334 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java index 2777ce4..8da18e3 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java @@ -26,7 +26,7 @@ import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java index c8d1aba..c60c2f2 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java @@ -24,11 +24,14 @@ * List wrapper class for VXPermObj */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java index 32bc6d3..10077c8 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java @@ -24,11 +24,11 @@ * Policy */ -import java.util.*; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; +import org.apache.ranger.common.AppConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java index 174cdca..9ac3fa1 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java @@ -24,14 +24,12 @@ * */ -import java.util.*; +import java.util.Date; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.AppConstants; import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java index c58a720..ad740db 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java index 54d9736..2e5f55d 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java @@ -24,11 +24,14 @@ * List wrapper class for VXPolicy */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java index 84f7f55..a0c9ec8 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java @@ -19,14 +19,11 @@ package org.apache.ranger.view; -import java.util.*; +import java.util.Collection; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java index 7d17a99..b0840d6 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java index e968e16..dae717c 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java @@ -24,9 +24,9 @@ * Repository */ -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; +import org.apache.ranger.common.AppConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java index aae5db4..987587a 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java @@ -24,11 +24,14 @@ * List wrapper class for VXRepository */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXResource.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java index d8f0226..23d3e4a 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java @@ -24,14 +24,12 @@ * */ -import java.util.*; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.RangerConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; @@ -75,7 +73,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable { * Whether to encrypt this resource * This attribute is of type enum CommonEnums::BooleanValue */ - protected int isEncrypt = XAConstants.BOOL_FALSE; + protected int isEncrypt = RangerConstants.BOOL_FALSE; /** * List of permissions maps */ @@ -88,7 +86,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable { * Is recursive * This attribute is of type enum CommonEnums::BooleanValue */ - protected int isRecursive = XAConstants.BOOL_NONE; + protected int isRecursive = RangerConstants.BOOL_NONE; /** * Group to which this resource belongs to */ @@ -137,7 +135,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable { * Check parent permission * This attribute is of type enum CommonEnums::BooleanValue */ - protected int checkParentPermission = XAConstants.BOOL_NONE; + protected int checkParentPermission = RangerConstants.BOOL_NONE; /** * Topologoies */ @@ -152,9 +150,9 @@ public class VXResource extends VXDataObject implements java.io.Serializable { */ public VXResource ( ) { resourceType = AppConstants.RESOURCE_PATH; - isEncrypt = XAConstants.BOOL_FALSE; - isRecursive = XAConstants.BOOL_NONE; - checkParentPermission = XAConstants.BOOL_NONE; + isEncrypt = RangerConstants.BOOL_FALSE; + isRecursive = RangerConstants.BOOL_NONE; + checkParentPermission = RangerConstants.BOOL_NONE; } /** http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java index 3a639b7..7a49c0a 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java index 1176a11..2451afd 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java @@ -24,14 +24,12 @@ * */ -import java.util.*; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.view.ViewBaseBean; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXString.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXString.java b/security-admin/src/main/java/org/apache/ranger/view/VXString.java index 1515f25..bd52ff7 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXString.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXString.java @@ -24,14 +24,10 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.view.ViewBaseBean; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java index f096bfb..4d830e2 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java index 00f2bf2..6ee1394 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java @@ -24,14 +24,9 @@ * */ -import java.util.*; +import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.*; - -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.RangerConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; @@ -49,7 +44,7 @@ public class VXTrxLog extends VXDataObject implements java.io.Serializable { * Name of the class to which the object id belongs to * This attribute is of type enum CommonEnums::ClassTypes */ - protected int objectClassType = XAConstants.CLASS_TYPE_NONE; + protected int objectClassType = RangerConstants.CLASS_TYPE_NONE; /** * Id of the object to which this notes refers to */ @@ -107,7 +102,7 @@ public class VXTrxLog extends VXDataObject implements java.io.Serializable { * Default constructor. This will set all the attributes to default value. */ public VXTrxLog ( ) { - objectClassType = XAConstants.CLASS_TYPE_NONE; + objectClassType = RangerConstants.CLASS_TYPE_NONE; } /** http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java index 6a40118..ab4ffd0 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java @@ -19,11 +19,14 @@ package org.apache.ranger.view; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXUser.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java index 3324986..a237377 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java @@ -24,14 +24,11 @@ * */ -import java.util.*; +import java.util.Collection; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.*; -import org.apache.ranger.common.view.*; -import org.apache.ranger.json.JsonDateSerializer; -import org.apache.ranger.view.*; +import org.apache.ranger.common.AppConstants; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.annotate.JsonIgnoreProperties; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java index a1b403e..2e5b9b1 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java @@ -24,11 +24,14 @@ * */ -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import javax.xml.bind.annotation.*; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; -import org.apache.ranger.common.view.*; +import org.apache.ranger.common.view.VList; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/resources/conf.dist/security-applicationContext.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml index 908dd6e..5a210db 100644 --- a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml +++ b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml @@ -99,30 +99,30 @@ http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd";> </beans:property> </beans:bean> - <beans:bean id="customUsernamePasswordAuthenticationFilter" class="org.apache.ranger.security.web.filter.XAUsernamePasswordAuthenticationFilter"> + <beans:bean id="customUsernamePasswordAuthenticationFilter" class="org.apache.ranger.security.web.filter.RangerUsernamePasswordAuthenticationFilter"> <beans:property name="authenticationManager" ref="authenticationManager"/> <beans:property name="authenticationSuccessHandler" ref="ajaxAuthSuccessHandler"/> <beans:property name="authenticationFailureHandler" ref="ajaxAuthFailureHandler"/> <!-- beans:property name="rememberMeServices" ref="rememberMeServices"/ --> </beans:bean> - <beans:bean id="authenticationProcessingFilterEntryPoint" class="org.apache.ranger.security.web.authentication.XAAuthenticationEntryPoint"> + <beans:bean id="authenticationProcessingFilterEntryPoint" class="org.apache.ranger.security.web.authentication.RangerAuthenticationEntryPoint"> <beans:property name="loginFormUrl" value="/login.jsp"/> <beans:property name="forceHttps" value="false"/> </beans:bean> - <beans:bean id="ajaxAuthSuccessHandler" class="org.apache.ranger.security.web.authentication.XAAuthSuccessHandler"> + <beans:bean id="ajaxAuthSuccessHandler" class="org.apache.ranger.security.web.authentication.RangerAuthSuccessHandler"> <beans:property name="defaultTargetUrl" value="/dashboard.jsp"/> </beans:bean> - <beans:bean id="ajaxAuthFailureHandler" class="org.apache.ranger.security.web.authentication.XAAuthFailureHandler"> + <beans:bean id="ajaxAuthFailureHandler" class="org.apache.ranger.security.web.authentication.RangerAuthFailureHandler"> <beans:property name="defaultFailureUrl" value="/public/failedLogin.jsp?login_error=1"/> </beans:bean> <beans:bean id="customLogoutSuccessHandler" class="org.apache.ranger.security.web.authentication.CustomLogoutSuccessHandler"> </beans:bean> - <beans:bean id="userContextFormationFilter" class="org.apache.ranger.security.web.filter.XASecurityContextFormationFilter"/> + <beans:bean id="userContextFormationFilter" class="org.apache.ranger.security.web.filter.RangerSecurityContextFormationFilter"/> <security:jdbc-user-service id="userService" data-source-ref="defaultDataSource" users-by-username-query="select LOGIN_ID,PASSWORD,STATUS from x_portal_user where LOGIN_ID=? and STATUS = 1" http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/WEB-INF/web.xml b/security-admin/src/main/webapp/WEB-INF/web.xml index a3805c8..cbd5724 100644 --- a/security-admin/src/main/webapp/WEB-INF/web.xml +++ b/security-admin/src/main/webapp/WEB-INF/web.xml @@ -56,11 +56,11 @@ </init-param> <init-param> <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name> - <param-value>org.apache.ranger.service.filter.XARESTAPIFilter</param-value> + <param-value>org.apache.ranger.service.filter.RangerRESTAPIFilter</param-value> </init-param> <init-param> <param-name>com.sun.jersey.spi.container.ContainerResponseFilters</param-name> - <param-value>org.apache.ranger.service.filter.XARESTAPIFilter</param-value> + <param-value>org.apache.ranger.service.filter.RangerRESTAPIFilter</param-value> </init-param> <init-param> <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java index 084a142..f6bee3b 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java @@ -27,19 +27,16 @@ import java.util.Map; import javax.ws.rs.WebApplicationException; -import org.apache.ranger.biz.AssetConnectionMgr; -import org.apache.ranger.biz.AssetMgr; -import org.apache.ranger.biz.XABizUtil; import org.apache.ranger.common.AppConstants; import org.apache.ranger.common.ContextUtil; import org.apache.ranger.common.JSONUtil; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.RESTErrorUtil; +import org.apache.ranger.common.RangerCommonEnums; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.StringUtil; import org.apache.ranger.common.UserSessionBase; -import org.apache.ranger.common.XACommonEnums; -import org.apache.ranger.db.XADaoManager; +import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.db.XXAssetDao; import org.apache.ranger.db.XXResourceDao; import org.apache.ranger.db.XXUserDao; @@ -47,8 +44,8 @@ import org.apache.ranger.entity.XXAsset; import org.apache.ranger.entity.XXPortalUser; import org.apache.ranger.entity.XXResource; import org.apache.ranger.entity.XXUser; -import org.apache.ranger.security.context.XAContextHolder; -import org.apache.ranger.security.context.XASecurityContext; +import org.apache.ranger.security.context.RangerContextHolder; +import org.apache.ranger.security.context.RangerSecurityContext; import org.apache.ranger.service.XAssetService; import org.apache.ranger.service.XAuditMapService; import org.apache.ranger.service.XPermMapService; @@ -97,7 +94,7 @@ public class TestAssetMgr { StringUtil stringUtil; @Mock - XADaoManager xADaoManager; + RangerDaoManager rangerDaoManager; @Mock XResourceService xResourceService; @@ -112,7 +109,7 @@ public class TestAssetMgr { XAuditMapService xAuditMapService; @Mock - XABizUtil xaBizUtil; + RangerBizUtil xaBizUtil; @Mock AssetConnectionMgr assetConnectionMgr; @@ -124,18 +121,18 @@ public class TestAssetMgr { public ExpectedException thrown = ExpectedException.none(); public void setup(){ - XASecurityContext context = new XASecurityContext(); + RangerSecurityContext context = new RangerSecurityContext(); context.setUserSession(new UserSessionBase()); - XAContextHolder.setSecurityContext(context); + RangerContextHolder.setSecurityContext(context); UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession(); currentUserSession.setUserAdmin(true); } @Test public void testCreateXAssetForNoUserSession(){ - XASecurityContext context = new XASecurityContext(); + RangerSecurityContext context = new RangerSecurityContext(); context.setUserSession(new UserSessionBase()); - XAContextHolder.setSecurityContext(context); + RangerContextHolder.setSecurityContext(context); XXPortalUser portalUser = new XXPortalUser(); portalUser.setId(id); UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession(); @@ -171,7 +168,7 @@ public class TestAssetMgr { vXResource.setAuditList(new ArrayList<VXAuditMap>()); Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource); XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); - Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser); VXUser vxUser = new VXUser(); Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser); @@ -201,10 +198,10 @@ public class TestAssetMgr { XXAsset xxAsset = new XXAsset(); XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class); XXAssetDao xxAssetDao = Mockito.mock(XXAssetDao.class); - Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao); + Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao); Mockito.when(xxAssetDao.getById(vXAsset.getId())).thenReturn(xxAsset); Mockito.when(xAssetService.updateResource((VXAsset)Mockito.anyObject())).thenReturn(vXAssetDB); - Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao); + Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao); List<XXResource> lst = new ArrayList<XXResource>(); Mockito.when(xxResourceDao.findByResourceNameAndAssetIdAndRecursiveFlag(Mockito.anyString(),Mockito.anyLong(), Mockito.anyInt())).thenReturn(lst ); @@ -235,7 +232,7 @@ public class TestAssetMgr { vXResource.setAuditList(new ArrayList<VXAuditMap>()); Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource); XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); - Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser); VXUser vxUser = new VXUser(); Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser); @@ -278,7 +275,7 @@ public class TestAssetMgr { vXResource.setAuditList(new ArrayList<VXAuditMap>()); Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource); XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); - Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser); VXUser vxUser = new VXUser(); Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser); @@ -321,7 +318,7 @@ public class TestAssetMgr { vXResource.setAuditList(new ArrayList<VXAuditMap>()); Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource); XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); - Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser); VXUser vxUser = new VXUser(); Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser); @@ -364,7 +361,7 @@ public class TestAssetMgr { vXResource.setAuditList(new ArrayList<VXAuditMap>()); Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource); XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); - Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser); VXUser vxUser = new VXUser(); Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser); @@ -402,7 +399,7 @@ public class TestAssetMgr { XXAsset xxAsset = new XXAsset(); VXResponse vXResponse = new VXResponse(); - Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao); + Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao); Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset); Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]); Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse); @@ -435,7 +432,7 @@ public class TestAssetMgr { XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class); XXResource xxResource = new XXResource(); Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb); - Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao); + Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao); Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource); VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb); @@ -472,7 +469,7 @@ public class TestAssetMgr { Mockito.when(stringUtil.split("", ",")).thenReturn(new String[0]); VXResponse vXResponse = new VXResponse(); - Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao); + Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao); Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset); Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]); Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse); @@ -505,7 +502,7 @@ public class TestAssetMgr { XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class); XXResource xxResource = new XXResource(); Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb); - Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao); + Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao); Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource); VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb); @@ -541,7 +538,7 @@ public class TestAssetMgr { Mockito.when(stringUtil.split("", ",")).thenReturn(new String[0]); VXResponse vXResponse = new VXResponse(); - Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao); + Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao); Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset); Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]); Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse); @@ -574,7 +571,7 @@ public class TestAssetMgr { XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class); XXResource xxResource = new XXResource(); Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb); - Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao); + Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao); Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource); VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb); @@ -610,7 +607,7 @@ public class TestAssetMgr { Mockito.when(stringUtil.split("", ",")).thenReturn(new String[0]); VXResponse vXResponse = new VXResponse(); - Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao); + Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao); Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset); Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]); Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse); @@ -643,7 +640,7 @@ public class TestAssetMgr { XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class); XXResource xxResource = new XXResource(); Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb); - Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao); + Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao); Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource); VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb); @@ -664,10 +661,10 @@ public class TestAssetMgr { setup(); VXAsset vXAsset = new VXAsset(); vXAsset.setId(hiveAssetId); - vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED); + vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED); Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset); assetMgr.deleteXAsset(hiveAssetId, true); - Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED); + Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED); } @Test @@ -675,10 +672,10 @@ public class TestAssetMgr { setup(); VXAsset vXAsset = new VXAsset(); vXAsset.setId(hbaseAssetId); - vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED); + vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED); Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset); assetMgr.deleteXAsset(hbaseAssetId, true); - Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED); + Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED); } @Test @@ -686,10 +683,10 @@ public class TestAssetMgr { setup(); VXAsset vXAsset = new VXAsset(); vXAsset.setId(knoxAssetId); - vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED); + vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED); Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset); assetMgr.deleteXAsset(knoxAssetId, true); - Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED); + Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED); } @Test @@ -697,10 +694,10 @@ public class TestAssetMgr { setup(); VXAsset vXAsset = new VXAsset(); vXAsset.setId(stormAssetId); - vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED); + vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED); Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset); assetMgr.deleteXAsset(stormAssetId, true); - Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED); + Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED); } private VXResource createVXResource(String assetTypeName, Long assetId, int assetType, int resourceType){ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java new file mode 100644 index 0000000..b7bc416 --- /dev/null +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java @@ -0,0 +1,547 @@ +/* + * 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.biz; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.ranger.common.AppConstants; +import org.apache.ranger.common.ContextUtil; +import org.apache.ranger.common.RangerCommonEnums; +import org.apache.ranger.common.RangerConstants; +import org.apache.ranger.common.StringUtil; +import org.apache.ranger.common.UserSessionBase; +import org.apache.ranger.common.db.BaseDao; +import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.db.XXAssetDao; +import org.apache.ranger.db.XXPortalUserDao; +import org.apache.ranger.db.XXResourceDao; +import org.apache.ranger.db.XXUserDao; +import org.apache.ranger.entity.XXAsset; +import org.apache.ranger.entity.XXDBBase; +import org.apache.ranger.entity.XXPortalUser; +import org.apache.ranger.entity.XXResource; +import org.apache.ranger.entity.XXUser; +import org.apache.ranger.security.context.RangerContextHolder; +import org.apache.ranger.security.context.RangerSecurityContext; +import org.apache.ranger.view.VXAsset; +import org.apache.ranger.view.VXDataObject; +import org.apache.ranger.view.VXPortalUser; +import org.apache.ranger.view.VXResource; +import org.apache.ranger.view.VXResponse; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class TestRangerBizUtil { + + private Long id = 1L; + private String resourceName = "hadoopdev"; + + @InjectMocks + RangerBizUtil rangerBizUtil = new RangerBizUtil(); + + @Mock + RangerDaoManager daoManager; + + @Mock + StringUtil stringUtil; + + @Before + public void setup(){ + RangerSecurityContext context = new RangerSecurityContext(); + context.setUserSession(new UserSessionBase()); + RangerContextHolder.setSecurityContext(context); + } + + @Test + public void testHasPermission_When_disableAccessControl(){ + VXResource vXResource = null; + rangerBizUtil.enableResourceAccessControl = false; + VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN); + Assert.assertNotNull(resp); + } + + @Test + public void testHasPermission_When_NoResource(){ + VXResource vXResource = null; + VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN); + Assert.assertNotNull(resp); + Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode()); + Assert.assertEquals("Please provide valid policy.", resp.getMsgDesc()); + } + + @Test + public void testHasPermission_emptyResourceName(){ + VXResource vXResource = new VXResource(); + XXPortalUser portalUser = new XXPortalUser(); + XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); + XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class); + XXUser xxUser = new XXUser(); + XXAsset xxAsset = new XXAsset(); + List<XXResource> lst = new ArrayList<XXResource>(); + XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class); + XXAssetDao xxAssetDao = Mockito.mock(XXAssetDao.class); + Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao); + Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(portalUser); + Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser); + Mockito.when(daoManager.getXXResource()).thenReturn(xxResourceDao); + Mockito.when(xxResourceDao.findByAssetIdAndResourceStatus(Mockito.anyLong(),Mockito.anyInt())).thenReturn(lst); + Mockito.when(daoManager.getXXAsset()).thenReturn(xxAssetDao); + Mockito.when(xxAssetDao.getById(Mockito.anyLong())).thenReturn(xxAsset); + VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN); + Mockito.verify(daoManager).getXXPortalUser(); + Mockito.verify(userDao).getById(Mockito.anyLong()); + Mockito.verify(daoManager).getXXUser(); + Mockito.verify(xxUserDao).findByUserName(Mockito.anyString()); + Assert.assertNotNull(resp); + Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode()); + Assert.assertEquals("Permission Denied !", resp.getMsgDesc()); + } + + @Test + public void testHasPermission_isAdmin(){ + VXResource vXResource = new VXResource(); + vXResource.setName(resourceName); + vXResource.setAssetId(id); + UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession(); + currentUserSession.setUserAdmin(true); + VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN); + Assert.assertNotNull(resp); + Assert.assertEquals(VXResponse.STATUS_SUCCESS, resp.getStatusCode()); + } + + @Test + public void testIsNotAdmin(){ + boolean isAdminChk = rangerBizUtil.isAdmin(); + Assert.assertFalse(isAdminChk); + } + + @Test + public void testIsAdmin(){ + UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession(); + currentUserSession.setUserAdmin(true); + boolean isAdminChk = rangerBizUtil.isAdmin(); + Assert.assertTrue(isAdminChk); + } + + @Test + public void testUserSessionNull_forIsAdmin(){ + RangerContextHolder.setSecurityContext(null); + boolean isAdminChk = rangerBizUtil.isAdmin(); + Assert.assertFalse(isAdminChk); + } + + @Test + public void testGetXUserId_NoUserSession(){ + RangerContextHolder.setSecurityContext(null); + Long chk = rangerBizUtil.getXUserId(); + Assert.assertNull(chk); + } + + @Test + public void testGetXUserId_NoUser(){ + RangerSecurityContext context = new RangerSecurityContext(); + context.setUserSession(new UserSessionBase()); + RangerContextHolder.setSecurityContext(context); + XXPortalUser xxPortalUser = new XXPortalUser(); + XXUser xxUser = new XXUser(); + XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); + XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class); + Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao); + Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser); + Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser); + Long chk = rangerBizUtil.getXUserId(); + Mockito.verify(daoManager).getXXPortalUser(); + Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong()); + Mockito.verify(daoManager).getXXUser(); + Mockito.verify(xxUserDao).findByUserName(Mockito.anyString()); + Assert.assertNull(chk); + } + + @Test + public void testGetXUserId(){ + XXPortalUser xxPortalUser = new XXPortalUser(); + xxPortalUser.setId(id); + XXUser xxUser = new XXUser(); + xxUser.setId(id); + XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class); + XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); + RangerSecurityContext context = new RangerSecurityContext(); + UserSessionBase userSessionBase = new UserSessionBase(); + userSessionBase.setUserAdmin(true); + context.setUserSession(userSessionBase); + userSessionBase.setXXPortalUser(xxPortalUser); + RangerContextHolder.setSecurityContext(context); + Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao); + Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser); + Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser); + Long chk = rangerBizUtil.getXUserId(); + Mockito.verify(daoManager).getXXPortalUser(); + Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong()); + Mockito.verify(daoManager).getXXUser(); + Mockito.verify(xxUserDao).findByUserName(Mockito.anyString()); + Assert.assertEquals(chk, id); + } + + @Test + public void testReplaceMetaChars_PathEmpty(){ + String path = ""; + String pathChk = rangerBizUtil.replaceMetaChars(path); + Assert.assertFalse(pathChk.contains("\\*")); + Assert.assertFalse(pathChk.contains("\\?")); + } + + @Test + public void testReplaceMetaChars_NoMetaChars(){ + String path = "\\Demo\\Test"; + String pathChk = rangerBizUtil.replaceMetaChars(path); + Assert.assertFalse(pathChk.contains("\\*")); + Assert.assertFalse(pathChk.contains("\\?")); + } + + @Test + public void testReplaceMetaChars_PathNull(){ + String path = null; + String pathChk = rangerBizUtil.replaceMetaChars(path); + Assert.assertNull(pathChk); + } + + @Test + public void testReplaceMetaChars(){ + String path = "\\Demo\\Test\\*\\?"; + String pathChk = rangerBizUtil.replaceMetaChars(path); + Assert.assertFalse(pathChk.contains("\\*")); + Assert.assertFalse(pathChk.contains("\\?")); + } + + @Test + public void testGeneratePublicName(){ + String firstName = "Test123456789123456789"; + String lastName = "Unit"; + String publicNameChk = rangerBizUtil.generatePublicName(firstName, lastName); + Assert.assertEquals("Test12345678... U.", publicNameChk); + } + + @Test + public void testGeneratePublicName_fNameLessThanMax(){ + String firstName = "Test"; + String lastName = ""; + String publicNameChk = rangerBizUtil.generatePublicName(firstName, lastName); + Assert.assertNull(publicNameChk); + } + + @Test + public void testGeneratePublicName_withPortalUser(){ + VXPortalUser vXPortalUser = new VXPortalUser(); + vXPortalUser.setFirstName("Test"); + vXPortalUser.setLastName(null); + String publicNameChk = rangerBizUtil.generatePublicName(vXPortalUser, null); + Assert.assertNull(publicNameChk); + } + + @Test + public void testGetDisplayName_EmptyName() { + String displayNameChk = rangerBizUtil.getDisplayName(null); + Assert.assertEquals(rangerBizUtil.EMPTY_CONTENT_DISPLAY_NAME, displayNameChk); + } + + @Test + public void testGetDisplayName_AssetName() { + XXAsset obj = new XXAsset(); + obj.setDescription(resourceName); + String displayNameChk = rangerBizUtil.getDisplayName(obj); + Assert.assertEquals(resourceName, displayNameChk); + } + + @Test + public void testGetDisplayName_MoreThanMaxLen() { + XXAsset obj = new XXAsset(); + String name = resourceName; + for(int i=0;i<16;i++){ + name = name + "_" + name + "1"; + } + obj.setDescription(name); + String displayNameChk = rangerBizUtil.getDisplayName(obj); + Assert.assertEquals(displayNameChk.length(), 150); + } + + @Test + public void testGetDisplayNameForClassName(){ + XXAsset obj = new XXAsset(); + String displayNameChk = rangerBizUtil.getDisplayNameForClassName(obj); + Assert.assertEquals("Asset",displayNameChk); + } + + @Test + public void testGetFileNameWithoutExtension(){ + File file = new File("test.txt"); + String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(file); + Assert.assertEquals("test",fileNameChk); + } + + @Test + public void testGetFileNameWithoutExtension_NoFile(){ + String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(null); + Assert.assertNull(fileNameChk); + } + + @Test + public void testGetFileNameWithoutExtension_noExt(){ + File file = new File("test"); + String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(file); + Assert.assertEquals("test",fileNameChk); + } + + @Test + public void testGetImageExtension_TestJPG(){ + String contentType = "img.JPG"; + String extChk = rangerBizUtil.getImageExtension(contentType); + Assert.assertEquals("jpg",extChk); + } + + @Test + public void testGetImageExtension_TestJPEG(){ + String contentType = "img.JPEG"; + String extChk = rangerBizUtil.getImageExtension(contentType); + Assert.assertEquals("jpg",extChk); + } + + @Test + public void testGetImageExtension_TestPNG(){ + String contentType = "img.PNG"; + String extChk = rangerBizUtil.getImageExtension(contentType); + Assert.assertEquals("png",extChk); + } + + @Test + public void testGetImageExtension_NoExt(){ + String contentType = "img"; + String extChk = rangerBizUtil.getImageExtension(contentType); + Assert.assertEquals("",extChk); + } + + @Test + public void testGetMimeType_ForJPG(){ + String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_JPEG); + Assert.assertEquals("jpg",mimeTypeChk); + } + + @Test + public void testGetMimeType_ForPNG(){ + String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_PNG); + Assert.assertEquals("png",mimeTypeChk); + } + + @Test + public void testGetMimeType_ForEmpty(){ + String mimeTypeChk = rangerBizUtil.getMimeType(1); + Assert.assertEquals("",mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_ForUnknow(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt(""); + Assert.assertEquals(RangerConstants.MIME_UNKNOWN, mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_Forjpg(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt("jpg"); + Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_ForJPEG(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt("JPEG"); + Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_EndsWithJPEG(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.jpeg"); + Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_EndsWithJPG(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.jpg"); + Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_EndsWithPNG(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.png"); + Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk); + } + + @Test + public void testGetMimeTypeInt_ForPNG(){ + int mimeTypeChk = rangerBizUtil.getMimeTypeInt("png"); + Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Test + public void testGetMObject(){ + BaseDao baseDao = Mockito.mock(BaseDao.class); + Mockito.when(daoManager.getDaoForClassType(RangerCommonEnums.CLASS_TYPE_USER_PROFILE)).thenReturn(baseDao); + Mockito.when(baseDao.getById(id)).thenReturn(new XXAsset()); + XXDBBase mObjChk = rangerBizUtil.getMObject(RangerCommonEnums.CLASS_TYPE_USER_PROFILE,id); + Assert.assertNotNull(mObjChk); + } + + @Test + public void testGetMObject_NoObjId(){ + XXDBBase mObjChk = rangerBizUtil.getMObject(RangerCommonEnums.CLASS_TYPE_USER_PROFILE,null); + Assert.assertNull(mObjChk); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Test + public void testGetMObject_VXDataObject(){ + VXAsset vXDataObject = new VXAsset(); + vXDataObject.setId(id); + BaseDao baseDao = Mockito.mock(BaseDao.class); + Mockito.when(daoManager.getDaoForClassType(vXDataObject.getMyClassType())).thenReturn(baseDao); + Mockito.when(baseDao.getById(vXDataObject.getId())).thenReturn(new XXAsset()); + XXDBBase xXDBaseChk = rangerBizUtil.getMObject(vXDataObject); + Assert.assertNotNull(xXDBaseChk); + } + + @Test + public void testGetMObject_NOVXDataObject(){ + XXDBBase xXDBaseChk = rangerBizUtil.getMObject(null); + Assert.assertNull(xXDBaseChk); + } + + @Test + public void testGetVObject_NOObjId(){ + VXDataObject objchk = rangerBizUtil.getVObject(RangerConstants.CLASS_TYPE_USER_PROFILE, null); + Assert.assertNull(objchk); + } + + @Test + public void testMatchHdfsPolicy_NoResourceName(){ + boolean bnlChk = rangerBizUtil.matchHbasePolicy(null, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN); + Assert.assertFalse(bnlChk); + } + + @Test + public void testMatchHdfsPolicy_NoResourceList(){ + boolean bnlChk = rangerBizUtil.matchHbasePolicy(resourceName, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN); + Assert.assertFalse(bnlChk); + } + + @Test + public void testMatchHdfsPolicy_NoUserId(){ + VXResponse vXResponse = new VXResponse(); + List<XXResource> xResourceList = new ArrayList<XXResource>(); + XXResource xXResource = new XXResource(); + xXResource.setId(id); + xXResource.setName(resourceName); + xXResource.setIsRecursive(AppConstants.BOOL_TRUE); + xXResource.setResourceStatus(AppConstants.STATUS_ENABLED); + xResourceList.add(xXResource); + boolean bnlChk = rangerBizUtil.matchHbasePolicy(resourceName, xResourceList, vXResponse, null, AppConstants.XA_PERM_TYPE_UNKNOWN); + Assert.assertFalse(bnlChk); + } + + @Test + public void testMatchHdfsPolicy_NoPremission(){ + VXResponse vXResponse = new VXResponse(); + List<XXResource> xResourceList = new ArrayList<XXResource>(); + XXResource xXResource = new XXResource(); + xXResource.setId(id); + xXResource.setName(resourceName); + xXResource.setIsRecursive(AppConstants.BOOL_TRUE); + xXResource.setResourceStatus(AppConstants.STATUS_ENABLED); + xResourceList.add(xXResource); + Mockito.when(stringUtil.isEmpty(resourceName)).thenReturn(true); + Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]); + boolean bnlChk = rangerBizUtil.matchHbasePolicy("/*/*/*", xResourceList, vXResponse, id, AppConstants.XA_PERM_TYPE_UNKNOWN); + Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString()); + Assert.assertFalse(bnlChk); + } + + @Test + public void testMatchHivePolicy_NoResourceName(){ + boolean bnlChk = rangerBizUtil.matchHivePolicy(null, null, null, 0); + Assert.assertFalse(bnlChk); + + } + + @Test + public void testMatchHivePolicy_NoResourceList(){ + boolean bnlChk = rangerBizUtil.matchHivePolicy(resourceName, null, null, 0); + Assert.assertFalse(bnlChk); + + } + + @Test + public void testMatchHivePolicy_NoUserId(){ + List<XXResource> xResourceList = new ArrayList<XXResource>(); + XXResource xXResource = new XXResource(); + xXResource.setId(id); + xXResource.setName(resourceName); + xXResource.setIsRecursive(AppConstants.BOOL_TRUE); + xXResource.setResourceStatus(AppConstants.STATUS_ENABLED); + xResourceList.add(xXResource); + boolean bnlChk = rangerBizUtil.matchHivePolicy(resourceName, xResourceList, null, 0); + Assert.assertFalse(bnlChk); + + } + + @Test + public void testMatchHivePolicy_NoPremission(){ + List<XXResource> xResourceList = new ArrayList<XXResource>(); + XXResource xXResource = new XXResource(); + xXResource.setId(id); + xXResource.setName(resourceName); + xXResource.setIsRecursive(AppConstants.BOOL_TRUE); + xXResource.setResourceStatus(AppConstants.STATUS_ENABLED); + xResourceList.add(xXResource); + Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]); + boolean bnlChk = rangerBizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 0); + Assert.assertFalse(bnlChk); + } + + @Test + public void testMatchHivePolicy(){ + List<XXResource> xResourceList = new ArrayList<XXResource>(); + XXResource xXResource = new XXResource(); + xXResource.setId(5L); + xXResource.setName(resourceName); + xXResource.setIsRecursive(AppConstants.BOOL_TRUE); + xXResource.setResourceStatus(AppConstants.STATUS_ENABLED); + xResourceList.add(xXResource); + Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]); + boolean bnlChk = rangerBizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 17); + Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString()); + Assert.assertFalse(bnlChk); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java index 41d9c4e..c514bfb 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java @@ -24,26 +24,23 @@ import javax.persistence.EntityManager; import javax.persistence.Query; import javax.ws.rs.WebApplicationException; -import org.apache.ranger.biz.UserMgr; -import org.apache.ranger.biz.XABizUtil; import org.apache.ranger.common.ContextUtil; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.RESTErrorUtil; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.StringUtil; import org.apache.ranger.common.UserSessionBase; -import org.apache.ranger.db.XADaoManager; +import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.db.XXPortalUserDao; import org.apache.ranger.db.XXPortalUserRoleDao; import org.apache.ranger.entity.XXPortalUser; import org.apache.ranger.entity.XXPortalUserRole; -import org.apache.ranger.security.context.XAContextHolder; -import org.apache.ranger.security.context.XASecurityContext; +import org.apache.ranger.security.context.RangerContextHolder; +import org.apache.ranger.security.context.RangerSecurityContext; import org.apache.ranger.view.VXPasswordChange; import org.apache.ranger.view.VXPortalUser; import org.apache.ranger.view.VXPortalUserList; import org.apache.ranger.view.VXResponse; -import org.apache.ranger.view.VXString; import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Rule; @@ -69,7 +66,7 @@ public class TestUserMgr { VXPortalUser VXPortalUser; @Mock - XADaoManager daoManager; + RangerDaoManager daoManager; @Mock RESTErrorUtil restErrorUtil; @@ -81,15 +78,15 @@ public class TestUserMgr { StringUtil stringUtil; @Mock - XABizUtil msBizUtil; + RangerBizUtil msBizUtil; @Rule public ExpectedException thrown = ExpectedException.none(); public void setup() { - XASecurityContext context = new XASecurityContext(); + RangerSecurityContext context = new RangerSecurityContext(); context.setUserSession(new UserSessionBase()); - XAContextHolder.setSecurityContext(context); + RangerContextHolder.setSecurityContext(context); UserSessionBase currentUserSession = ContextUtil .getCurrentUserSession(); currentUserSession.setUserAdmin(true);
