X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fbinding%2Fimpl%2FSOAPClient.cpp;h=91209514ba42c456e7f9a78ae3c4cc24bee3df46;hp=2a6261e63b6016bbdc2a0a4e4b816f9f39c4fcb4;hb=e3441d806df3147cbe2554a7febf2a58d821c504;hpb=730ef8006d0bdf6a6d111e416b8828c02f58fc32

diff --git a/saml/binding/impl/SOAPClient.cpp b/saml/binding/impl/SOAPClient.cpp
index 2a6261e..9120951 100644
--- a/saml/binding/impl/SOAPClient.cpp
+++ b/saml/binding/impl/SOAPClient.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 #include "internal.h"
 #include "exceptions.h"
 #include "version.h"
+#include "binding/SecurityPolicy.h"
 #include "binding/SOAPClient.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
@@ -30,6 +31,7 @@
 #include <xmltooling/security/X509TrustEngine.h>
 #include <xmltooling/soap/SOAP.h>
 #include <xmltooling/soap/HTTPSOAPTransport.h>
+#include <xsec/framework/XSECDefs.hpp>
 
 using namespace opensaml::saml2;
 using namespace opensaml::saml2md;
@@ -37,30 +39,49 @@ using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 
-void SOAPClient::send(const soap11::Envelope* env, const KeyInfoSource& peer, const char* endpoint)
+SOAPClient::SOAPClient(SecurityPolicy& policy)
+    : soap11::SOAPClient(policy.getValidating()), m_policy(policy), m_force(true), m_peer(NULL), m_criteria(NULL)
+{
+}
+
+void SOAPClient::send(const soap11::Envelope& env, const char* from, MetadataCredentialCriteria& to, const char* endpoint)
 {
     // Clear policy.
     m_policy.reset();
+
+    m_criteria = &to;
+    m_peer = &(to.getRole());
     
-    m_peer = dynamic_cast<const RoleDescriptor*>(&peer);
-    
-    soap11::SOAPClient::send(env, peer, endpoint);
+    const xmltooling::QName& role = m_peer->getElementQName();
+    if (XMLString::equals(role.getLocalPart(),RoleDescriptor::LOCAL_NAME))
+        m_policy.setRole(m_peer->getSchemaType());
+    else
+        m_policy.setRole(&role);
+
+    // Establish the "expected" issuer identity.
+    const XMLCh* entityID = dynamic_cast<const EntityDescriptor*>(m_peer->getParent())->getEntityID();
+    m_policy.setIssuer(entityID);
+    if (!m_policy.getIssuerMetadata())
+        m_policy.setIssuerMetadata(m_peer);
+
+    // Call the base class.
+    auto_ptr_char pn(entityID);
+    soap11::SOAPClient::send(env, SOAPTransport::Address(from, pn.get(), 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("Xerces-C", XERCES_FULLVERSIONDOT);
-        http->setRequestHeader("XML-Security-C", XSEC_VERSION);
+        http->setRequestHeader("XML-Security-C", XSEC_FULLVERSIONDOT);
         http->setRequestHeader("OpenSAML-C", OPENSAML_FULLVERSIONDOT);
     }
     
     const X509TrustEngine* engine = dynamic_cast<const X509TrustEngine*>(m_policy.getTrustEngine());
     if (engine) {
-        const MetadataProvider* metadata = m_policy.getMetadataProvider();
-        if (!transport.setTrustEngine(engine, m_force, metadata ? metadata->getKeyResolver() : NULL))
+        if (!transport.setTrustEngine(engine, m_policy.getMetadataProvider(), m_criteria, m_force))
             throw BindingException("Unable to install X509TrustEngine into SOAPTransport.");
     }
 }
@@ -69,17 +90,12 @@ soap11::Envelope* SOAPClient::receive()
 {
     auto_ptr<soap11::Envelope> env(soap11::SOAPClient::receive());
     if (env.get()) {
-        if (m_peer && m_transport->isSecure()) {
-            // Set issuer based on peer identity.
-            EntityDescriptor* parent = dynamic_cast<EntityDescriptor*>(m_peer->getParent());
-            if (parent) {
-                Issuer* issuer = IssuerBuilder::buildIssuer();
-                issuer->setName(parent->getEntityID());
-                m_policy.setIssuer(issuer);
-                m_policy.setIssuerMetadata(m_peer);
-                m_policy.setSecure(true);
-            }
+        if (m_peer && m_transport->isAuthenticated()) {
+            // Set flag based on peer identity.
+            m_policy.setAuthenticated(true);
         }
+
+        // Run policy against SOAP layer.
         m_policy.evaluate(*(env.get()));
     }
     return env.release();
@@ -87,8 +103,8 @@ soap11::Envelope* SOAPClient::receive()
 
 void SOAPClient::reset()
 {
+    m_criteria = NULL;
+    m_peer = NULL;
     soap11::SOAPClient::reset();
     m_policy.reset();
-    XMLString::release(&m_correlate);
-    m_correlate=NULL;
 }