Skip to content

Commit

Permalink
add IdentityEventException settings to define how IdentityEventExcept…
Browse files Browse the repository at this point in the history 
…ion should be handled
  • Loading branch information
@astik
astik committed Sep 16, 2020
1 parent 418ea07 commit 24f208c
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 6 deletions.
15 changes: 12 additions & 3 deletions ...cim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
import org.wso2.carbon.identity.scim2.common.group.SCIMGroupHandler;
import org.wso2.carbon.identity.scim2.common.internal.SCIMCommonComponentHolder;
import org.wso2.carbon.identity.scim2.common.utils.AttributeMapper;
import org.wso2.carbon.identity.scim2.common.utils.IdentityEventExceptionSettings;
import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants;
import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils;
import org.wso2.carbon.identity.scim2.common.utils.SCIMConfigProcessor;
import org.wso2.carbon.user.api.ClaimMapping;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.core.PaginatedUserStoreManager;
Expand Down Expand Up @@ -284,9 +286,16 @@ private void handleErrorsOnUserNameAndPasswordPolicy(Throwable e) throws BadRequ
if (e instanceof PolicyViolationException) {
throw new BadRequestException(e.getMessage(), ResponseCodeConstants.INVALID_VALUE);
}
if ((e instanceof IdentityEventException) && StringUtils
.equals(ERROR_CODE_PASSWORD_HISTORY_VIOLATION, ((IdentityEventException) e).getErrorCode())) {
throw new BadRequestException(e.getMessage(), ResponseCodeConstants.INVALID_VALUE);
if (e instanceof IdentityEventException) {
IdentityEventException iee = ((IdentityEventException) e);
IdentityEventExceptionSettings ieeSettings = SCIMConfigProcessor.getInstance().getIdentityEventExceptionSettings();
if (ieeSettings.getBadRequestErrorCodes().contains(iee.getErrorCode())) {
String errorMessage = e.getMessage();
if (ieeSettings.isExposeErrorCodeInMessage()) {
errorMessage = "[" + iee.getErrorCode() + "] " + errorMessage;
}
throw new BadRequestException(errorMessage, ResponseCodeConstants.INVALID_VALUE);
}
}
e = e.getCause();
i++;
Expand Down
58 changes: 55 additions & 3 deletions ....common/src/test/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@
import org.wso2.carbon.identity.scim2.common.group.SCIMGroupHandler;
import org.wso2.carbon.identity.scim2.common.test.utils.CommonTestUtils;
import org.wso2.carbon.identity.scim2.common.utils.AttributeMapper;
import org.wso2.carbon.identity.scim2.common.utils.IdentityEventExceptionSettings;
import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants;
import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils;
import org.wso2.carbon.identity.scim2.common.utils.SCIMConfigProcessor;
import org.wso2.carbon.identity.testutil.Whitebox;
import org.wso2.carbon.user.api.Claim;
import org.wso2.carbon.user.api.ClaimMapping;
Expand Down Expand Up @@ -89,14 +91,15 @@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertFalse;

/*
* Unit tests for SCIMUserManager
*/
@PrepareForTest({SCIMGroupHandler.class, IdentityUtil.class, SCIMUserSchemaExtensionBuilder.class,
SCIMAttributeSchema.class, AttributeMapper.class, ClaimMetadataHandler.class, SCIMCommonUtils.class,
IdentityTenantUtil.class, AbstractUserStoreManager.class, Group.class, UserCoreUtil.class,
ApplicationManagementService.class})
ApplicationManagementService.class, SCIMConfigProcessor.class})
@PowerMockIgnore("java.sql.*")
public class SCIMUserManagerTest extends PowerMockTestCase {

Expand Down Expand Up @@ -141,7 +144,6 @@ public class SCIMUserManagerTest extends PowerMockTestCase {

@BeforeMethod
public void setUp() throws Exception {

initMocks(this);
}

Expand Down Expand Up @@ -663,6 +665,13 @@ public void testUpdateUserWithIdentityEventExceptionNotIntercepted() throws Exce
when(ApplicationManagementService.getInstance()).thenReturn(applicationManagementService);
when(applicationManagementService.getServiceProvider(anyString(), anyString())).thenReturn(null);

mockStatic(SCIMConfigProcessor.class);
SCIMConfigProcessor scimConfigProcessor = new SCIMConfigProcessor();
IdentityEventExceptionSettings ieeSettings = scimConfigProcessor.getIdentityEventExceptionSettings();
ieeSettings.setExposeErrorCodeInMessage(false);
ieeSettings.getBadRequestErrorCodes().add("NOT42");
when(SCIMConfigProcessor.getInstance()).thenReturn(scimConfigProcessor);

String tenantDomain = "carbon.super";
SCIMUserManager scimUserManager = spy(new SCIMUserManager(mockedUserStoreManager,
mockClaimMetadataManagementService, tenantDomain));
Expand Down Expand Up @@ -690,18 +699,61 @@ public void testUpdateUserWithIdentityEventExceptionIntercepted() throws Excepti
when(ApplicationManagementService.getInstance()).thenReturn(applicationManagementService);
when(applicationManagementService.getServiceProvider(anyString(), anyString())).thenReturn(null);

mockStatic(SCIMConfigProcessor.class);
SCIMConfigProcessor scimConfigProcessor = new SCIMConfigProcessor();
IdentityEventExceptionSettings ieeSettings = scimConfigProcessor.getIdentityEventExceptionSettings();
ieeSettings.setExposeErrorCodeInMessage(false);
ieeSettings.getBadRequestErrorCodes().add("42");
when(SCIMConfigProcessor.getInstance()).thenReturn(scimConfigProcessor);

String tenantDomain = "carbon.super";
SCIMUserManager scimUserManager = spy(new SCIMUserManager(mockedUserStoreManager,
mockClaimMetadataManagementService, tenantDomain));
doReturn(user).when(scimUserManager).getUser(anyString(), anyMap());
Throwable expectedException = new UserStoreException(new IdentityEventException("22001", "This is a special code"));
Throwable expectedException = new UserStoreException(new IdentityEventException("42", "response to everything"));
doThrow(expectedException).when(mockedUserStoreManager).isExistingUser(anyString());

boolean hasExpectedBehaviour = false;
try {
scimUserManager.updateUser(user, null);
} catch (BadRequestException e) {
assertEquals(ResponseCodeConstants.INVALID_VALUE, e.getScimType());
assertFalse("Error code shouldn't be exposed", e.getDetail().startsWith("[42] "));
hasExpectedBehaviour = true;
}

assertTrue("IdentityEventException is not properly handled.", hasExpectedBehaviour);
}

@Test
public void testUpdateUserWithIdentityEventExceptionInterceptedAndExposeCode() throws Exception {
User user = new User();
user.setUserName("newUser");

mockStatic(ApplicationManagementService.class);
when(ApplicationManagementService.getInstance()).thenReturn(applicationManagementService);
when(applicationManagementService.getServiceProvider(anyString(), anyString())).thenReturn(null);

mockStatic(SCIMConfigProcessor.class);
SCIMConfigProcessor scimConfigProcessor = new SCIMConfigProcessor();
IdentityEventExceptionSettings ieeSettings = scimConfigProcessor.getIdentityEventExceptionSettings();
ieeSettings.setExposeErrorCodeInMessage(true);
ieeSettings.getBadRequestErrorCodes().add("42");
when(SCIMConfigProcessor.getInstance()).thenReturn(scimConfigProcessor);

String tenantDomain = "carbon.super";
SCIMUserManager scimUserManager = spy(new SCIMUserManager(mockedUserStoreManager,
mockClaimMetadataManagementService, tenantDomain));
doReturn(user).when(scimUserManager).getUser(anyString(), anyMap());
Throwable expectedException = new UserStoreException(new IdentityEventException("42", "response to everything"));
doThrow(expectedException).when(mockedUserStoreManager).isExistingUser(anyString());

boolean hasExpectedBehaviour = false;
try {
scimUserManager.updateUser(user, null);
} catch (BadRequestException e) {
assertEquals(ResponseCodeConstants.INVALID_VALUE, e.getScimType());
assertTrue("Error code should be exposed", e.getDetail().startsWith("[42] "));
hasExpectedBehaviour = true;
}

Expand Down

0 comments on commit 24f208c

Please sign in to comment.