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 admin role mandatory attribute update #497

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Fix admin role mandatory attribute update #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57b937a
Fix admin role mandatory attribute update
shashimalcse Oct 26, 2023
34fb0c3
fix formatting
shashimalcse Oct 26, 2023
e5dad25
fix formatting
shashimalcse Oct 26, 2023
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
60 changes: 60 additions & 0 deletions ...m2.common/src/main/java/org/wso2/carbon/identity/scim2/common/group/SCIMGroupHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,18 @@

package org.wso2.carbon.identity.scim2.common.group;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
import org.wso2.carbon.identity.role.v2.mgt.core.RoleConstants;
import org.wso2.carbon.identity.role.v2.mgt.core.exception.IdentityRoleManagementException;
import org.wso2.carbon.identity.scim2.common.DAO.GroupDAO;
import org.wso2.carbon.identity.scim2.common.exceptions.IdentitySCIMException;
import org.wso2.carbon.identity.scim2.common.internal.SCIMCommonComponentHolder;
import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils;
import org.wso2.carbon.user.core.util.UserCoreUtil;
import org.wso2.charon3.core.exceptions.BadRequestException;
import org.wso2.charon3.core.exceptions.CharonException;
import org.wso2.charon3.core.objects.Group;
Expand Down Expand Up @@ -76,6 +83,59 @@ public void addMandatoryAttributes(String groupName)
groupDAO.addSCIMGroupAttributes(tenantId, groupName, attributes);
}

/**
* Add admin role attributes.
*
* @param roleName Role name.
* @throws IdentitySCIMException if any error occurs while adding admin role attributes.
*/
public void addAdminRoleMandatoryAttributes(String roleName) throws IdentitySCIMException {

Map<String, String> attributes = new HashMap<>();
String tenantDomain = IdentityTenantUtil.getTenantDomain(tenantId);
String id;
try {
id = SCIMCommonComponentHolder.getRoleManagementServiceV2().getRoleIdByName(
UserCoreUtil.removeDomainFromName(roleName), RoleConstants.ORGANIZATION,
getOrganizationId(tenantDomain), tenantDomain);
} catch (IdentityRoleManagementException e) {
throw new IdentitySCIMException("Error while resolving admin role id", e);
}
if (StringUtils.isBlank(id)) {
id = UUID.randomUUID().toString();
}
attributes.put(SCIMConstants.CommonSchemaConstants.ID_URI, id);

String createdDate = AttributeUtil.formatDateTime(Instant.now());
attributes.put(SCIMConstants.CommonSchemaConstants.CREATED_URI, createdDate);

attributes.put(SCIMConstants.CommonSchemaConstants.LAST_MODIFIED_URI, createdDate);
attributes.put(SCIMConstants.CommonSchemaConstants.LOCATION_URI, SCIMCommonUtils.getSCIMGroupURL(id));
GroupDAO groupDAO = new GroupDAO();
groupDAO.addSCIMGroupAttributes(tenantId, roleName, attributes);
}

/**
* Get the organization id of the tenant.
*
* @param tenantDomain Tenant domain.
* @return Organization id.
* @throws IdentitySCIMException if any error occurs while resolving organization id.
*/
private String getOrganizationId(String tenantDomain) throws IdentitySCIMException {

String orgId;
try {
orgId = SCIMCommonComponentHolder.getOrganizationManager().resolveOrganizationId(tenantDomain);
} catch (OrganizationManagementException e) {
throw new IdentitySCIMException("Error while resolving org id of tenant : " + tenantDomain, e);
}
if (StringUtils.isBlank(orgId)) {
throw new IdentitySCIMException("Organization id not found for tenant : " + tenantDomain);
}
return orgId;
}

