X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml1%2Fbinding%2Fimpl%2FSAML1SOAPDecoder.cpp;h=4d88e7d25001847af826c017bee74485fae30638;hb=a0323c50525a6ff43795da2dc786e5aeaf726d41;hp=3ebdc0ce34b4082f689b5f712082b564a299834d;hpb=2cf60ce131535beae932489d2d1e3d2355799061;p=shibboleth%2Fopensaml2.git

diff --git a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
index 3ebdc0c..4d88e7d 100644
--- a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
@@ -22,9 +22,10 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "saml1/binding/SAML1SOAPDecoder.h"
+#include "binding/MessageDecoder.h"
+#include "saml1/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::saml1p;
 using namespace opensaml;
 using namespace soap11;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
     namespace saml1p {              
-        MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const DOMElement* const & e)
+        class SAML_DLLLOCAL SAML1SOAPDecoder : public MessageDecoder
         {
-            return new SAML1SOAPDecoder(e);
+        public:
+            SAML1SOAPDecoder() {}
+            virtual ~SAML1SOAPDecoder() {}
+
+            bool isUserAgentPresent() const {
+                return false;
+            }
+
+            xmltooling::XMLObject* decode(
+                std::string& relayState,
+                const GenericRequest& genericRequest,
+                SecurityPolicy& policy
+                ) const;
+        };                
+
+        MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+        {
+            return new SAML1SOAPDecoder();
         }
     };
 };
 
-SAML1SOAPDecoder::SAML1SOAPDecoder(const DOMElement* e) {}
-
 XMLObject* SAML1SOAPDecoder::decode(
     string& relayState,
     const GenericRequest& genericRequest,
@@ -62,18 +78,16 @@ XMLObject* SAML1SOAPDecoder::decode(
     string s = genericRequest.getContentType();
     if (s.find("text/xml") == string::npos) {
         log.warn("ignoring incorrect content type (%s)", s.c_str() ? s.c_str() : "none");
-        return NULL;
+        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,7 +97,7 @@ XMLObject* SAML1SOAPDecoder::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();
@@ -91,8 +105,18 @@ XMLObject* SAML1SOAPDecoder::decode(
         Request* request = dynamic_cast<Request*>(body->getUnknownXMLObjects().front());
         if (request) {
             // Run through the policy at two layers.
-            policy.evaluate(*env, &genericRequest);
-            policy.evaluate(*request, &genericRequest);
+            pair<bool,int> minor = request->getMinorVersion();
+            policy.evaluate(
+                *env,
+                &genericRequest,
+                (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM
+                );
+            policy.reset(true);
+            policy.evaluate(
+                *request,
+                &genericRequest,
+                (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM
+                );
             xmlObject.release();
             body->detach(); // frees Envelope
             request->detach();   // frees Body
@@ -100,5 +124,5 @@ XMLObject* SAML1SOAPDecoder::decode(
         }
     }
     
-    throw BindingException("SOAP Envelope did not contain a SAML Request.");
+    throw BindingException("SOAP Envelope did not contain a SAML 1.x Request.");
 }