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

Test2 - don't merge #170

Closed
wants to merge 4 commits into from
Closed

Test2 - don't merge #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
127e93e
test
Sachin-Mamoru Dec 11, 2024
18c7320
Update pom.xml
Sachin-Mamoru Dec 11, 2024
2817d22
Update pom.xml
Sachin-Mamoru Dec 11, 2024
0659265
Update pom.xml
Sachin-Mamoru Dec 11, 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
4 changes: 2 additions & 2 deletions components/org.wso2.carbon.identity.sts.passive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-common</artifactId>
<version>2.3.0</version>
<version>2.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
<version>2.3.0</version>
<version>2.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down
16 changes: 10 additions & 6 deletions .../java/org/wso2/carbon/identity/sts/common/identity/provider/AttributeCallbackHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,19 @@ public void handle(SAMLCallback callback) throws SAMLException {
StringUtils.isNotBlank(remoteClaimPrefixValue)) {
// WS trust flow does not set the authenticated user property.
if (isHandlerCalledFromWSTrustSTSFlow(attrCallback)) {
localClaimValue = IdentityProviderSTSServiceComponent.getRealmService().
getBootstrapRealm().getUserStoreManager().
getUserClaimValue(userIdentifier, localClaimUri, DEFAULT_PROFILE);
tenantDomain = getTenantDomainFromThreadLocalContext();
UserRealm userRealm = IdentityTenantUtil.getRealm(tenantDomain, null);
localClaimValue = userRealm.getUserStoreManager().getUserClaimValue(userIdentifier,
localClaimUri, DEFAULT_PROFILE);
} else if (!authenticatedUser.isFederatedUser()) {
if (log.isDebugEnabled()) {
log.debug("Loading claim values from local UserStore for user: "
+ authenticatedUser.toString());
}
localClaimValue = IdentityProviderSTSServiceComponent.getRealmService().
getBootstrapRealm().getUserStoreManager().
getUserClaimValue(userIdentifier, localClaimUri, DEFAULT_PROFILE);
tenantDomain = getTenantDomainFromThreadLocalContext();
UserRealm userRealm = IdentityTenantUtil.getRealm(tenantDomain, null);
localClaimValue = userRealm.getUserStoreManager().getUserClaimValue(userIdentifier,
localClaimUri, DEFAULT_PROFILE);
}

if (StringUtils.isEmpty(localClaimValue)) {
Expand All @@ -189,6 +191,8 @@ public void handle(SAMLCallback callback) throws SAMLException {
throw new SAMLException("Error while loading SP specific claims", e);
} catch (org.wso2.carbon.user.core.UserStoreException e) {
throw new SAMLException("Error while loading claims of the user", e);
} catch (IdentityException e) {
throw new SAMLException("Error while loading claims", e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<carbon.kernel.version>4.7.0</carbon.kernel.version>
<carbon.kernel.feature.version>4.7.0</carbon.kernel.feature.version>
<carbon.xfer.package.version>4.2.0</carbon.xfer.package.version>
<xmlsec.version>2.3.4</xmlsec.version>
<xmlsec.version>2.3.0</xmlsec.version>
<xmlsec.version.imp.pkg.version.range>[2.1.7,2.4.0)</xmlsec.version.imp.pkg.version.range>
<wss4j.version>1.5.11-wso2v24</wss4j.version>
<rampart.wso2.version>1.6.1-wso2v46</rampart.wso2.version>
Expand Down
Loading