Sign message even if passed in inside an envelope.

[shibboleth/cpp-opensaml.git] / saml / saml1 / binding / impl / SAML1SOAPEncoder.cpp

diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
index 9e4946a..4f56e76 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
@@ -22,42 +22,67 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/HTTPResponse.h"
-#include "saml1/binding/SAML1SOAPEncoder.h"
+#include "binding/MessageEncoder.h"
+#include "signature/ContentReference.h"
 #include "saml1/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>
 
 using namespace opensaml::saml1p;
+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 {
     namespace saml1p {              
-        MessageEncoder* SAML_DLLLOCAL SAML1SOAPEncoderFactory(const DOMElement* const & e)
+        class SAML_DLLLOCAL SAML1SOAPEncoder : public MessageEncoder
         {
-            return new SAML1SOAPEncoder(e);
+        public:
+            SAML1SOAPEncoder() {}
+            virtual ~SAML1SOAPEncoder() {}
+
+            bool isUserAgentPresent() const {
+                return false;
+            }
+
+            long encode(
+                GenericResponse& genericResponse,
+                XMLObject* xmlObject,
+                const char* destination,
+                const EntityDescriptor* recipient=NULL,
+                const char* relayState=NULL,
+                const ArtifactGenerator* artifactGenerator=NULL,
+                const Credential* credential=NULL,
+                const XMLCh* signatureAlg=NULL,
+                const XMLCh* digestAlg=NULL
+                ) const;
+        };
+
+        MessageEncoder* SAML_DLLLOCAL SAML1SOAPEncoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+        {
+            return new SAML1SOAPEncoder();
         }
     };
 };
 
-SAML1SOAPEncoder::SAML1SOAPEncoder(const DOMElement* e) {}
-
 long SAML1SOAPEncoder::encode(
     GenericResponse& genericResponse,
     XMLObject* xmlObject,
     const char* destination,
-    const char* recipientID,
+    const EntityDescriptor* recipient,
     const char* relayState,
-    const CredentialResolver* credResolver,
-    const XMLCh* sigAlgorithm
+    const ArtifactGenerator* artifactGenerator,
+    const Credential* credential,
+    const XMLCh* signatureAlg,
+    const XMLCh* digestAlg
     ) const
 {
 #ifdef _DEBUG
@@ -84,31 +109,38 @@ long SAML1SOAPEncoder::encode(
             Body* body = BodyBuilder::buildBody();
             env->setBody(body);
             body->getUnknownXMLObjects().push_back(response);
-            if (credResolver ) {
+            if (credential) {
                 if (response->getSignature()) {
                     log.debug("response already signed, skipping signature operation");
                     rootElement = env->marshall();
                 }
                 else {
-                    log.debug("signing and marshalling the response");
+                    log.debug("signing the response and marshalling the envelope");
         
                     // Build a Signature.
-                    Signature* sig = buildSignature(credResolver, sigAlgorithm);
-                    response->setSignature(sig);
+                    Signature* sig = SignatureBuilder::buildSignature();
+                    response->setSignature(sig);    
+                    if (signatureAlg)
+                        sig->setSignatureAlgorithm(signatureAlg);
+                    if (digestAlg) {
+                        opensaml::ContentReference* cr = dynamic_cast<opensaml::ContentReference*>(sig->getContentReference());
+                        if (cr)
+                            cr->setDigestAlgorithm(digestAlg);
+                    }
             
                     // Sign response while marshalling.
                     vector<Signature*> sigs(1,sig);
-                    rootElement = env->marshall((DOMDocument*)NULL,&sigs);
+                    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.
@@ -129,7 +161,7 @@ long SAML1SOAPEncoder::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);
@@ -159,18 +191,46 @@ long SAML1SOAPEncoder::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()));
+        Response* response =
+            (env->getBody() && env->getBody()->hasChildren()) ?
+                dynamic_cast<Response*>(env->getBody()->getUnknownXMLObjects().front()) : NULL;
+        if (response && credential) {
+            if (response->getSignature()) {
+                log.debug("response already signed, skipping signature operation");
+                rootElement = env->marshall();
+            }
+            else {
+                log.debug("signing the response and marshalling the envelope");
+    
+                // Build a Signature.
+                Signature* sig = SignatureBuilder::buildSignature();
+                response->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.