/*
- * 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.
#include "internal.h"
#include "exceptions.h"
-#include "binding/MessageFlowRule.h"
+#include "binding/SecurityPolicyRule.h"
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
#include <xmltooling/util/ReplayCache.h>
#include <xercesc/util/XMLUniDefs.hpp>
using namespace opensaml;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
+ class SAML_DLLLOCAL MessageFlowRule : public SecurityPolicyRule
+ {
+ public:
+ MessageFlowRule(const DOMElement* e);
+ virtual ~MessageFlowRule() {}
+
+ void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+
+ private:
+ bool m_checkReplay;
+ time_t m_expires;
+ };
+
SecurityPolicyRule* SAML_DLLLOCAL MessageFlowRuleFactory(const DOMElement* const & e)
{
return new MessageFlowRule(e);
Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.MessageFlow");
log.debug("evaluating message flow policy (replay checking %s, expiration %lu)", m_checkReplay ? "on" : "off", m_expires);
+ time_t now = time(NULL);
+ time_t skew = XMLToolingConfig::getConfig().clock_skew_secs;
time_t issueInstant = policy.getIssueInstant();
if (issueInstant == 0) {
- log.error("unknown message timestamp");
- throw BindingException("Message rejected, no timestamp available.");
- }
-
- time_t skew = XMLToolingConfig::getConfig().clock_skew_secs;
- time_t now = time(NULL);
- if (issueInstant > now + skew) {
- log.errorStream() << "rejected not-yet-valid message, timestamp (" << issueInstant <<
- "), newest allowed (" << now + skew << ")" << CategoryStream::ENDLINE;
- throw BindingException("Message rejected, was issued in the future.");
+ issueInstant = now;
}
- else if (issueInstant < now - skew - m_expires) {
- log.errorStream() << "rejected expired message, timestamp (" << issueInstant <<
- "), oldest allowed (" << (now - skew - m_expires) << ")" << CategoryStream::ENDLINE;
- throw BindingException("Message expired, was issued too long ago.");
+ else {
+ if (issueInstant > now + skew) {
+ log.errorStream() << "rejected not-yet-valid message, timestamp (" << issueInstant <<
+ "), newest allowed (" << now + skew << ")" << CategoryStream::ENDLINE;
+ throw SecurityPolicyException("Message rejected, was issued in the future.");
+ }
+ else if (issueInstant < now - skew - m_expires) {
+ log.errorStream() << "rejected expired message, timestamp (" << issueInstant <<
+ "), oldest allowed (" << (now - skew - m_expires) << ")" << CategoryStream::ENDLINE;
+ throw SecurityPolicyException("Message expired, was issued too long ago.");
+ }
}
// Check replay.
if (m_checkReplay) {
const XMLCh* id = policy.getMessageID();
+ if (!id || !*id)
+ return;
+
ReplayCache* replayCache = XMLToolingConfig::getConfig().getReplayCache();
- if (!replayCache)
- throw BindingException("Message rejected, no ReplayCache instance available.");
- else if (!id)
- throw BindingException("Message rejected, did not contain an identifier.");
+ if (!replayCache) {
+ log.warn("no ReplayCache available, skipping requested replay check");
+ return;
+ }
+
auto_ptr_char temp(id);
- if (!replayCache->check("SAML", temp.get(), issueInstant + skew + m_expires)) {
+ if (!replayCache->check("MessageFlow", temp.get(), issueInstant + skew + m_expires)) {
log.error("replay detected of message ID (%s)", temp.get());
- throw BindingException("Rejecting replayed message ID ($1).", params(1,temp.get()));
+ throw SecurityPolicyException("Rejecting replayed message ID ($1).", params(1,temp.get()));
}
}
}