Add XML validation flag to policy.

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

diff --git a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
index 8ff3738..f2fb1a9 100644 (file)
--- 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.
@@ -60,8 +60,8 @@ 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");
+    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 +73,7 @@ XMLObject* SAML2SOAPDecoder::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 +83,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