You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/01/19 12:44:23 UTC
[3/3] cxf git commit: Fixing backport
Fixing backport
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3dd75e10
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3dd75e10
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3dd75e10
Branch: refs/heads/2.7.x-fixes
Commit: 3dd75e107001a0e92183dfeb45dff7b2b0c04107
Parents: 256f1ec
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 19 11:44:13 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 19 11:44:13 2015 +0000
----------------------------------------------------------------------
.../cxf/sts/token/validator/SAMLTokenValidator.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3dd75e10/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
index a2874bb..a85ebd3 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
@@ -55,13 +55,8 @@ import org.apache.ws.security.validate.SignatureTrustValidator;
import org.apache.ws.security.validate.Validator;
import org.joda.time.DateTime;
import org.opensaml.common.SAMLVersion;
-<<<<<<< HEAD
import org.opensaml.xml.validation.ValidationException;
import org.opensaml.xml.validation.ValidatorSuite;
-=======
-import org.opensaml.xml.signature.KeyInfo;
-import org.opensaml.xml.signature.Signature;
->>>>>>> c1f9d04... Adding some stuff to the SAMLTokenValidator in the STS
/**
* Validate a SAML Assertion. It is valid if it was issued and signed by this STS.
@@ -266,8 +261,11 @@ public class SAMLTokenValidator implements TokenValidator {
/**
* Validate the assertion against schemas/profiles
*/
-<<<<<<< HEAD
protected void validateAssertion(AssertionWrapper assertion) throws WSSecurityException {
+ if (validateSignatureAgainstProfile) {
+ assertion.validateSignatureAgainstProfile();
+ }
+
if (assertion.getSaml1() != null) {
ValidatorSuite schemaValidators =
org.opensaml.Configuration.getValidatorSuite("saml1-schema-validator");
@@ -293,10 +291,6 @@ public class SAMLTokenValidator implements TokenValidator {
throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
}
}
-=======
- protected void validateAssertion(SamlAssertionWrapper assertion) throws WSSecurityException {
- assertion.validateAssertion(validateSignatureAgainstProfile);
->>>>>>> c1f9d04... Adding some stuff to the SAMLTokenValidator in the STS
}
protected boolean validateConditions(