X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fbinding%2Fimpl%2FMessageFlowRule.cpp;h=f19c815dc21bad81142880aa0cc9abd2df8beea8;hb=c072b75e6f6e05e24a1c35b952008b38d0d375c1;hp=facb617d50907f9b86bf9ee40ee306d7f6a028df;hpb=dcaf43748e13b9e2450705d08cd78457e227a1fe;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/binding/impl/MessageFlowRule.cpp b/saml/binding/impl/MessageFlowRule.cpp
index facb617..f19c815 100644
--- a/saml/binding/impl/MessageFlowRule.cpp
+++ b/saml/binding/impl/MessageFlowRule.cpp
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2007 Internet2
- * 
+ *  Copyright 2001-2009 Internet2
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,24 +16,42 @@
 
 /**
  * MessageFlowRule.cpp
- * 
+ *
  * SAML replay and freshness checking SecurityPolicyRule
  */
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/MessageFlowRule.h"
+#include "binding/SecurityPolicy.h"
+#include "binding/SecurityPolicyRule.h"
 
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
+#include <xmltooling/XMLToolingConfig.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;
+        }
+        bool evaluate(const 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);
@@ -56,47 +74,48 @@ MessageFlowRule::MessageFlowRule(const DOMElement* e)
     }
 }
 
-void MessageFlowRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
+bool MessageFlowRule::evaluate(const XMLObject& message, const GenericRequest* request, 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 now = policy.getTime();
     time_t skew = XMLToolingConfig::getConfig().clock_skew_secs;
     time_t issueInstant = policy.getIssueInstant();
     if (issueInstant == 0) {
-        log.debug("unknown message timestamp, assuming current time for replay checking");
         issueInstant = now;
     }
     else {
         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.");
+                "), newest allowed (" << now + skew << ")" << logging::eol;
+            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 BindingException("Message expired, was issued too long ago.");
+                "), oldest allowed (" << (now - skew - m_expires) << ")" << logging::eol;
+            throw SecurityPolicyException("Message expired, was issued too long ago.");
         }
     }
-    
+
     // Check replay.
     if (m_checkReplay) {
+        const XMLCh* id = policy.getMessageID();
+        if (!id || !*id)
+            return false;
+
         ReplayCache* replayCache = XMLToolingConfig::getConfig().getReplayCache();
         if (!replayCache) {
             log.warn("no ReplayCache available, skipping requested replay check");
-            return;
-        }
-        const XMLCh* id = policy.getMessageID();
-        if (!id || !*id) {
-            log.debug("unknown message ID, no replay check possible");
-            return;
+            return false;
         }
+
         auto_ptr_char temp(id);
         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()));
         }
+        return true;
     }
+    return false;
 }