X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2Fimpl%2FSAML1SOAPEncoder.cpp;h=c8e9e5641dda7a1d8dcaf70b14fc65a24b69917b;hb=058cbd0d0333f2c1b019c9efc51293514ec799a2;hp=b112dae120542dd2010622b02bb12a6de4ef0051;hpb=c3c89629114e8a29b8c9a769956b6b4e7e2c4c24;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
index b112dae..c8e9e56 100644
--- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.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,12 +22,13 @@
 
 #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/io/HTTPResponse.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/soap/SOAP.h>
 
@@ -41,6 +42,24 @@ using namespace std;
 
 namespace opensaml {
     namespace saml1p {              
+        class SAML_DLLLOCAL SAML1SOAPEncoder : public MessageEncoder
+        {
+        public:
+            SAML1SOAPEncoder(const DOMElement* e) {}
+            virtual ~SAML1SOAPEncoder() {}
+            
+            long encode(
+                GenericResponse& genericResponse,
+                XMLObject* xmlObject,
+                const char* destination,
+                const char* recipientID=NULL,
+                const char* relayState=NULL,
+                const Credential* credential=NULL,
+                const XMLCh* signatureAlg=NULL,
+                const XMLCh* digestAlg=NULL
+                ) const;
+        };
+
         MessageEncoder* SAML_DLLLOCAL SAML1SOAPEncoderFactory(const DOMElement* const & e)
         {
             return new SAML1SOAPEncoder(e);
@@ -48,16 +67,15 @@ namespace opensaml {
     };
 };
 
-SAML1SOAPEncoder::SAML1SOAPEncoder(const DOMElement* e) {}
-
 long SAML1SOAPEncoder::encode(
     GenericResponse& genericResponse,
     XMLObject* xmlObject,
     const char* destination,
     const char* recipientID,
     const char* relayState,
-    const CredentialResolver* credResolver,
-    const XMLCh* sigAlgorithm
+    const Credential* credential,
+    const XMLCh* signatureAlg,
+    const XMLCh* digestAlg
     ) const
 {
 #ifdef _DEBUG
@@ -72,8 +90,8 @@ long SAML1SOAPEncoder::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 +101,8 @@ long SAML1SOAPEncoder::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 +111,19 @@ long SAML1SOAPEncoder::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 +131,8 @@ long SAML1SOAPEncoder::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 +158,7 @@ long SAML1SOAPEncoder::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 +190,7 @@ long SAML1SOAPEncoder::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);