cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Wed, 04 Feb 2015 17:11:51 GMT
Fixing merge


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

Branch: refs/heads/2.7.x-fixes
Commit: cfd1ae31590e68df0a1c35e9393b21daf887ee78
Parents: b3d359e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Feb 4 17:10:54 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Feb 4 17:10:54 2015 +0000

----------------------------------------------------------------------
 .../rs/security/saml/AbstractSamlInHandler.java  | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/cfd1ae31/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
index cc4e1f1..a1d108d 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
@@ -154,9 +154,6 @@ public abstract class AbstractSamlInHandler implements RequestHandler
{
         }
     }
     
-<<<<<<< HEAD
-    protected void checkSubjectConfirmationData(Message message, AssertionWrapper assertion)
{
-=======
     protected void configureAudienceRestriction(Message msg, RequestData reqData) {
         // Add Audience Restrictions for SAML
         boolean enableAudienceRestriction = 
@@ -172,21 +169,7 @@ public abstract class AbstractSamlInHandler implements RequestHandler
{
         }
     }
     
-    protected SAMLKeyInfo createKeyInfoFromDefaultAlias(Crypto sigCrypto) throws WSSecurityException
{
-        try {
-            X509Certificate[] certs = SecurityUtils.getCertificates(sigCrypto, 
-                                                                    sigCrypto.getDefaultX509Identifier());
-            SAMLKeyInfo samlKeyInfo = new SAMLKeyInfo(new X509Certificate[]{certs[0]});
-            samlKeyInfo.setPublicKey(certs[0].getPublicKey());
-            return samlKeyInfo;
-        } catch (Exception ex) {
-            LOG.log(Level.FINE, "Error in loading the certificates: " + ex.getMessage(),
ex);
-            throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_SIGNATURE,
ex);
-        }
-    }
-    
-    protected void checkSubjectConfirmationData(Message message, SamlAssertionWrapper assertion)
{
->>>>>>> 0377022... Add the ability to validate SAML Audience Restrictions.
Defaults to false unlike for SOAP
+    protected void checkSubjectConfirmationData(Message message, AssertionWrapper assertion)
{
         Certificate[] tlsCerts = getTLSCertificates(message);
         if (!checkHolderOfKey(message, assertion, tlsCerts)) {
             throwFault("Holder Of Key claim fails", null);


Mime
View raw message