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

Revert "Use application tenant domain to retrieve client app" #2559

Closed
wants to merge 1 commit into from
Closed

Revert "Use application tenant domain to retrieve client app" #2559

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
16 changes: 8 additions & 8 deletions ...auth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@
import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils;
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
import org.wso2.carbon.identity.oauth.common.OAuthConstants;
import org.wso2.carbon.identity.oauth.common.exception.InvalidOAuthClientException;
import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
import org.wso2.carbon.identity.oauth.dto.OAuthConsumerAppDTO;
import org.wso2.carbon.identity.oauth.internal.OAuthComponentServiceHolder;
import org.wso2.carbon.identity.oauth.tokenprocessor.TokenProvider;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.OAuth2Constants;
Expand Down Expand Up @@ -679,20 +682,17 @@ private static boolean isOmitUsernameInIntrospectionRespForAppTokens(AccessToken
String tenantDomain)
throws IdentityOAuth2Exception {

OAuthAdminServiceImpl oAuthAdminService = OAuthComponentServiceHolder.getInstance().getoAuthAdminService();
boolean omitUsernameInIntrospectionRespForAppTokens;
try {
int appResidentTenantId = accessTokenDO.getAppResidentTenantId();
if (appResidentTenantId != MultitenantConstants.INVALID_TENANT_ID) {
tenantDomain = IdentityTenantUtil.getTenantDomain(appResidentTenantId);
}
OAuthAppDO oAuthAppDO = OAuth2Util.getAppInformationByClientId(accessTokenDO.getConsumerKey(),
OAuthConsumerAppDTO oAuthApp = oAuthAdminService.getOAuthApplicationData(accessTokenDO.getConsumerKey(),
tenantDomain);

return Boolean.TRUE.equals(oAuthAppDO.isOmitUsernameInIntrospectionRespForAppTokens());

omitUsernameInIntrospectionRespForAppTokens = oAuthApp.isOmitUsernameInIntrospectionRespForAppTokens();
} catch (Exception e) {
throw new IdentityOAuth2Exception("Error occurred while retrieving OAuth2 application data for client id:" +
accessTokenDO.getConsumerKey(), e);
}
return omitUsernameInIntrospectionRespForAppTokens;
}

private String getAuthzUser(AccessTokenDO accessTokenDO) throws IdentityOAuth2Exception {
Expand Down
73 changes: 44 additions & 29 deletions .../src/test/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@
import org.wso2.carbon.identity.core.util.IdentityDatabaseUtil;
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
import org.wso2.carbon.identity.oauth.cache.AppInfoCache;
import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
import org.wso2.carbon.identity.oauth.dto.OAuthConsumerAppDTO;
import org.wso2.carbon.identity.oauth.internal.OAuthComponentServiceHolder;
import org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor;
import org.wso2.carbon.identity.oauth.tokenprocessor.TokenProvider;
Expand Down Expand Up @@ -140,6 +142,12 @@ public class TokenValidationHandlerTest {
private IdentityProvider identityProvider;
@Mock
private FederatedAuthenticatorConfig federatedAuthenticatorConfig = new FederatedAuthenticatorConfig();
@Mock
OAuthComponentServiceHolder mockOAuthComponentServiceHolder;
@Mock
OAuthConsumerAppDTO mockedOAuthConsumerAppDTO;
@Mock
OAuthAdminServiceImpl mockedOAuthAdminService;
private MockedStatic<LoggerUtils> loggerUtils;

@BeforeMethod
Expand Down Expand Up @@ -300,7 +308,6 @@ public void testBuildIntrospectionResponse(boolean isIDPIdColumnEnabled, String
tokenBinding.setBindingReference("test_binding_reference");
tokenBinding.setBindingValue("R4Hj_0nNdIzVvPdCdsWlxNKm6a74cszp4Za4M1iE8P9");
accessTokenDO.setTokenBinding(tokenBinding);
accessTokenDO.setAppResidentTenantId(-1234);

PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain("carbon.super");
TokenProvider tokenProvider = Mockito.mock(TokenProvider.class);
Expand All @@ -320,38 +327,46 @@ public void testBuildIntrospectionResponse(boolean isIDPIdColumnEnabled, String
OAuthAppDO oAuthAppDO = new OAuthAppDO();
oAuthAppDO.setTokenType("Default");
oAuthAppDO.setApplicationName("testApp");
oAuthAppDO.setOmitUsernameInIntrospectionRespForAppTokens(omitUsernameInIntrospectionRespAppConfig);
AppInfoCache appInfoCache = AppInfoCache.getInstance();
appInfoCache.addToCache("testConsumerKey", oAuthAppDO);
oAuth2TokenValidationRequestDTO.setAccessToken(accessToken);

oAuth2Util.when(() -> OAuth2Util.getAppInformationByClientId(anyString(), anyString()))
.thenReturn(oAuthAppDO);
// Mock server level config value.
when(OAuthServerConfiguration.getInstance()).thenReturn(mockOAuthServerConfiguration);
lenient().when(mockOAuthServerConfiguration
.isRemoveUsernameFromIntrospectionResponseForAppTokensEnabled())
.thenReturn(omitUsernameInIntrospectionRespServerConfig);

oAuth2Util.when(OAuth2Util::getPersistenceProcessor)
.thenReturn(new PlainTextPersistenceProcessor());
oAuth2Util.when(() -> OAuth2Util.getAppInformationByAccessTokenDO(any())).thenReturn(oAuthAppDO);
oAuth2Util.when(() -> OAuth2Util.getAccessTokenExpireMillis(any(), Mockito.anyBoolean()))
.thenReturn(1000L);

OAuth2IntrospectionResponseDTO oAuth2IntrospectionResponseDTO = tokenValidationHandler
.buildIntrospectionResponse(oAuth2TokenValidationRequestDTO);
assertNotNull(oAuth2IntrospectionResponseDTO);
assertEquals(oAuth2IntrospectionResponseDTO.getBindingType(),
OAuth2Constants.TokenBinderType.CERTIFICATE_BASED_TOKEN_BINDER);
assertEquals(oAuth2IntrospectionResponseDTO.getBindingReference(), "test_binding_reference");
assertEquals(oAuth2IntrospectionResponseDTO.getCnfBindingValue(),
"R4Hj_0nNdIzVvPdCdsWlxNKm6a74cszp4Za4M1iE8P9");
if (omitUsernameInIntrospectionRespAppConfig && omitUsernameInIntrospectionRespServerConfig &&
Objects.equals(tokenTypeData, "APPLICATION")) {
assertNull(oAuth2IntrospectionResponseDTO.getUsername());
} else {
assertEquals(oAuth2IntrospectionResponseDTO.getUsername(), authzUser.getUserName());
try (MockedStatic<OAuthComponentServiceHolder> oAuthComponentServiceHolder =
mockStatic(OAuthComponentServiceHolder.class)) {
when(OAuthComponentServiceHolder.getInstance()).thenReturn(mockOAuthComponentServiceHolder);
lenient().when(mockOAuthComponentServiceHolder.getoAuthAdminService())
.thenReturn(mockedOAuthAdminService);
lenient().when(mockedOAuthAdminService.getOAuthApplicationData(anyString(), anyString()))
.thenReturn(mockedOAuthConsumerAppDTO);
lenient().when(mockedOAuthConsumerAppDTO.isOmitUsernameInIntrospectionRespForAppTokens())
.thenReturn(omitUsernameInIntrospectionRespAppConfig);

// Mock server level config value.
when(OAuthServerConfiguration.getInstance()).thenReturn(mockOAuthServerConfiguration);
lenient().when(mockOAuthServerConfiguration
.isRemoveUsernameFromIntrospectionResponseForAppTokensEnabled())
.thenReturn(omitUsernameInIntrospectionRespServerConfig);

oAuth2Util.when(OAuth2Util::getPersistenceProcessor)
.thenReturn(new PlainTextPersistenceProcessor());
oAuth2Util.when(() -> OAuth2Util.getAppInformationByAccessTokenDO(any())).thenReturn(oAuthAppDO);
oAuth2Util.when(() -> OAuth2Util.getAccessTokenExpireMillis(any(), Mockito.anyBoolean()))
.thenReturn(1000L);

OAuth2IntrospectionResponseDTO oAuth2IntrospectionResponseDTO = tokenValidationHandler
.buildIntrospectionResponse(oAuth2TokenValidationRequestDTO);
assertNotNull(oAuth2IntrospectionResponseDTO);
assertEquals(oAuth2IntrospectionResponseDTO.getBindingType(),
OAuth2Constants.TokenBinderType.CERTIFICATE_BASED_TOKEN_BINDER);
assertEquals(oAuth2IntrospectionResponseDTO.getBindingReference(), "test_binding_reference");
assertEquals(oAuth2IntrospectionResponseDTO.getCnfBindingValue(),
"R4Hj_0nNdIzVvPdCdsWlxNKm6a74cszp4Za4M1iE8P9");
if (omitUsernameInIntrospectionRespAppConfig && omitUsernameInIntrospectionRespServerConfig &&
Objects.equals(tokenTypeData, "APPLICATION")) {
assertNull(oAuth2IntrospectionResponseDTO.getUsername());
} else {
assertEquals(oAuth2IntrospectionResponseDTO.getUsername(), authzUser.getUserName());
}
}
}
}
Expand Down
Loading