Update copyright.

[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 6df390b..3ebdc0c 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.
@@ -47,7 +47,7 @@ namespace opensaml {
 
 SAML1SOAPDecoder::SAML1SOAPDecoder(const DOMElement* e) {}
 
-Request* SAML1SOAPDecoder::decode(
+XMLObject* SAML1SOAPDecoder::decode(
     string& relayState,
     const GenericRequest& genericRequest,
     SecurityPolicy& policy
@@ -60,8 +60,8 @@ Request* 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;
     }
 
@@ -88,11 +88,11 @@ Request* SAML1SOAPDecoder::decode(
     
     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