Skip to content

RANGER-5624: Fix inconsistent updatedBy masking in get groups/groupName #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krishnamuttevi wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −50
Open

RANGER-5624: Fix inconsistent updatedBy masking in get groups/groupName #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.apache.ranger.common.annotation.RangerAnnotationClassName;
import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXService;
import org.apache.ranger.entity.XXServiceDef;
import org.apache.ranger.plugin.model.RangerPluginInfo;
Expand Down Expand Up @@ -855,29 +854,8 @@ public VXUser getXUserByUserName(@Context HttpServletRequest request, @PathParam
@PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.GET_X_GROUP_BY_GROUP_NAME + "\")")
public VXGroup getXGroupByGroupName(@Context HttpServletRequest request, @PathParam("groupName") String groupName) {
VXGroup vXGroup = xGroupService.getGroupByGroupName(groupName);
UserSessionBase userSession = ContextUtil.getCurrentUserSession();

if (userSession != null && userSession.getLoginId() != null && userSession.getUserRoleList().contains(RangerConstants.ROLE_USER)) {
VXUser loggedInVXUser = xUserService.getXUserByUserName(userSession.getLoginId());
boolean isMatch = false;

if (loggedInVXUser != null && vXGroup != null) {
List<XXGroup> userGroups = xGroupService.getGroupsByUserId(loggedInVXUser.getId());

for (XXGroup xXGroup : userGroups) {
if (xXGroup != null && StringUtils.equals(xXGroup.getName(), vXGroup.getName())) {
isMatch = true;
break;
}
}
}

if (!isMatch) {
vXGroup = null;
}
}

return vXGroup;
Long id = vXGroup.getId();
return xUserMgr.getXGroup(id);
}

@DELETE
Expand Down
30 changes: 4 additions & 26 deletions security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,18 +692,15 @@ public void test62getXUserByUserName() {

@Test
public void test63getXGroupByGroupName() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);

VXGroup compareTestVXGroup = createVXGroup();

Mockito.when(xGroupService.getGroupByGroupName(compareTestVXGroup.getName())).thenReturn(compareTestVXGroup);

Mockito.when(xUserMgr.getXGroup(compareTestVXGroup.getId())).thenReturn(compareTestVXGroup);
VXGroup retVxGroup = xUserRest.getXGroupByGroupName(request, compareTestVXGroup.getName());

Assertions.assertNotNull(retVxGroup);
Assertions.assertEquals(compareTestVXGroup.getClass(), compareTestVXGroup.getClass());
Assertions.assertEquals(compareTestVXGroup.getId(), compareTestVXGroup.getId());
Assertions.assertEquals(compareTestVXGroup.getId(), retVxGroup.getId());
Assertions.assertEquals(compareTestVXGroup.getName(), retVxGroup.getName());
Mockito.verify(xGroupService).getGroupByGroupName(compareTestVXGroup.getName());
Mockito.verify(xUserMgr).getXGroup(compareTestVXGroup.getId());
}

@Test
Expand Down Expand Up @@ -2288,25 +2285,6 @@ public void test159getXGroupUsersByGroupNameWithNullResult() {
Mockito.verify(xUserMgr).getXGroupUserFromMap(groupName);
}

@Test
public void test160getXGroupByGroupNameWithNullUser() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
String groupName = "testGroup";
VXGroup vXGroup = createVXGroup();
vXGroup.setName(groupName);

RangerSecurityContext context = new RangerSecurityContext();
context.setUserSession(null);
RangerContextHolder.setSecurityContext(context);

Mockito.when(xGroupService.getGroupByGroupName(groupName)).thenReturn(vXGroup);

VXGroup result = xUserRest.getXGroupByGroupName(request, groupName);

Assertions.assertEquals(vXGroup, result);
Mockito.verify(xGroupService).getGroupByGroupName(groupName);
}

@Test
public void test161getXUserByUserNameWithNullResult() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
Expand Down