Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / soap / impl / SOAPClient.cpp

diff --git a/xmltooling/soap/impl/SOAPClient.cpp b/xmltooling/soap/impl/SOAPClient.cpp
index dc2f6d1..23d9b8c 100644 (file)
--- a/xmltooling/soap/impl/SOAPClient.cpp
+++ b/xmltooling/soap/impl/SOAPClient.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,23 +22,22 @@
 
 #include "internal.h"
 #include "exceptions.h"
+#include "logging.h"
 #include "soap/SOAP.h"
 #include "soap/SOAPClient.h"
-#include "util/NDC.h"
 #include "util/XMLHelper.h"
-#include "validation/ValidatorSuite.h"\r
+#include "validation/ValidatorSuite.h"
 
 #include <sstream>
-#include <log4cpp/Category.hh>
 
 using namespace soap11;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 SOAPClient::~SOAPClient()
 {
-    reset();
+    delete m_transport;
 }
 
 void SOAPClient::reset()
@@ -47,19 +46,19 @@ void SOAPClient::reset()
     m_transport=NULL;
 }
 
-void SOAPClient::send(const Envelope* env, const KeyInfoSource& peer, const char* endpoint)
+void SOAPClient::send(const Envelope& env, const char* peerName, const char* endpoint)
 {
     // Prepare a transport object.
     const char* pch = strchr(endpoint,':');
     if (!pch)
         throw IOException("SOAP endpoint was not a URL.");
     string scheme(endpoint, pch-endpoint);
-    m_transport = XMLToolingConfig::getConfig().SOAPTransportManager.newPlugin(scheme.c_str(), make_pair(&peer,endpoint));
+    m_transport = XMLToolingConfig::getConfig().SOAPTransportManager.newPlugin(scheme.c_str(), make_pair(peerName,endpoint));
     prepareTransport(*m_transport);
     
     // Serialize envelope.
     stringstream s;
-    s << *env;
+    s << env;
     
     // Send to peer.
     m_transport->send(s);
@@ -75,14 +74,19 @@ Envelope* SOAPClient::receive()
     if (!out)
         return NULL;    // nothing yet
     
+    // Check content type.
+    string s = m_transport->getContentType();
+    if (s.find("text/xml") == string::npos)
+        throw IOException("Incorrect content type ($1) for SOAP response.", params(1,s.c_str() ? s.c_str() : "none"));
+    
     // Parse and bind the document into an XMLObject.
     DOMDocument* doc = (m_validate ? XMLToolingConfig::getConfig().getValidatingParser()
         : XMLToolingConfig::getConfig().getParser()).parse(out); 
     XercesJanitor<DOMDocument> janitor(doc);
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
     janitor.release();
-    if (!m_validate)\r
-        SchemaValidators.validate(xmlObject.get());\r
+    if (!m_validate)
+        SchemaValidators.validate(xmlObject.get());
 
     Envelope* env = dynamic_cast<Envelope*>(xmlObject.get());
     if (!env)
@@ -91,7 +95,7 @@ Envelope* SOAPClient::receive()
     Body* body = env->getBody();
     if (body && body->hasChildren()) {
         //Check for a Fault.
-        const Fault* fault = dynamic_cast<Fault*>(body->getXMLObjects().front());
+        const Fault* fault = dynamic_cast<Fault*>(body->getUnknownXMLObjects().front());
         if (fault && handleFault(*fault))
             throw IOException("SOAP client detected a Fault.");
     }
@@ -102,10 +106,7 @@ Envelope* SOAPClient::receive()
 
 bool SOAPClient::handleFault(const Fault& fault)
 {
-#ifdef _DEBUG
-    xmltooling::NDC ndc("receiveSAML");
-#endif
-    QName* code = (fault.getFaultcode() ? fault.getFaultcode()->getCode() : NULL);
+    const QName* code = (fault.getFaultcode() ? fault.getFaultcode()->getCode() : NULL);
     auto_ptr_char str((fault.getFaultstring() ? fault.getFaultstring()->getString() : NULL));
     Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient").error(
         "SOAP client detected a Fault: (%s) (%s)",