Multi-line svn commit, see body.

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

diff --git a/saml/saml2/binding/impl/SAML2SOAPClient.cpp b/saml/saml2/binding/impl/SAML2SOAPClient.cpp
index 7ed6c1b..08cba6d 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPClient.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPClient.cpp
@@ -26,18 +26,18 @@
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
 #include <xmltooling/soap/SOAP.h>
 
 using namespace opensaml::saml2p;
 using namespace opensaml::saml2md;
 using namespace opensaml;
 using namespace soap11;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
-void SAML2SOAPClient::sendSAML(RequestAbstractType* request, const RoleDescriptor& peer, const char* endpoint)
+void SAML2SOAPClient::sendSAML(RequestAbstractType* request, MetadataCredentialCriteria& peer, const char* endpoint)
 {
     auto_ptr<Envelope> env(EnvelopeBuilder::buildEnvelope());
     Body* body = BodyBuilder::buildBody();
@@ -59,17 +59,25 @@ StatusResponseType* SAML2SOAPClient::receiveSAML()
                 
                 // Check InResponseTo.
                 if (m_correlate && response->getInResponseTo() && !XMLString::equals(m_correlate, response->getInResponseTo()))
-                    throw BindingException("InResponseTo attribute did not correlate with the Request ID.");
-                
+                    throw SecurityPolicyException("InResponseTo attribute did not correlate with the Request ID.");
+
+                m_soaper.getPolicy().reset(true);
+                m_soaper.getPolicy().evaluate(*response, NULL, samlconstants::SAML20P_NS);
+                if (!m_soaper.getPolicy().isSecure()) {
+                    SecurityPolicyException ex("Security policy could not authenticate the message.");
+                    annotateException(&ex, m_soaper.getPolicy().getIssuerMetadata(), response->getStatus());   // throws it
+                }
+
                 // Check Status.
                 Status* status = response->getStatus();
                 if (status) {
                     const XMLCh* code = status->getStatusCode() ? status->getStatusCode()->getValue() : NULL;
-                    if (code && !XMLString::equals(code,StatusCode::SUCCESS) && handleError(*status))
-                        throw BindingException("SAML Response contained an error.");
+                    if (code && !XMLString::equals(code,StatusCode::SUCCESS) && handleError(*status)) {
+                        BindingException ex("SAML response contained an error.");
+                        annotateException(&ex, m_soaper.getPolicy().getIssuerMetadata(), status);   // throws it
+                    }
                 }
                 
-                m_soaper.getPolicy().evaluate(*response);
                 env.release();
                 body->detach(); // frees Envelope
                 response->detach();   // frees Body
@@ -77,7 +85,11 @@ StatusResponseType* SAML2SOAPClient::receiveSAML()
             }
         }
         
-        throw BindingException("SOAP Envelope did not contain a SAML Response or a Fault.");
+        BindingException ex("SOAP Envelope did not contain a SAML Response or a Fault.");
+        if (m_soaper.getPolicy().getIssuerMetadata())
+            annotateException(&ex, m_soaper.getPolicy().getIssuerMetadata());   // throws it
+        else
+            ex.raise();
     }
     return NULL;
 }
@@ -91,5 +103,5 @@ bool SAML2SOAPClient::handleError(const Status& status)
         (code.get() ? code.get() : "no code"),
         (str.get() ? str.get() : "no message")
         );
-    return true;
+    return m_fatal;
 }