Correct constness of transport API, update version.

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

diff --git a/saml/binding/impl/SOAPClient.cpp b/saml/binding/impl/SOAPClient.cpp
index e97d326..22e4f8a 100644 (file)
--- a/saml/binding/impl/SOAPClient.cpp
+++ b/saml/binding/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.
@@ -37,25 +37,31 @@ using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 
-void SOAPClient::send(const soap11::Envelope* env, const KeyInfoSource& peer, const char* endpoint)
+void SOAPClient::send(const soap11::Envelope& env, const KeyInfoSource& peer, const char* endpoint)
 {
     // Clear policy.
-    m_policy.setIssuer(NULL);
-    m_policy.setIssuerMetadata(NULL);
+    m_policy.reset();
     
-    m_peer = dynamic_cast<const RoleDescriptor*>(&peer);
+    if (!m_peer)
+        m_peer = dynamic_cast<const RoleDescriptor*>(&peer);
+    if (m_peer) {
+        const QName& role = m_peer->getElementQName();
+        if (XMLString::equals(role.getLocalPart(),RoleDescriptor::LOCAL_NAME))
+            m_policy.setRole(m_peer->getSchemaType());
+        else
+            m_policy.setRole(&role);
+    }
     
     soap11::SOAPClient::send(env, peer, endpoint);
 }
 
-void SOAPClient::prepareTransport(const xmltooling::SOAPTransport& transport)
+void SOAPClient::prepareTransport(xmltooling::SOAPTransport& transport)
 {
-    const HTTPSOAPTransport* http = dynamic_cast<const HTTPSOAPTransport*>(&transport);
+    HTTPSOAPTransport* http = dynamic_cast<HTTPSOAPTransport*>(&transport);
     if (http) {
         http->setRequestHeader("SOAPAction", "http://www.oasis-open.org/committees/security");
-        http->setRequestHeader("Shibboleth", PACKAGE_VERSION);
         http->setRequestHeader("Xerces-C", XERCES_FULLVERSIONDOT);
-        http->setRequestHeader("XML-Security-C", XSEC_VERSION);
+        http->setRequestHeader("XML-Security-C", XSEC_FULLVERSIONDOT);
         http->setRequestHeader("OpenSAML-C", OPENSAML_FULLVERSIONDOT);
     }
     
@@ -79,9 +85,17 @@ soap11::Envelope* SOAPClient::receive()
                 issuer->setName(parent->getEntityID());
                 m_policy.setIssuer(issuer);
                 m_policy.setIssuerMetadata(m_peer);
+                m_policy.setSecure(true);
             }
         }
         m_policy.evaluate(*(env.get()));
     }
     return env.release();
 }
+
+void SOAPClient::reset()
+{
+    m_peer = NULL;
+    soap11::SOAPClient::reset();
+    m_policy.reset();
+}