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

Improve user delete and update for sub organizations #549

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Improve user delete and update for sub organizations #549

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
18 changes: 18 additions & 0 deletions ...im2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.handler.event.account.lock.constants.AccountConstants;
import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
import org.wso2.carbon.identity.organization.management.service.util.OrganizationManagementUtil;
import org.wso2.carbon.identity.role.mgt.core.IdentityRoleManagementException;
import org.wso2.carbon.identity.role.mgt.core.util.UserIDResolver;
import org.wso2.carbon.identity.scim2.common.cache.SCIMCustomAttributeSchemaCache;
Expand Down Expand Up @@ -948,4 +950,20 @@ public static String getLoggedInUserID() throws CharonException {
throw new CharonException("Error occurred while retrieving super admin ID.", e);
}
}

/**
* Check whether the given tenant domain is an organization.
*
* @param tenantDomain Tenant domain of the request.
* @return True if the tenant domain is an organization.
* @throws CharonException If an error occurred while checking the organization state.
*/
public static boolean isOrganization(String tenantDomain) throws CharonException {

try {
return OrganizationManagementUtil.isOrganization(tenantDomain);
} catch (OrganizationManagementException e) {
throw new CharonException("Error occurred while checking the organization state.", e);
}
}
}
23 changes: 13 additions & 10 deletions ...rovider/src/main/java/org/wso2/carbon/identity/scim2/provider/resources/UserResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import javax.ws.rs.core.Response;

import static org.wso2.carbon.identity.scim2.provider.util.SupportUtils.buildCustomSchema;
import static org.wso2.carbon.identity.scim2.provider.util.SupportUtils.getTenantDomain;
import static org.wso2.carbon.identity.scim2.provider.util.SupportUtils.getTenantId;

@Path("/")
Expand Down Expand Up @@ -151,13 +152,14 @@ public Response deleteUser(@PathParam(SCIMProviderConstants.ID) String id,
// obtain the user store manager
UserManager userManager = IdentitySCIMManager.getInstance().getUserManager();

String superAdminID = AdminAttributeUtil.getSuperAdminID();
String loggedInUser = SCIMCommonUtils.getLoggedInUserID();
if ((superAdminID.equals(id)) && (!loggedInUser.equals(id))) {
if (LOG.isDebugEnabled()) {
// Skipping this validation if the request comes from a sub organization.
if (!SCIMCommonUtils.isOrganization(getTenantDomain())) {
String superAdminID = AdminAttributeUtil.getSuperAdminID();
String loggedInUser = SCIMCommonUtils.getLoggedInUserID();
if (superAdminID.equals(id) && !loggedInUser.equals(id)) {
LOG.debug("Do not have permission to delete SuperAdmin user.");
return Response.status(Response.Status.FORBIDDEN).build();
}
return Response.status(Response.Status.FORBIDDEN).build();
}

// create charon-SCIM user resource manager and hand-over the request.
Expand Down Expand Up @@ -348,13 +350,14 @@ public Response patchUser(@PathParam(SCIMConstants.CommonSchemaConstants.ID) Str
// obtain the user store manager
UserManager userManager = IdentitySCIMManager.getInstance().getUserManager();

String superAdminID = AdminAttributeUtil.getSuperAdminID();
String loggedInUser = SCIMCommonUtils.getLoggedInUserID();
if ((superAdminID.equals(id)) && (!loggedInUser.equals(id))) {
if (LOG.isDebugEnabled()) {
// Skipping this validation if the request comes from a sub organization.
if (!SCIMCommonUtils.isOrganization(getTenantDomain())) {
String superAdminID = AdminAttributeUtil.getSuperAdminID();
String loggedInUser = SCIMCommonUtils.getLoggedInUserID();
if (superAdminID.equals(id) && !loggedInUser.equals(id)) {
LOG.debug("Do not have permission to patch SuperAdmin user.");
return Response.status(Response.Status.FORBIDDEN).build();
}
return Response.status(Response.Status.FORBIDDEN).build();
}

// Build Custom schema
Expand Down
Loading