Expose a "user agent present" property.

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

diff --git a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
index ffd191f..eff4034 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPDecoder.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,7 +22,8 @@
 
 #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/soap/SOAP.h>
@@ -38,6 +39,23 @@ using namespace std;
 
 namespace opensaml {
     namespace saml1p {              
+        class SAML_DLLLOCAL SAML1SOAPDecoder : public MessageDecoder
+        {
+        public:
+            SAML1SOAPDecoder(const DOMElement* e) {}
+            virtual ~SAML1SOAPDecoder() {}
+
+            bool isUserAgentPresent() const {
+                return false;
+            }
+
+            xmltooling::XMLObject* decode(
+                std::string& relayState,
+                const GenericRequest& genericRequest,
+                SecurityPolicy& policy
+                ) const;
+        };                
+
         MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const DOMElement* const & e)
         {
             return new SAML1SOAPDecoder(e);
@@ -45,8 +63,6 @@ namespace opensaml {
     };
 };
 
-SAML1SOAPDecoder::SAML1SOAPDecoder(const DOMElement* e) {}
-
 XMLObject* SAML1SOAPDecoder::decode(
     string& relayState,
     const GenericRequest& genericRequest,
@@ -60,8 +76,8 @@ XMLObject* SAML1SOAPDecoder::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");
+    if (s.find("text/xml") == string::npos) {
+        log.warn("ignoring incorrect content type (%s)", s.c_str() ? s.c_str() : "none");
         return NULL;
     }
 
@@ -73,7 +89,7 @@ XMLObject* SAML1SOAPDecoder::decode(
     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 +99,16 @@ 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();
     if (body && body->hasChildren()) {
-        Request* request = dynamic_cast<Request*>(body->getXMLObjects().front());
+        Request* request = dynamic_cast<Request*>(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