Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eb4d23a4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eb4d23a4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eb4d23a4 Branch: refs/heads/3.0.x-fixes Commit: eb4d23a416c66a3acc5ac88d2d00bf169a4db38c Parents: a52972c Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Jan 12 14:14:30 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Jan 12 14:14:30 2016 +0000 ---------------------------------------------------------------------- .../security/saml/sso/SAMLSSOResponseValidator.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/eb4d23a4/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java index e7aabcf..8da52c8 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java @@ -117,15 +117,10 @@ public class SAMLSSOResponseValidator { // Check for AuthnStatements and validate the Subject accordingly if (assertion.getAuthnStatements() != null && !assertion.getAuthnStatements().isEmpty()) { -<<<<<<< HEAD org.opensaml.saml2.core.Subject subject = assertion.getSubject(); - if (validateAuthenticationSubject(subject, assertion.getID(), postBinding)) { -======= - org.opensaml.saml.saml2.core.Subject subject = assertion.getSubject(); - org.opensaml.saml.saml2.core.SubjectConfirmation subjectConf = + org.opensaml.saml2.core.SubjectConfirmation subjectConf = validateAuthenticationSubject(subject, assertion.getID(), postBinding); if (subjectConf != null) { ->>>>>>> ebc5032... Fallback to the SubjectConfirmationData NotOnOrAfter if there is no Session NotOnOrAfter value validateAudienceRestrictionCondition(assertion.getConditions()); validAssertion = assertion; // Store Session NotOnOrAfter @@ -190,19 +185,14 @@ public class SAMLSSOResponseValidator { /** * Validate the Subject (of an Authentication Statement). */ -<<<<<<< HEAD - private boolean validateAuthenticationSubject( + private org.opensaml.saml2.core.SubjectConfirmation validateAuthenticationSubject( org.opensaml.saml2.core.Subject subject, String id, boolean postBinding -======= - private org.opensaml.saml.saml2.core.SubjectConfirmation validateAuthenticationSubject( - org.opensaml.saml.saml2.core.Subject subject, String id, boolean postBinding ->>>>>>> ebc5032... Fallback to the SubjectConfirmationData NotOnOrAfter if there is no Session NotOnOrAfter value ) throws WSSecurityException { if (subject.getSubjectConfirmations() == null) { return null; } - org.opensaml.saml.saml2.core.SubjectConfirmation validSubjectConf = null; + org.opensaml.saml2.core.SubjectConfirmation validSubjectConf = null; // We need to find a Bearer Subject Confirmation method for (org.opensaml.saml2.core.SubjectConfirmation subjectConf : subject.getSubjectConfirmations()) {
