Convert logging to log4shib via compile time switch.

[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 7b56dee..9eaac3f 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,48 +22,73 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/HTTPResponse.h"
-#include "saml2/binding/SAML2SOAPEncoder.h"
+#include "binding/MessageEncoder.h"
+#include "signature/ContentReference.h"
 #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>
 
 using namespace opensaml::saml2p;
+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 saml2p {              
-        MessageEncoder* SAML_DLLLOCAL SAML2SOAPEncoderFactory(const DOMElement* const & e)
+        class SAML_DLLLOCAL SAML2SOAPEncoder : public MessageEncoder
         {
-            return new SAML2SOAPEncoder(e);
+        public:
+            SAML2SOAPEncoder() {}
+            virtual ~SAML2SOAPEncoder() {}
+
+            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 SAML2SOAPEncoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+        {
+            return new SAML2SOAPEncoder();
         }
     };
 };
 
-SAML2SOAPEncoder::SAML2SOAPEncoder(const DOMElement* e) {}
-
 long SAML2SOAPEncoder::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
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML1SOAP");
+    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2SOAP");
 
     log.debug("validating input");
     if (xmlObject->getParent())
@@ -72,8 +97,8 @@ long SAML2SOAPEncoder::encode(
     genericResponse.setContentType("text/xml");
     HTTPResponse* httpResponse = dynamic_cast<HTTPResponse*>(&genericResponse);
     if (httpResponse) {
-        httpResponse->setHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
-        httpResponse->setHeader("Pragma", "no-cache");
+        httpResponse->setResponseHeader("Cache-Control", "no-cache, no-store, must-revalidate, private");
+        httpResponse->setResponseHeader("Pragma", "no-cache");
     }
 
     DOMElement* rootElement = NULL;
@@ -83,8 +108,8 @@ long SAML2SOAPEncoder::encode(
             Envelope* env = EnvelopeBuilder::buildEnvelope();
             Body* body = BodyBuilder::buildBody();
             env->setBody(body);
-            body->getXMLObjects().push_back(response);
-            if (credResolver ) {
+            body->getUnknownXMLObjects().push_back(response);
+            if (credential) {
                 if (response->getSignature()) {
                     log.debug("response already signed, skipping signature operation");
                     rootElement = env->marshall();
@@ -93,12 +118,19 @@ long SAML2SOAPEncoder::encode(
                     log.debug("signing and marshalling the response");
         
                     // 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 {
@@ -106,9 +138,8 @@ long SAML2SOAPEncoder::encode(
                 rootElement = env->marshall();
             }
             
-            string xmlbuf;
-            XMLHelper::serialize(rootElement, xmlbuf);
-            istringstream s(xmlbuf);
+            stringstream s;
+            s << *rootElement;
             log.debug("sending serialized response");
             long ret = genericResponse.sendResponse(s);
         
@@ -134,7 +165,7 @@ long SAML2SOAPEncoder::encode(
             Envelope* env = EnvelopeBuilder::buildEnvelope();
             Body* body = BodyBuilder::buildBody();
             env->setBody(body);
-            body->getXMLObjects().push_back(fault);
+            body->getUnknownXMLObjects().push_back(fault);
             rootElement = env->marshall();
     
             string xmlbuf;
@@ -166,7 +197,7 @@ long SAML2SOAPEncoder::encode(
         bool error =
             (env->getBody() &&
                 env->getBody()->hasChildren() &&
-                    dynamic_cast<Fault*>(env->getBody()->getXMLObjects().front()));
+                    dynamic_cast<Fault*>(env->getBody()->getUnknownXMLObjects().front()));
 
         string xmlbuf;
         XMLHelper::serialize(rootElement, xmlbuf);