Sign message even if passed in inside an envelope.

[shibboleth/opensaml2.git] / saml / saml2 / binding / impl / SAML2SOAPEncoder.cpp

diff --git a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
index bd82eeb..c8c4739 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
@@ -27,7 +27,7 @@
 #include "saml2/core/Protocols.h"
 
 #include <sstream>
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
 #include <xmltooling/io/HTTPResponse.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/soap/SOAP.h>
@@ -37,8 +37,8 @@ using namespace opensaml::saml2md;
 using namespace opensaml;
 using namespace xmlsignature;
 using namespace soap11;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
@@ -46,7 +46,7 @@ namespace opensaml {
         class SAML_DLLLOCAL SAML2SOAPEncoder : public MessageEncoder
         {
         public:
-            SAML2SOAPEncoder(const DOMElement* e);
+            SAML2SOAPEncoder() {}
             virtual ~SAML2SOAPEncoder() {}
 
             bool isUserAgentPresent() const {
@@ -66,15 +66,13 @@ namespace opensaml {
                 ) const;
         };
 
-        MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const DOMElement* const & e)
+        MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
         {
-            return new SAML2SOAPEncoder(e);
+            return new SAML2SOAPEncoder();
         }
     };
 };
 
-SAML2SOAPEncoder::SAML2SOAPEncoder(const DOMElement* e) {}
-
 long SAML2SOAPEncoder::encode(
     GenericResponse& genericResponse,
     XMLObject* xmlObject,
@@ -104,24 +102,24 @@ long SAML2SOAPEncoder::encode(
     }
 
     DOMElement* rootElement = NULL;
-    StatusResponseType* response = dynamic_cast<StatusResponseType*>(xmlObject);
-    if (response) {
+    SignableObject* msg = dynamic_cast<SignableObject*>(xmlObject);
+    if (msg) {
         try {
             Envelope* env = EnvelopeBuilder::buildEnvelope();
             Body* body = BodyBuilder::buildBody();
             env->setBody(body);
-            body->getUnknownXMLObjects().push_back(response);
+            body->getUnknownXMLObjects().push_back(msg);
             if (credential) {
-                if (response->getSignature()) {
-                    log.debug("response already signed, skipping signature operation");
+                if (msg->getSignature()) {
+                    log.debug("message already signed, skipping signature operation");
                     rootElement = env->marshall();
                 }
                 else {
-                    log.debug("signing and marshalling the response");
+                    log.debug("signing the message and marshalling the envelope");
         
                     // Build a Signature.
                     Signature* sig = SignatureBuilder::buildSignature();
-                    response->setSignature(sig);    
+                    msg->setSignature(sig);    
                     if (signatureAlg)
                         sig->setSignatureAlgorithm(signatureAlg);
                     if (digestAlg) {
@@ -130,19 +128,19 @@ long SAML2SOAPEncoder::encode(
                             cr->setDigestAlgorithm(digestAlg);
                     }
             
-                    // Sign response while marshalling.
+                    // Sign message while marshalling.
                     vector<Signature*> sigs(1,sig);
                     rootElement = env->marshall((DOMDocument*)NULL,&sigs,credential);
                 }
             }
             else {
-                log.debug("marshalling the response");
+                log.debug("marshalling the envelope");
                 rootElement = env->marshall();
             }
             
             stringstream s;
             s << *rootElement;
-            log.debug("sending serialized response");
+            log.debug("sending serialized envelope");
             long ret = genericResponse.sendResponse(s);
         
             // Cleanup by destroying XML.
@@ -152,9 +150,9 @@ long SAML2SOAPEncoder::encode(
         catch (XMLToolingException&) {
             // A bit weird...we have to "revert" things so that the response is isolated
             // so the caller can free it.
-            if (response->getParent()) {
-                response->getParent()->detach();
-                response->detach();
+            if (msg->getParent()) {
+                msg->getParent()->detach();
+                msg->detach();
             }
             throw;
         }
@@ -163,7 +161,7 @@ long SAML2SOAPEncoder::encode(
     Fault* fault = dynamic_cast<Fault*>(xmlObject);
     if (fault) {
         try {
-            log.debug("building Envelope and marshalling Fault");
+            log.debug("building envelope and marshalling fault");
             Envelope* env = EnvelopeBuilder::buildEnvelope();
             Body* body = BodyBuilder::buildBody();
             env->setBody(body);
@@ -193,18 +191,46 @@ long SAML2SOAPEncoder::encode(
 
     Envelope* env = dynamic_cast<Envelope*>(xmlObject);
     if (env) {
-        log.debug("marshalling envelope");
-        rootElement = env->marshall();
-
-        bool error =
-            (env->getBody() &&
-                env->getBody()->hasChildren() &&
-                    dynamic_cast<Fault*>(env->getBody()->getUnknownXMLObjects().front()));
+        SignableObject* msg =
+            (env->getBody() && env->getBody()->hasChildren()) ?
+                dynamic_cast<SignableObject*>(env->getBody()->getUnknownXMLObjects().front()) : NULL;
+        if (msg && credential) {
+            if (msg->getSignature()) {
+                log.debug("message already signed, skipping signature operation");
+                rootElement = env->marshall();
+            }
+            else {
+                log.debug("signing the message and marshalling the envelope");
+    
+                // Build a Signature.
+                Signature* sig = SignatureBuilder::buildSignature();
+                msg->setSignature(sig);    
+                if (signatureAlg)
+                    sig->setSignatureAlgorithm(signatureAlg);
+                if (digestAlg) {
+                    opensaml::ContentReference* cr = dynamic_cast<opensaml::ContentReference*>(sig->getContentReference());
+                    if (cr)
+                        cr->setDigestAlgorithm(digestAlg);
+                }
+        
+                // Sign message while marshalling.
+                vector<Signature*> sigs(1,sig);
+                rootElement = env->marshall((DOMDocument*)NULL,&sigs,credential);
+            }
+        }
+        else {
+            log.debug("marshalling the envelope");
+            rootElement = env->marshall();
+        }
 
         string xmlbuf;
         XMLHelper::serialize(rootElement, xmlbuf);
         istringstream s(xmlbuf);
         log.debug("sending serialized envelope");
+        bool error =
+            (env->getBody() &&
+                env->getBody()->hasChildren() &&
+                    dynamic_cast<Fault*>(env->getBody()->getUnknownXMLObjects().front()));
         long ret = error ? genericResponse.sendError(s) : genericResponse.sendResponse(s);
     
         // Cleanup by destroying XML.
@@ -212,5 +238,5 @@ long SAML2SOAPEncoder::encode(
         return ret;
     }
 
-    throw BindingException("XML content for SAML 2.0 SOAP Encoder must be a SAML 2.0 response or SOAP Fault/Envelope.");
+    throw BindingException("XML content for SAML 2.0 SOAP Encoder must be a SAML 2.0 message or SOAP Fault/Envelope.");
 }