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

Implement Resolving Shared User Profiles in Token and Userinfo Endpoints #2599

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+61 −4
Draft

Implement Resolving Shared User Profiles in Token and Userinfo Endpoints #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afe06d5
Implement resolving shared user claims for ID/ JWT access tokens.
dhaura Oct 21, 2024
966f7d0
Implement resolving shared user claims for OAuth2 userinfo endpoint.
dhaura Oct 21, 2024
0cb7e28
Revert org mgt core version bump.
dhaura Oct 22, 2024
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
34 changes: 32 additions & 2 deletions ....oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/util/ClaimUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.oltu.oauth2.common.error.OAuthError;
import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.identity.application.authentication.framework.exception.FrameworkException;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils;
Expand All @@ -47,6 +48,7 @@
import org.wso2.carbon.identity.oauth2.dto.OAuth2TokenValidationResponseDTO;
import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder;
import org.wso2.carbon.identity.oauth2.model.AccessTokenDO;
import org.wso2.carbon.identity.oauth2.util.AuthzUtil;
import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
import org.wso2.carbon.identity.openidconnect.OIDCClaimUtil;
import org.wso2.carbon.user.api.RealmConfiguration;
Expand Down Expand Up @@ -165,8 +167,36 @@ public static Map<String, Object> getClaimsFromUserStore(OAuth2TokenValidationRe
spToLocalClaimMappings = ClaimMetadataHandler.getInstance().getMappingsMapFromOtherDialectToCarbon
(SP_DIALECT, null, userTenantDomain, true);

realm = getUserRealm(null, userTenantDomain);
Map<String, String> userClaims = getUserClaimsFromUserStore(userId, realm, claimURIList);
Map<String, String> userClaims;

AuthenticatedUser authenticatedUser = accessTokenDO.getAuthzUser();
if (!StringUtils.equals(authenticatedUser.getUserResidentOrganization(),
authenticatedUser.getAccessingOrganization()) &&
!CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME &&
StringUtils.isNotEmpty(AuthzUtil.getUserIdOfAssociatedUser(authenticatedUser))) {
authenticatedUser.setSharedUserId(AuthzUtil.getUserIdOfAssociatedUser(authenticatedUser));
authenticatedUser.setUserSharedOrganizationId(authenticatedUser
.getAccessingOrganization());
}
if (OIDCClaimUtil.isSharedUserAccessingSharedOrg(authenticatedUser) &&
StringUtils.isNotEmpty(authenticatedUser.getSharedUserId())) {
String userAccessingTenantDomain =
OIDCClaimUtil.resolveTenantDomain(authenticatedUser.getAccessingOrganization());
String sharedUserId = authenticatedUser.getSharedUserId();

realm = getUserRealm(null, userAccessingTenantDomain);

try {
FrameworkUtils.startTenantFlow(userAccessingTenantDomain);
userClaims = getUserClaimsFromUserStore(sharedUserId, realm, claimURIList);
} finally {
FrameworkUtils.endTenantFlow();
}
} else {
realm = getUserRealm(null, userTenantDomain);
userClaims = getUserClaimsFromUserStore(userId, realm, claimURIList);
}


if (isNotEmpty(userClaims)) {
for (Map.Entry<String, String> entry : userClaims.entrySet()) {
Expand Down
31 changes: 29 additions & 2 deletions ...on.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/OIDCClaimUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,29 @@ public static Map<String, Object> getUserClaimsInOIDCDialect(ServiceProvider ser
claimURIList.remove(APP_ROLES_CLAIM);
appRoleClaimRequested = true;
}
Map<String, String> userClaims = getUserClaimsInLocalDialect(fullQualifiedUsername, realm, claimURIList);

Map<String, String> userClaims;
if (isSharedUserAccessingSharedOrg(authenticatedUser) &&
StringUtils.isNotEmpty(authenticatedUser.getSharedUserId())) {
String userAccessingTenantDomain = OAuthComponentServiceHolder.getInstance().getOrganizationManager()
.resolveTenantDomain(authenticatedUser.getAccessingOrganization());
AbstractUserStoreManager userStoreManager =
(AbstractUserStoreManager) OAuthComponentServiceHolder.getInstance().getRealmService()
.getTenantUserRealm(IdentityTenantUtil.getTenantId(userAccessingTenantDomain))
.getUserStoreManager();
String fullQualifiedSharedUsername = userStoreManager.getUser(authenticatedUser.getSharedUserId(), null)
.getFullQualifiedUsername();
realm = IdentityTenantUtil.getRealm(userAccessingTenantDomain, fullQualifiedSharedUsername);

try {
FrameworkUtils.startTenantFlow(userAccessingTenantDomain);
userClaims = getUserClaimsInLocalDialect(fullQualifiedUsername, realm, claimURIList);
} finally {
FrameworkUtils.endTenantFlow();
}
} else {
userClaims = getUserClaimsInLocalDialect(fullQualifiedUsername, realm, claimURIList);
}

if (roleClaimRequested || appRoleClaimRequested) {
String[] appAssocatedRolesOfUser = getAppAssociatedRolesOfUser(authenticatedUser,
Expand Down Expand Up @@ -599,14 +621,19 @@ private static void setAppRoleClaimInLocalDialect(Map<String, String> userClaims
}
}

private static boolean isSharedUserAccessingSharedOrg(AuthenticatedUser authenticatedUser) {
public static boolean isSharedUserAccessingSharedOrg(AuthenticatedUser authenticatedUser) {

return StringUtils.isNotEmpty(authenticatedUser.getUserSharedOrganizationId()) &&
StringUtils.isNotEmpty(authenticatedUser.getAccessingOrganization()) &&
StringUtils.equals(authenticatedUser.getUserSharedOrganizationId(),
authenticatedUser.getAccessingOrganization());
}

public static String resolveTenantDomain(String organizationId) throws OrganizationManagementException {

return OAuthComponentServiceHolder.getInstance().getOrganizationManager().resolveTenantDomain(organizationId);
}

private static void addSharedUserGroupsFromSharedOrganization(AuthenticatedUser authenticatedUser,
Map<String, String> userClaims) throws
OrganizationManagementException, UserStoreException, IdentityException {
Expand Down
Loading