#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>
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 {
class SAML_DLLLOCAL SAML1SOAPDecoder : public MessageDecoder
{
public:
- SAML1SOAPDecoder(const DOMElement* e) {}
+ SAML1SOAPDecoder() {}
virtual ~SAML1SOAPDecoder() {}
bool isUserAgentPresent() const {
) const;
};
- MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const DOMElement* const & e)
+ MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
- return new SAML1SOAPDecoder(e);
+ return new SAML1SOAPDecoder();
}
};
};
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
}
}
- throw BindingException("SOAP Envelope did not contain a SAML Request.");
+ throw BindingException("SOAP Envelope did not contain a SAML 1.x Request.");
}