From 27f93cf649c6d0e32f2ed426304cce45bc8436df Mon Sep 17 00:00:00 2001 From: AnuradhaSK Date: Sat, 28 Oct 2023 02:10:50 +0530 Subject: [PATCH 1/2] fix admin role creation issue --- .../identity/scim2/common/DAO/GroupDAO.java | 47 +++++++++++++++++++ .../identity/scim2/common/DAO/SQLQueries.java | 6 +++ .../scim2/common/group/SCIMGroupHandler.java | 25 ++++++---- .../scim2/common/impl/SCIMUserManager.java | 8 +++- .../common/internal/SCIMCommonComponent.java | 2 +- .../listener/SCIMTenantMgtListener.java | 18 +++++-- .../listener/SCIMUserOperationListener.java | 14 +++++- .../common/utils/AdminAttributeUtil.java | 7 ++- .../scim2/common/utils/SCIMCommonUtils.java | 23 ++++++++- .../common/utils/AdminAttributeUtilTest.java | 4 +- pom.xml | 2 +- 11 files changed, 134 insertions(+), 22 deletions(-) diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/GroupDAO.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/GroupDAO.java index 9ba867766..ec9d1b171 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/GroupDAO.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/GroupDAO.java @@ -208,6 +208,53 @@ public void addSCIMGroupAttributes(int tenantId, String roleName, Map attributes) throws IdentitySCIMException { + + try (Connection connection = IdentityDatabaseUtil.getDBConnection(false); + PreparedStatement prepStmt = connection.prepareStatement(SQLQueries.ADD_ATTRIBUTES_WITH_AUDIENCE_SQL)) { + prepStmt.setInt(1, tenantId); + prepStmt.setString(2, roleName); + prepStmt.setInt(3, roleAudienceRefId); + + for (Map.Entry entry : attributes.entrySet()) { + if (!isExistingRoleV2Attribute(entry.getKey(), roleName, roleAudienceRefId, tenantId)) { + prepStmt.setString(4, entry.getKey()); + prepStmt.setString(5, entry.getValue()); + prepStmt.addBatch(); + } else { + throw new IdentitySCIMException("Error when adding SCIM Attribute: " + entry.getKey() + + ". An attribute with the same name already exists."); + } + } + prepStmt.executeBatch(); + } catch (SQLException e) { + throw new IdentitySCIMException("Error when adding SCIM meta data for the role : " + roleName, e); + } + } + + private boolean isExistingRoleV2Attribute(String attributeName, String roleName, int audienceRefId, int tenantId) + throws IdentitySCIMException { + + try (Connection connection = IdentityDatabaseUtil.getDBConnection(false); + PreparedStatement prepStmt = connection.prepareStatement( + SQLQueries.CHECK_EXISTING_ATTRIBUTE_WITH_AUDIENCE_SQL)) { + prepStmt.setInt(1, tenantId); + prepStmt.setString(2, roleName); + prepStmt.setString(3, attributeName); + prepStmt.setInt(4, audienceRefId); + + ResultSet resultSet = prepStmt.executeQuery(); + if (resultSet.next()) { + return true; + } + } catch (SQLException e) { + throw new IdentitySCIMException("Error when reading the RoleV2 SCIM meta data from the persistence store.", + e); + } + return false; + } + /** * Add SCIM attributes to hybrid roles created while SCIM was disabled in the user store. * diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/SQLQueries.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/SQLQueries.java index a4131b773..d63eb6d41 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/SQLQueries.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/DAO/SQLQueries.java @@ -35,6 +35,12 @@ public class SQLQueries { "IDN_SCIM_GROUP.ATTR_VALUE=? AND IDN_SCIM_GROUP.ATTR_NAME=?"; public static final String ADD_ATTRIBUTES_SQL = "INSERT INTO IDN_SCIM_GROUP (TENANT_ID, ROLE_NAME, ATTR_NAME, ATTR_VALUE) VALUES (?, ?, ?, ?)"; + public static final String ADD_ATTRIBUTES_WITH_AUDIENCE_SQL = + "INSERT INTO IDN_SCIM_GROUP (TENANT_ID, ROLE_NAME, AUDIENCE_REF_ID, ATTR_NAME, ATTR_VALUE) VALUES " + + "(?, ?, ?, ?, ?)"; + public static final String CHECK_EXISTING_ATTRIBUTE_WITH_AUDIENCE_SQL = + "SELECT TENANT_ID, ROLE_NAME, ATTR_NAME FROM IDN_SCIM_GROUP WHERE IDN_SCIM_GROUP.TENANT_ID=? AND " + + "IDN_SCIM_GROUP.ROLE_NAME=? AND IDN_SCIM_GROUP.ATTR_NAME=? AND IDN_SCIM_GROUP.AUDIENCE_REF_ID=?"; public static final String UPDATE_ATTRIBUTES_SQL = "UPDATE IDN_SCIM_GROUP SET UM_ATTR_VALUE=? WHERE TENANT_ID=? AND ROLE_NAME=? AND ATTR_NAME=?"; public static final String UPDATE_GROUP_NAME_SQL = diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/group/SCIMGroupHandler.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/group/SCIMGroupHandler.java index 9a0167631..3a3ff900e 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/group/SCIMGroupHandler.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/group/SCIMGroupHandler.java @@ -25,6 +25,7 @@ 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.role.v2.mgt.core.util.RoleManagementUtils; 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; @@ -84,25 +85,31 @@ public void addMandatoryAttributes(String groupName) } /** - * Add admin role attributes. + * Add roleV2 SCIM metadata. * * @param roleName Role name. * @throws IdentitySCIMException if any error occurs while adding admin role attributes. */ - public void addAdminRoleMandatoryAttributes(String roleName) throws IdentitySCIMException { + public void addRoleV2MandatoryAttributes(String roleName) throws IdentitySCIMException { Map attributes = new HashMap<>(); String tenantDomain = IdentityTenantUtil.getTenantDomain(tenantId); String id; + int roleAudienceRefId; try { - id = SCIMCommonComponentHolder.getRoleManagementServiceV2().getRoleIdByName( - UserCoreUtil.removeDomainFromName(roleName), RoleConstants.ORGANIZATION, - getOrganizationId(tenantDomain), tenantDomain); + String orgId = getOrganizationId(tenantDomain); + id = SCIMCommonComponentHolder.getRoleManagementServiceV2() + .getRoleIdByName(UserCoreUtil.removeDomainFromName(roleName), RoleConstants.ORGANIZATION, orgId, + tenantDomain); + roleAudienceRefId = RoleManagementUtils.resolveAudienceRefId(RoleConstants.ORGANIZATION, orgId); } catch (IdentityRoleManagementException e) { - throw new IdentitySCIMException("Error while resolving admin role id", e); + throw new IdentitySCIMException("Error while resolving " + roleName + " role id.", e); } if (StringUtils.isBlank(id)) { - id = UUID.randomUUID().toString(); + throw new IdentitySCIMException("Role : " + roleName + " id not found."); + } + if (roleAudienceRefId == -1) { + throw new IdentitySCIMException("Role : " + roleName + " audience id not found."); } attributes.put(SCIMConstants.CommonSchemaConstants.ID_URI, id); @@ -110,9 +117,9 @@ public void addAdminRoleMandatoryAttributes(String roleName) throws IdentitySCIM attributes.put(SCIMConstants.CommonSchemaConstants.CREATED_URI, createdDate); attributes.put(SCIMConstants.CommonSchemaConstants.LAST_MODIFIED_URI, createdDate); - attributes.put(SCIMConstants.CommonSchemaConstants.LOCATION_URI, SCIMCommonUtils.getSCIMGroupURL(id)); + attributes.put(SCIMConstants.CommonSchemaConstants.LOCATION_URI, SCIMCommonUtils.getSCIMRoleV2URL(id)); GroupDAO groupDAO = new GroupDAO(); - groupDAO.addSCIMGroupAttributes(tenantId, roleName, attributes); + groupDAO.addSCIMRoleV2Attributes(tenantId, roleName, roleAudienceRefId, attributes); } /** diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java index bee7df9d5..e0cb32dad 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java @@ -2986,7 +2986,9 @@ private Set getRoleNamesForGroupsEndpoint(String domainName) Set scimRoles = groupHandler.listSCIMRoles(); List scimDisabledHybridRoles = getSCIMDisabledHybridRoleList(roleNames, scimRoles); if (!scimDisabledHybridRoles.isEmpty()) { - createSCIMAttributesForSCIMDisabledHybridRoles(scimDisabledHybridRoles); + if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) { + createSCIMAttributesForSCIMDisabledHybridRoles(scimDisabledHybridRoles); + } roleNames.addAll(scimDisabledHybridRoles); } return roleNames; @@ -3008,7 +3010,9 @@ private Set getRoleNamesForGroupsEndpoint(String domainName) Set scimRoles = groupHandler.listSCIMRoles(); List scimDisabledHybridRoles = getSCIMDisabledHybridRoleList(roleNames, scimRoles); if (!scimDisabledHybridRoles.isEmpty()) { - createSCIMAttributesForSCIMDisabledHybridRoles(scimDisabledHybridRoles); + if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) { + createSCIMAttributesForSCIMDisabledHybridRoles(scimDisabledHybridRoles); + } roleNames.addAll(scimDisabledHybridRoles); } return roleNames; diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/internal/SCIMCommonComponent.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/internal/SCIMCommonComponent.java index 6a630e99f..fe809b672 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/internal/SCIMCommonComponent.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/internal/SCIMCommonComponent.java @@ -124,7 +124,7 @@ protected void activate(ComponentContext ctx) { //Update super tenant user/group attributes. AdminAttributeUtil.updateAdminUser(MultitenantConstants.SUPER_TENANT_ID, true); AdminAttributeUtil.updateAdminGroup(MultitenantConstants.SUPER_TENANT_ID); - + SCIMCommonUtils.updateEveryOneRoleV2MetaData(MultitenantConstants.SUPER_TENANT_ID); if (logger.isDebugEnabled()) { logger.debug("SCIM Common component activated successfully."); } diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMTenantMgtListener.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMTenantMgtListener.java index 6d60bd31e..57341fb78 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMTenantMgtListener.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMTenantMgtListener.java @@ -22,8 +22,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.identity.core.AbstractIdentityTenantMgtListener; +import org.wso2.carbon.identity.organization.management.service.OrganizationManager; +import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException; +import org.wso2.carbon.identity.organization.management.service.util.Utils; import org.wso2.carbon.identity.scim2.common.internal.SCIMCommonComponentHolder; import org.wso2.carbon.identity.scim2.common.utils.AdminAttributeUtil; +import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils; import org.wso2.carbon.stratos.common.exception.StratosException; import org.wso2.carbon.user.api.Tenant; import org.wso2.carbon.user.api.UserStoreException; @@ -50,12 +54,16 @@ public void onTenantInitialActivation(int tenantId) throws StratosException { try { Tenant tenant = realmService.getTenantManager().getTenant(tenantId); /* - If the tenant has an associated organization id, that tenant is created during an organization creation. - Therefore, no tenant admin is created inside the tenant. No need to update such admin claims. + If the tenant has an associated organization id, and if the org id satisfies isOrganization() check, that + organization creator is not inside the same organization. No need to update such admin claims. */ String organizationID = tenant.getAssociatedOrganizationUUID(); if (StringUtils.isNotBlank(organizationID)) { - return; + OrganizationManager organizationManager = SCIMCommonComponentHolder.getOrganizationManager(); + int organizationDepth = organizationManager.getOrganizationDepthInHierarchy(organizationID); + if (organizationDepth >= Utils.getSubOrgStartLevel()) { + return; + } } if (log.isDebugEnabled()) { log.debug("SCIMTenantMgtListener is fired for Tenant ID : " + tenantId); @@ -64,7 +72,9 @@ public void onTenantInitialActivation(int tenantId) throws StratosException { AdminAttributeUtil.updateAdminUser(tenantId, false); // Update admin group attributes. AdminAttributeUtil.updateAdminGroup(tenantId); - } catch (UserStoreException e) { + // Update meta data of everyone role. + SCIMCommonUtils.updateEveryOneRoleV2MetaData(tenantId); + } catch (UserStoreException | OrganizationManagementException e) { log.error(e); } } diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMUserOperationListener.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMUserOperationListener.java index a04b705f1..be176a31e 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMUserOperationListener.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/listener/SCIMUserOperationListener.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.identity.application.authentication.framework.exception.UserSessionException; import org.wso2.carbon.identity.application.authentication.framework.store.UserSessionStore; import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants; @@ -58,6 +59,7 @@ import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.DATE_OF_BIRTH_LOCAL_CLAIM; import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.DATE_OF_BIRTH_REGEX; import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.DOB_REG_EX_VALIDATION_DEFAULT_ERROR; +import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.INTERNAL_DOMAIN; import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.MOBILE_LOCAL_CLAIM; import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.MOBILE_REGEX; import static org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants.MOBILE_REGEX_VALIDATION_DEFAULT_ERROR; @@ -604,7 +606,17 @@ private boolean postAddRole(String roleName, UserStoreManager userStoreManager) if (!scimGroupHandler.isGroupExisting(roleNameWithDomain)) { // If no attributes - i.e: group added via mgt console, not via SCIM endpoint. // Add META. - scimGroupHandler.addMandatoryAttributes(roleNameWithDomain); + /* + Extracting the domain name here, because resolved domainName is userstore based domains. + If the roleName passed to the method with Internal domain that will be remain as same in + roleNameWithDomain. + */ + if (INTERNAL_DOMAIN.equalsIgnoreCase(UserCoreUtil.extractDomainFromName(roleNameWithDomain)) && + !CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) { + scimGroupHandler.addRoleV2MandatoryAttributes(roleNameWithDomain); + } else { + scimGroupHandler.addMandatoryAttributes(roleNameWithDomain); + } } } catch (IdentitySCIMException e) { throw new UserStoreException("Error retrieving group information from SCIM Tables.", e); diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtil.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtil.java index a74fa3216..646379907 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtil.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtil.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.core.util.IdentityUtil; import org.wso2.carbon.identity.scim2.common.exceptions.IdentitySCIMException; @@ -134,7 +135,11 @@ public static void updateAdminGroup(int tenantId) { log.debug( "Group does not exist, setting scim attribute group value: " + roleNameWithDomain); } - scimGroupHandler.addAdminRoleMandatoryAttributes(roleNameWithDomain); + if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) { + scimGroupHandler.addMandatoryAttributes(roleNameWithDomain); + } else { + scimGroupHandler.addRoleV2MandatoryAttributes(roleNameWithDomain); + } } // Adding the SCIM attributes for admin group diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java index 24d5e3d86..bfaa0659b 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonUtils.java @@ -24,8 +24,6 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.application.common.model.ThreadLocalProvisioningServiceProvider; -import org.wso2.carbon.identity.application.common.util.IdentityApplicationManagementUtil; import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataHandler; import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService; import org.wso2.carbon.identity.claim.metadata.mgt.exception.ClaimMetadataException; @@ -37,9 +35,11 @@ import org.wso2.carbon.identity.core.util.IdentityUtil; import org.wso2.carbon.identity.scim2.common.cache.SCIMCustomAttributeSchemaCache; import org.wso2.carbon.identity.scim2.common.exceptions.IdentitySCIMException; +import org.wso2.carbon.identity.scim2.common.group.SCIMGroupHandler; import org.wso2.carbon.identity.scim2.common.internal.SCIMCommonComponentHolder; import org.wso2.carbon.user.core.UserCoreConstants; import org.wso2.carbon.user.core.UserStoreException; +import org.wso2.carbon.user.core.UserStoreManager; import org.wso2.carbon.user.core.util.UserCoreUtil; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; import org.wso2.charon3.core.attributes.SCIMCustomAttribute; @@ -851,4 +851,23 @@ public static AttributeSchema buildCustomSchema(int tenantId) throws CharonExcep throw new CharonException("Error while building scim custom schema", e); } } + + public static void updateEveryOneRoleV2MetaData(int tenantId) { + + // Handle everyone role creation also here if legacy runtime is disabled. + if (!CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) { + try { + UserStoreManager userStoreManager = (UserStoreManager) SCIMCommonComponentHolder.getRealmService(). + getTenantUserRealm(tenantId).getUserStoreManager(); + String domainName = UserCoreUtil.getDomainName(userStoreManager.getRealmConfiguration()); + SCIMGroupHandler scimGroupHandler = new SCIMGroupHandler(userStoreManager.getTenantId()); + String everyoneRoleName = userStoreManager.getRealmConfiguration().getEveryOneRoleName(); + String everyoneRoleNameWithDomain = + UserCoreUtil.addDomainToName(everyoneRoleName, domainName); + scimGroupHandler.addRoleV2MandatoryAttributes(everyoneRoleNameWithDomain); + } catch (org.wso2.carbon.user.api.UserStoreException | IdentitySCIMException e) { + log.error(e); + } + } + } } diff --git a/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtilTest.java b/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtilTest.java index d2d60c889..aca3cdc75 100644 --- a/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtilTest.java +++ b/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/utils/AdminAttributeUtilTest.java @@ -25,6 +25,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.core.util.IdentityUtil; import org.wso2.carbon.identity.scim2.common.exceptions.IdentitySCIMException; @@ -151,8 +152,9 @@ public void testUpdateAdminGroup(String domainName) throws Exception { whenNew(SCIMGroupHandler.class).withAnyArguments().thenReturn(scimGroupHandler); ArgumentCaptor argument = ArgumentCaptor.forClass(String.class); + CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME = true; adminAttributeUtil.updateAdminGroup(1); - verify(scimGroupHandler).addAdminRoleMandatoryAttributes(argument.capture()); + verify(scimGroupHandler).addMandatoryAttributes(argument.capture()); assertEquals(argument.getValue(), roleNameWithDomain); } diff --git a/pom.xml b/pom.xml index c86b9f31b..703cdeeee 100644 --- a/pom.xml +++ b/pom.xml @@ -273,7 +273,7 @@ 6.5.3 3.2.0.wso2v1 4.9.15 - 5.25.419 + 5.25.459 4.13.1 20030203.000129 1.8.12 From 076ad9bfc300868f345fdc00ba0af5f1ab0befc0 Mon Sep 17 00:00:00 2001 From: AnuradhaSK Date: Sat, 28 Oct 2023 02:11:58 +0530 Subject: [PATCH 2/2] bump framework --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 703cdeeee..1c26ca0de 100644 --- a/pom.xml +++ b/pom.xml @@ -273,7 +273,7 @@ 6.5.3 3.2.0.wso2v1 4.9.15 - 5.25.459 + 5.25.462 4.13.1 20030203.000129 1.8.12