[cxf] branch 3.2.x-fixes updated (994e19e -> b5948d9)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.2.x-fixes updated (994e19e -> b5948d9)

coheigea
Administrator
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 994e19e  Recording .gitmergeinfo Changes
     new b3b99e1  Make sure we're getting the Session NotOnOrAfter from the right assertion
     new b5948d9  Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                                      | 1 +
 .../apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java  | 2 ++
 .../cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java     | 7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

Reply | Threaded
Open this post in threaded view
|

[cxf] 01/02: Make sure we're getting the Session NotOnOrAfter from the right assertion

coheigea
Administrator
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit b3b99e136ef8d59fa445770b427e3bc0f7cf3e83
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu Nov 7 17:10:38 2019 +0000

    Make sure we're getting the Session NotOnOrAfter from the right assertion
   
    (cherry picked from commit 67d670b34919dd2f64255505fcf9b3d222b56e7e)
    (cherry picked from commit 82ba7e90c8b526911639052d3b7563b3fa5139eb)
   
    # Conflicts:
    # rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
---
 .../apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java  | 2 ++
 .../cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java     | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 0dd37e1..2d15037 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
@@ -124,6 +124,8 @@ public class SAMLSSOResponseValidator {
                 if (subjectConf != null) {
                     validateAudienceRestrictionCondition(assertion.getConditions());
                     validAssertion = assertion;
+                    sessionNotOnOrAfter = null;
+
                     // Store Session NotOnOrAfter
                     for (AuthnStatement authnStatment : assertion.getAuthnStatements()) {
                         if (authnStatment.getSessionNotOnOrAfter() != null) {
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
index 9a9b44b..30fed1a 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
@@ -82,7 +82,12 @@ public class SAMLSSOResponseValidatorTest extends org.junit.Assert {
         validator.setClientAddress("http://apache.org");
         validator.setRequestId("12345");
         validator.setSpIdentifier("http://service.apache.org");
-        validator.validateSamlResponse(response, false);
+
+        SSOValidatorResponse validateSamlResponse = validator.validateSamlResponse(response, false);
+        assertEquals(response.getID(), validateSamlResponse.getResponseId());
+        assertNotNull(validateSamlResponse.getAssertionElement());
+        assertNotNull(validateSamlResponse.getCreated());
+        assertNotNull(validateSamlResponse.getSessionNotOnOrAfter());
     }
 
     @org.junit.Test

Reply | Threaded
Open this post in threaded view
|

[cxf] 02/02: Recording .gitmergeinfo Changes

coheigea
Administrator
In reply to this post by coheigea
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit b5948d9ecaee2e82239853ca2ce080f61c28b81e
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Thu Nov 7 17:25:51 2019 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2915e9b..e611bc1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -747,6 +747,7 @@ M 7808ae48865df413346f523ca6e8df7bcedb2091
 M 79db1058267302fe7febc5aaa4e0b42bf724ba90
 M 7cb48e03d9a2875bb590dc74330e3817d530d9bf
 M 818d7fc2d21cee96ec5e47c6d914403ebcaeb184
+M 82ba7e90c8b526911639052d3b7563b3fa5139eb
 M 85e2ffd0050730339b7422527b86a49f9f08b241
 M 86d7c657499b73bdbbd6ba9f1579e76ca0715357
 M 886a055d49d844e445721e4752c7a6360cbe8b9a