Multi-line svn commit, see body.

[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 2d9d22f..8325d33 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
@@ -22,10 +22,10 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/MessageDecoder.h"
+#include "saml2/binding/SAML2MessageDecoder.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>
@@ -33,16 +33,16 @@
 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 {              
-        class SAML_DLLLOCAL SAML2SOAPDecoder : public MessageDecoder
+        class SAML_DLLLOCAL SAML2SOAPDecoder : public SAML2MessageDecoder
         {
         public:
-            SAML2SOAPDecoder(const DOMElement* e);
+            SAML2SOAPDecoder() {}
             virtual ~SAML2SOAPDecoder() {}
 
             bool isUserAgentPresent() const {
@@ -56,15 +56,13 @@ namespace opensaml {
                 ) const;
         };                
 
-        MessageDecoder* SAML_DLLLOCAL SAML2SOAPDecoderFactory(const DOMElement* const & e)
+        MessageDecoder* SAML_DLLLOCAL SAML2SOAPDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
         {
-            return new SAML2SOAPDecoder(e);
+            return new SAML2SOAPDecoder();
         }
     };
 };
 
-SAML2SOAPDecoder::SAML2SOAPDecoder(const DOMElement* e) {}
-
 XMLObject* SAML2SOAPDecoder::decode(
     string& relayState,
     const GenericRequest& genericRequest,
@@ -107,7 +105,10 @@ XMLObject* SAML2SOAPDecoder::decode(
         RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(body->getUnknownXMLObjects().front());
         if (request) {
             // Run through the policy at two layers.
+            extractMessageDetails(*env, genericRequest, samlconstants::SAML20P_NS, policy);
             policy.evaluate(*env, &genericRequest);
+            policy.reset(true);
+            extractMessageDetails(*request, genericRequest, samlconstants::SAML20P_NS, policy);
             policy.evaluate(*request, &genericRequest);
             xmlObject.release();
             body->detach(); // frees Envelope