/**
* Retrieve the group attributes by group name
*
Expand Down
16 changes: 16 additions & 0 deletions ...mon/src/main/java/org/wso2/carbon/identity/scim2/common/internal/SCIMCommonComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.wso2.carbon.identity.core.util.IdentityCoreInitializedEvent;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.event.handler.AbstractEventHandler;
import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
import org.wso2.carbon.identity.role.mgt.core.RoleManagementService;
import org.wso2.carbon.identity.scim2.common.extenstion.SCIMUserStoreErrorResolver;
import org.wso2.carbon.identity.scim2.common.handlers.SCIMClaimOperationEventHandler;
Expand Down Expand Up @@ -315,6 +316,21 @@ protected void unsetScimUserStoreErrorResolver(SCIMUserStoreErrorResolver scimUs
SCIMCommonComponentHolder.removeScimUserStoreErrorResolver(scimUserStoreErrorResolver);
}

@Reference(name = "identity.organization.management.component",
service = OrganizationManager.class,
cardinality = ReferenceCardinality.MANDATORY,
policy = ReferencePolicy.DYNAMIC,
unbind = "unsetOrganizationManager")
protected void setOrganizationManager(OrganizationManager organizationManager) {

SCIMCommonComponentHolder.setOrganizationManager(organizationManager);
}

protected void unsetOrganizationManager(OrganizationManager organizationManager) {

SCIMCommonComponentHolder.setOrganizationManager(null);
}

@Deactivate
protected void deactivate(ComponentContext context) {

Expand Down
23 changes: 23 additions & 0 deletions ...c/main/java/org/wso2/carbon/identity/scim2/common/internal/SCIMCommonComponentHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.wso2.carbon.identity.scim2.common.internal;

import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService;
import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
import org.wso2.carbon.identity.scim2.common.extenstion.SCIMUserStoreErrorResolver;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.mgt.RolePermissionManagementService;
Expand All @@ -39,6 +40,7 @@ public class SCIMCommonComponentHolder {
private static RolePermissionManagementService rolePermissionManagementService;
private static RoleManagementService roleManagementService;
private static org.wso2.carbon.identity.role.v2.mgt.core.RoleManagementService roleManagementServiceV2;
private static OrganizationManager organizationManager;
private static final List<SCIMUserStoreErrorResolver> scimUserStoreErrorResolvers = new ArrayList<>();

/**
Expand Down Expand Up @@ -142,6 +144,27 @@ public static org.wso2.carbon.identity.role.v2.mgt.core.RoleManagementService ge
return roleManagementServiceV2;
}


/**
* Get {@link OrganizationManager}.
*
* @return organization manager instance {@link OrganizationManager}.
*/
public static OrganizationManager getOrganizationManager() {

return organizationManager;
}

/**
* Set {@link OrganizationManager}.
*
* @param organizationManager Instance of {@link OrganizationManager}.
*/
public static void setOrganizationManager(OrganizationManager organizationManager) {

SCIMCommonComponentHolder.organizationManager = organizationManager;
}

public static List<SCIMUserStoreErrorResolver> getScimUserStoreErrorResolverList() {

return scimUserStoreErrorResolvers;
Expand Down
2 changes: 1 addition & 1 deletion ....common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public static void updateAdminGroup(int tenantId) {
log.debug(
"Group does not exist, setting scim attribute group value: " + roleNameWithDomain);
}
scimGroupHandler.addMandatoryAttributes(roleNameWithDomain);
scimGroupHandler.addAdminRoleMandatoryAttributes(roleNameWithDomain);
}

// Adding the SCIM attributes for admin group
Expand Down
2 changes: 1 addition & 1 deletion ...mon/src/test/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public void testUpdateAdminGroup(String domainName) throws Exception {

ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
adminAttributeUtil.updateAdminGroup(1);
verify(scimGroupHandler).addMandatoryAttributes(argument.capture());
verify(scimGroupHandler).addAdminRoleMandatoryAttributes(argument.capture());

assertEquals(argument.getValue(), roleNameWithDomain);
}
Expand Down
Loading