X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fbinding%2Fimpl%2FMessageFlowRule.cpp;h=a2e1ff6b6d7e1f2250829df5320e4a8fc3b8c539;hb=a0323c50525a6ff43795da2dc786e5aeaf726d41;hp=ce04682ec0135eba71a9fdc209788feb5b00093d;hpb=29db3d7193a33f71fd01cb53f7a0ff0ad08da8f1;p=shibboleth%2Fopensaml2.git

diff --git a/saml/binding/impl/MessageFlowRule.cpp b/saml/binding/impl/MessageFlowRule.cpp
index ce04682..a2e1ff6 100644
--- a/saml/binding/impl/MessageFlowRule.cpp
+++ b/saml/binding/impl/MessageFlowRule.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.
@@ -22,18 +22,34 @@
 
 #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() {}
+        
+        const char* getType() const {
+            return MESSAGEFLOW_POLICY_RULE;
+        }
+        void evaluate(const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy) const;
+    
+    private:
+        bool m_checkReplay;
+        time_t m_expires;
+    };
+
     SecurityPolicyRule* SAML_DLLLOCAL MessageFlowRuleFactory(const DOMElement* const & e)
     {
         return new MessageFlowRule(e);
@@ -56,42 +72,48 @@ MessageFlowRule::MessageFlowRule(const DOMElement* e)
     }
 }
 
-void MessageFlowRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
+void MessageFlowRule::evaluate(
+    const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy
+    ) const
 {
     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.");
+        issueInstant = now;
     }
-    
-    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.");
-    }
-    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()));
         }
     }
 }