You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2023/03/14 05:28:35 UTC
[ranger] 03/03: RANGER-4127: Unable to delete the user if policy is created by same user and added in the policy item
This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch ranger-2.4
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 262d53cc2ce6bd21bf0493451e605a9990a405e9
Author: Pradeep AgrawaL <pr...@apache.org>
AuthorDate: Thu Mar 9 14:35:17 2023 +0530
RANGER-4127: Unable to delete the user if policy is created by same user and added in the policy item
---
security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
index 2955bd513..e23fe6327 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
@@ -2275,7 +2275,6 @@ public class XUserMgr extends XUserMgrBase {
List<XXPortalUserRole> xXPortalUserRoles=xXPortalUserRoleDao.findByUserId(xXPortalUserId);
XXPolicyDao xXPolicyDao = daoManager.getXXPolicy();
- List<XXPolicy> xXPolicyList=xXPolicyDao.findByUserId(id);
logger.warn("Deleting User : "+vXUser.getName());
if (force) {
//delete XXGroupUser mapping
@@ -2327,6 +2326,7 @@ public class XUserMgr extends XUserMgrBase {
}
}
//delete XXPolicyItemUserPerm records of user
+ List<XXPolicy> xXPolicyList=xXPolicyDao.findByUserId(id);
for(XXPolicy xXPolicy:xXPolicyList){
RangerPolicy rangerPolicy = policyService.getPopulatedViewObject(xXPolicy);
List<RangerPolicyItem> policyItems = rangerPolicy.getPolicyItems();
@@ -2376,7 +2376,7 @@ public class XUserMgr extends XUserMgrBase {
}
} else {
boolean hasReferences=false;
-
+ List<XXPolicy> xXPolicyList=xXPolicyDao.findByUserId(id);
if(vxGroupUserList!=null && vxGroupUserList.getListSize()>0){
hasReferences=true;
}