Also return the Assertion that was validated # Conflicts: # rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5e2a3879 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5e2a3879 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5e2a3879 Branch: refs/heads/3.1.x-fixes Commit: 5e2a38799be73267204241c532a0352ce94bd2e5 Parents: 726e619 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Aug 3 14:16:41 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Aug 3 14:17:42 2017 +0100 ---------------------------------------------------------------------- .../rs/security/saml/sso/SAMLSSOResponseValidator.java | 5 +++++ .../cxf/rs/security/saml/sso/SSOValidatorResponse.java | 10 ++++++++++ 2 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5e2a3879/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 d060671..36d777a 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 @@ -154,7 +154,12 @@ public class SAMLSSOResponseValidator { Element clonedAssertionElement = (Element)assertionElement.cloneNode(true); validatorResponse.setAssertionElement(clonedAssertionElement); validatorResponse.setAssertion(DOM2Writer.nodeToString(clonedAssertionElement)); +<<<<<<< HEAD +======= + validatorResponse.setOpensamlAssertion(validAssertion); + +>>>>>>> 530498a452... Also return the Assertion that was validated return validatorResponse; } http://git-wip-us.apache.org/repos/asf/cxf/blob/5e2a3879/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java index 1a82357..f3f6557 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java @@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.saml.sso; import java.util.Date; import org.w3c.dom.Element; +import org.opensaml.saml.saml2.core.Assertion; /** * Some information that encapsulates a successful validation by the SAMLSSOResponseValidator @@ -31,6 +32,7 @@ public class SSOValidatorResponse { private String responseId; private String assertion; private Element assertionElement; + private Assertion opensamlAssertion; public String getAssertion() { return assertion; @@ -71,4 +73,12 @@ public class SSOValidatorResponse { public void setCreated(Date created) { this.created = created; } + + public Assertion getOpensamlAssertion() { + return opensamlAssertion; + } + + public void setOpensamlAssertion(Assertion opensamlAssertion) { + this.opensamlAssertion = opensamlAssertion; + } }
