[1/2] cxf git commit: Recording .gitmergeinfo Changes

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[1/2] cxf git commit: Recording .gitmergeinfo Changes

coheigea
Administrator
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes a41f31c1e -> cf8d2a2da


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cf8d2a2d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cf8d2a2d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cf8d2a2d

Branch: refs/heads/3.1.x-fixes
Commit: cf8d2a2dac239d395e84a079115e0dcfc489487a
Parents: 89d74c9
Author: Colm O hEigeartaigh <[hidden email]>
Authored: Thu Aug 10 15:32:51 2017 +0100
Committer: Colm O hEigeartaigh <[hidden email]>
Committed: Thu Aug 10 15:32:51 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/cf8d2a2d/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 178c1e2..eb1a7fa 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -704,6 +704,7 @@ M c255034b2d6eb99bb2753b3d6932af06fd6cbe16
 M c2b13b7473781c3c1a4225a01c319cf8aa92cd0f
 M c48c368f4622d88673dcc77c5726f5563f792b07
 M c55034d9621bc904634017b552057474afb93ac2
+M c6ec599873a67cccae0a75270900c1cbec2cd796
 M c7d50ca238184789412737ea0f0db4b5b5503326
 M c87613b800a5b2de25d861c3c74a0fb7dcf60862
 M c8828d4e2c0e79c264301a5df08fb00cf5e51be5

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[2/2] cxf git commit: NPE fix if a SAML Issuer is null

coheigea
Administrator
NPE fix if a SAML Issuer is null

# 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/89d74c90
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/89d74c90
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/89d74c90

Branch: refs/heads/3.1.x-fixes
Commit: 89d74c9041b9fa9bd2f944a85fce9b1b2546238b
Parents: a41f31c
Author: Colm O hEigeartaigh <[hidden email]>
Authored: Thu Aug 10 15:10:58 2017 +0100
Committer: Colm O hEigeartaigh <[hidden email]>
Committed: Thu Aug 10 15:32:51 2017 +0100

----------------------------------------------------------------------
 .../cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/89d74c90/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 6037934..c7d9cf8 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
@@ -168,8 +168,8 @@ public class SAMLSSOResponseValidator {
         }
         
         // Issuer value must match (be contained in) Issuer IDP
-        if (enforceKnownIssuer && !issuerIDP.startsWith(issuer.getValue())) {
-            LOG.fine("Issuer value: " + issuer.getValue() + " does not match issuer IDP: "
+        if (enforceKnownIssuer && (issuer.getValue() == null || !issuerIDP.startsWith(issuer.getValue()))) {
+            LOG.fine("Issuer value: " + issuer.getValue() + " does not match issuer IDP: "
                 + issuerIDP);
             throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
         }

Loading...