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

Fix the issue of password expiry event trigger of PasswordGrantHandler #2659

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −9
Open

Fix the issue of password expiry event trigger of PasswordGrantHandler #2659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e87fe
Fix the issue of password expiry event trigger of PasswordGrantHandler
sandushi Jan 3, 2025
0c32a68
Add unit tests when debug log is enabled
sandushi Jan 17, 2025
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
16 changes: 8 additions & 8 deletions .../main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ private Optional<AuthenticatedUser> authenticateUserAtUserStore(OAuth2AccessTok
if (log.isDebugEnabled()) {
log.debug("user " + tokenReq.getResourceOwnerUsername() + " authenticated: " + authenticated);
}
triggerPasswordExpiryValidationEvent(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT, tenantAwareUserName,
userTenantDomain, userStoreManager, true);
if (log.isDebugEnabled()) {
log.debug(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT + " event is triggered");
}
if (authenticated) {
AuthenticatedUser authenticatedUser =
new AuthenticatedUser(authenticationResult.getAuthenticatedUser().get());
Expand All @@ -178,11 +183,6 @@ private Optional<AuthenticatedUser> authenticateUserAtUserStore(OAuth2AccessTok
return Optional.of(authenticatedUser);
}

triggerPasswordExpiryValidationEvent(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT, tenantAwareUserName,
userTenantDomain, userStoreManager, true);
if (log.isDebugEnabled()) {
log.debug(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT + " event is triggered");
}
return Optional.empty();
}

Expand Down Expand Up @@ -387,14 +387,14 @@ private AuthenticatedUser validateUserCredentials(OAuth2AccessTokenReqDTO tokenR
authenticatedUser = authenticateUserAtUserStore(tokenReq, userId, userStoreManager,
tenantAwareUserName, isPublishPasswordGrantLoginEnabled, userTenantDomain, serviceProvider);
}
if (authenticatedUser.isPresent()) {
return authenticatedUser.get();
}
triggerPasswordExpiryValidationEvent(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT, tenantAwareUserName,
userTenantDomain, userStoreManager, false);
if (log.isDebugEnabled()) {
log.debug(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT + " event is triggered");
}
if (authenticatedUser.isPresent()) {
return authenticatedUser.get();
}
if (isPublishPasswordGrantLoginEnabled) {
publishAuthenticationData(tokenReq, false, serviceProvider);
}
Expand Down
24 changes: 23 additions & 1 deletion ...t/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.wso2.carbon.identity.oauth2.token.handlers.grant;

import org.apache.commons.logging.Log;
import org.mockito.MockedStatic;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
Expand Down Expand Up @@ -50,6 +51,8 @@
import org.wso2.carbon.user.core.util.UserCoreUtil;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -59,6 +62,8 @@
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
Expand All @@ -82,8 +87,10 @@ public class PasswordGrantHandlerTest {

private static final String CLIENT_ID = "IbWwXLf5MnKSY6x6gnR_7gd7f1wa";

private Log mockLog;

@BeforeMethod
public void init() {
public void init() throws Exception {

tokReqMsgCtx = mock(OAuthTokenReqMessageContext.class);
oAuth2AccessTokenReqDTO = mock(OAuth2AccessTokenReqDTO.class);
Expand All @@ -97,6 +104,18 @@ public void init() {
serverConfiguration = mock(OAuthServerConfiguration.class);
oauthIssuer = mock(OauthTokenIssuer.class);
localAndOutboundAuthenticationConfig = mock(LocalAndOutboundAuthenticationConfig.class);
mockLog = mock(Log.class);
Field logField =
PasswordGrantHandler.class.getDeclaredField("log");
logField.setAccessible(true);

// Remove the 'final' modifier using reflection
Field modifiersField = Field.class.getDeclaredField("modifiers");
modifiersField.setAccessible(true);
modifiersField.setInt(logField, logField.getModifiers() & ~Modifier.FINAL);

// Set the static field to the mock object
logField.set(null, mockLog);
}

@DataProvider(name = "ValidateGrantDataProvider")
Expand Down Expand Up @@ -135,6 +154,8 @@ public void testValidateGrant(String username, boolean isSaas) throws Exception
when(oAuth2AccessTokenReqDTO.getTenantDomain()).thenReturn("wso2.com");
when(oAuth2AccessTokenReqDTO.getResourceOwnerPassword()).thenReturn("randomPassword");

when(mockLog.isDebugEnabled()).thenReturn(true);

oAuthServerConfiguration.when(OAuthServerConfiguration::getInstance).thenReturn(serverConfiguration);

when(serverConfiguration.getIdentityOauthTokenIssuer()).thenReturn(oauthIssuer);
Expand Down Expand Up @@ -186,6 +207,7 @@ public void testValidateGrant(String username, boolean isSaas) throws Exception

PasswordGrantHandler passwordGrantHandler = new PasswordGrantHandler();
boolean isValid = passwordGrantHandler.validateGrant(tokReqMsgCtx);
verify(mockLog, times(2)).debug(eq("PASSWORD_GRANT_POST_AUTHENTICATION event is triggered"));
assertTrue(isValid, "Password grant validation should be successful");
}
}
Expand Down
Loading