Skip to content
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

Jump to bottom

Fix user's list of roles audience issue #510

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Fix user's list of roles audience issue #510

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
68 changes: 35 additions & 33 deletions ...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3905,8 +3905,10 @@ private User getSCIMUser(org.wso2.carbon.user.core.common.User coreUser, List<St
groupsList = addDomainToNames(userStoreDomainName, groupsList);

// Get user roles from attributes.
rolesList = getMultiValuedAttributeList(userStoreDomainName, attributes,
SCIMConstants.UserSchemaConstants.ROLES_URI + "." + SCIMConstants.DEFAULT);
if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
rolesList = getMultiValuedAttributeList(userStoreDomainName, attributes,
SCIMConstants.UserSchemaConstants.ROLES_URI + "." + SCIMConstants.DEFAULT);
}

// Skip groups and roles claims because they are handled separately.
filterAttributes(attributes, Arrays.asList(SCIMConstants.UserSchemaConstants.ROLES_URI, SCIMConstants.
Expand Down Expand Up @@ -4228,48 +4230,48 @@ private void setRolesOfUser(List<String> rolesOfUser, Map<String, Group> groupMe
IdentitySCIMException, BadRequestException {

// Add roles of user.
for (String roleName : rolesOfUser) {
if (CarbonConstants.REGISTRY_ANONNYMOUS_ROLE_NAME.equalsIgnoreCase(roleName)) {
// Carbon specific roles do not possess SCIM info, hence skipping them.
continue;
}
if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
for (String roleName : rolesOfUser) {
if (CarbonConstants.REGISTRY_ANONNYMOUS_ROLE_NAME.equalsIgnoreCase(roleName)) {
// Carbon specific roles do not possess SCIM info, hence skipping them.
continue;
}

Group groupObject = groupMetaAttributesCache.get(roleName);
if (groupObject == null && !groupMetaAttributesCache.containsKey(roleName)) {
/*
* Here getGroupOnlyWithMetaAttributes used to get role names. Group attributes will be retrieved
* from the userstore.
*/
groupObject = getGroupOnlyWithMetaAttributes(roleName);
groupMetaAttributesCache.put(roleName, groupObject);
}
Group groupObject = groupMetaAttributesCache.get(roleName);
if (groupObject == null && !groupMetaAttributesCache.containsKey(roleName)) {
/*
* Here getGroupOnlyWithMetaAttributes used to get role names. Group attributes will be retrieved
* from the userstore.
*/
groupObject = getGroupOnlyWithMetaAttributes(roleName);
groupMetaAttributesCache.put(roleName, groupObject);
}

if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
Role role = new Role();
role.setDisplayName(removeInternalDomain(groupObject.getDisplayName()));
role.setId(groupObject.getId());
String location = SCIMCommonUtils.getSCIMRoleURL(groupObject.getId());
role.setLocation(location);
scimUser.setRole(role);
} else {
RoleV2 role = new RoleV2();
role.setDisplayName(removeInternalDomain(groupObject.getDisplayName()));
role.setId(groupObject.getId());
String location = SCIMCommonUtils.getSCIMRoleV2URL(groupObject.getId());
role.setLocation(location);
try {
org.wso2.carbon.identity.role.v2.mgt.core.model.RoleBasicInfo roleBasicInfo =
SCIMCommonComponentHolder.getRoleManagementServiceV2()
.getRoleBasicInfoById(groupObject.getId(), tenantDomain);
}
} else {
try {
List<RoleBasicInfo> roles = SCIMCommonComponentHolder.getRoleManagementServiceV2()
.getRoleListOfUser(user.getUserID(), tenantDomain);
for (RoleBasicInfo roleBasicInfo : roles) {
RoleV2 role = new RoleV2();
role.setDisplayName(roleBasicInfo.getName());
role.setId(roleBasicInfo.getId());
String location = SCIMCommonUtils.getSCIMRoleV2URL(roleBasicInfo.getId());
role.setLocation(location);
role.setAudience(roleBasicInfo.getAudienceId(), roleBasicInfo.getAudienceName(),
roleBasicInfo.getAudience());
} catch (IdentityRoleManagementException e) {
if (log.isDebugEnabled()) {
log.debug("Failed to resolve the audience for role id: " + groupObject.getId(), e);
}
return;
scimUser.setRoleV2(role);
}
} catch (IdentityRoleManagementException e) {
if (log.isDebugEnabled()) {
log.debug("Failed to retrieve roles for user : " + user.getUserID(), e);
}
scimUser.setRoleV2(role);
}
}
}
Expand Down
Loading