X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2SOAPDecoder.cpp;h=a0111e5fd199a38e6241a98e08bc2c03eb5ba30e;hb=9fddf9054c76de6239295b98a559fcc75453effc;hp=8ff37384faf050cf48356504a0527a77a49dc9b6;hpb=8f53bb3c89084f56ec3dc331d1f553d515d9c6af;p=shibboleth%2Fopensaml2.git

diff --git a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
index 8ff3738..a0111e5 100644
--- a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPDecoder.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,9 +22,10 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "saml2/binding/SAML2SOAPDecoder.h"
+#include "binding/MessageDecoder.h"
+#include "saml2/core/Protocols.h"
 
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
 #include <xmltooling/soap/SOAP.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/validation/ValidatorSuite.h>
@@ -32,21 +33,36 @@
 using namespace opensaml::saml2p;
 using namespace opensaml;
 using namespace soap11;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
     namespace saml2p {              
-        MessageDecoder* SAML_DLLLOCAL SAML2SOAPDecoderFactory(const DOMElement* const & e)
+        class SAML_DLLLOCAL SAML2SOAPDecoder : public MessageDecoder
         {
-            return new SAML2SOAPDecoder(e);
+        public:
+            SAML2SOAPDecoder() {}
+            virtual ~SAML2SOAPDecoder() {}
+
+            bool isUserAgentPresent() const {
+                return false;
+            }
+
+            xmltooling::XMLObject* decode(
+                std::string& relayState,
+                const GenericRequest& genericRequest,
+                SecurityPolicy& policy
+                ) const;
+        };                
+
+        MessageDecoder* SAML_DLLLOCAL SAML2SOAPDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+        {
+            return new SAML2SOAPDecoder();
         }
     };
 };
 
-SAML2SOAPDecoder::SAML2SOAPDecoder(const DOMElement* e) {}
-
 XMLObject* SAML2SOAPDecoder::decode(
     string& relayState,
     const GenericRequest& genericRequest,
@@ -60,20 +76,18 @@ XMLObject* SAML2SOAPDecoder::decode(
 
     log.debug("validating input");
     string s = genericRequest.getContentType();
-    if (s != "text/xml") {
-        log.warn("ignoring incorrect Content Type (%s)", s.c_str() ? s.c_str() : "none");
-        return NULL;
+    if (s.find("text/xml") == string::npos) {
+        log.warn("ignoring incorrect content type (%s)", s.c_str() ? s.c_str() : "none");
+        throw BindingException("Invalid content type for SOAP message.");
     }
 
     const char* data = genericRequest.getRequestBody();
-    if (!data) {
-        log.warn("empty request body");
-        return NULL;
-    }
+    if (!data)
+        throw BindingException("SOAP message had an empty request body.");
     istringstream is(data);
     
     // Parse and bind the document into an XMLObject.
-    DOMDocument* doc = (m_validate ? XMLToolingConfig::getConfig().getValidatingParser()
+    DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
         : XMLToolingConfig::getConfig().getParser()).parse(is); 
     XercesJanitor<DOMDocument> janitor(doc);
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
@@ -83,16 +97,16 @@ XMLObject* SAML2SOAPDecoder::decode(
     if (!env)
         throw BindingException("Decoded message was not a SOAP 1.1 Envelope.");
 
-    if (!m_validate)
+    if (!policy.getValidating())
         SchemaValidators.validate(env);
     
     Body* body = env->getBody();
     if (body && body->hasChildren()) {
-        RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(body->getXMLObjects().front());
+        RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(body->getUnknownXMLObjects().front());
         if (request) {
             // Run through the policy at two layers.
-            policy.evaluate(genericRequest, *env);
-            policy.evaluate(genericRequest, *request);
+            policy.evaluate(*env, &genericRequest);
+            policy.evaluate(*request, &genericRequest);
             xmlObject.release();
             body->detach(); // frees Envelope
             request->detach();   // frees Body