cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1528554 - /cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
Date Wed, 02 Oct 2013 16:34:18 GMT
Author: coheigea
Date: Wed Oct  2 16:34:17 2013
New Revision: 1528554

URL: http://svn.apache.org/r1528554
Log:
Fixing rs-security build failure

Modified:
    cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java

Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java?rev=1528554&r1=1528553&r2=1528554&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
(original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
Wed Oct  2 16:34:17 2013
@@ -30,7 +30,6 @@ import org.apache.cxf.common.logging.Log
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.common.CryptoLoader;
 import org.apache.cxf.rs.security.common.SecurityUtils;
 import org.apache.cxf.rs.security.saml.assertion.Claim;
@@ -95,28 +94,18 @@ public final class SAMLUtils {
     public static SamlAssertionWrapper createAssertion(Message message) throws Fault {
         CallbackHandler handler = SecurityUtils.getCallbackHandler(
             message, SAMLUtils.class, SecurityConstants.SAML_CALLBACK_HANDLER);
-        boolean selfSignAssertion = 
-            MessageUtils.getContextualBoolean(
-                message, SecurityConstants.SELF_SIGN_SAML_ASSERTION, false
-            );
-        return createAssertion(message, handler, selfSignAssertion);
+        return createAssertion(message, handler);
     }
     
     public static SamlAssertionWrapper createAssertion(Message message,
-                                                   CallbackHandler handler) {
-        return createAssertion(message, handler, true);
-    }
-    
-    public static SamlAssertionWrapper createAssertion(Message message,
-                                                   CallbackHandler handler,
-                                                   boolean selfSignAssertion) throws Fault
{
+                                                   CallbackHandler handler) throws Fault
{
             
         SAMLCallback samlCallback = new SAMLCallback();
         SAMLUtil.doSAMLCallback(handler, samlCallback);
         
         try {
             SamlAssertionWrapper assertion = new SamlAssertionWrapper(samlCallback);
-            if (selfSignAssertion) {
+            if (samlCallback.isSignAssertion()) {
                 //--- This code will be moved to a common utility class
                 Crypto crypto = new CryptoLoader().getCrypto(message, 
                                           SecurityConstants.SIGNATURE_CRYPTO,



Mime
View raw message