From a805fab1971120ff70d13099418cf79bedbee247 Mon Sep 17 00:00:00 2001 From: jbernhardt Date: Fri, 25 Jul 2014 20:46:08 +0200 Subject: [PATCH 1/3] [CXF-5906] Fixing multi claim value support --- .../main/java/org/apache/cxf/sts/claims/ClaimsManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java index 5d28721dac1..26739c8fc99 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java @@ -336,9 +336,8 @@ protected List parseClaimsInAssertion(org.opensaml.saml1.core.As LOG.finest(" [" + value + "]"); } c.addValue(value); - collection.add(c); - break; } + collection.add(c); } } return collection; @@ -375,9 +374,8 @@ protected List parseClaimsInAssertion(org.opensaml.saml2.core.As LOG.finest(" [" + value + "]"); } c.addValue(value); - collection.add(c); - break; } + collection.add(c); } } return collection; From 7549c71753706251c7c59466fb866d69a7dec2c3 Mon Sep 17 00:00:00 2001 From: Jan Bernhardt Date: Fri, 25 Jul 2014 21:39:39 +0200 Subject: [PATCH 2/3] [CXF-5907] Removing disturbing claims validation check in case of federated claim mapping --- .../src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java index 26739c8fc99..dec567955a0 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java @@ -259,7 +259,6 @@ public ProcessedClaimCollection retrieveClaimValues(ClaimCollection claims, Clai ProcessedClaimCollection targetClaims = claimsMapper.mapClaims(relationship.getSourceRealm(), sourceClaims, relationship.getTargetRealm(), parameters); - validateClaimValues(claims, targetClaims); return targetClaims; } From 856c4a345a68e070148039b2c1156f20589dbf73 Mon Sep 17 00:00:00 2001 From: Jan Bernhardt Date: Fri, 25 Jul 2014 22:03:22 +0200 Subject: [PATCH 3/3] [CXF-5907] Undo --- .../src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java index dec567955a0..cafdc626af5 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java @@ -259,7 +259,8 @@ public ProcessedClaimCollection retrieveClaimValues(ClaimCollection claims, Clai ProcessedClaimCollection targetClaims = claimsMapper.mapClaims(relationship.getSourceRealm(), sourceClaims, relationship.getTargetRealm(), parameters); - return targetClaims; + validateClaimValues(claims, returnCollection); + return targetClaims; } }