New policy rules for handling conditions.

[shibboleth/cpp-opensaml.git] / saml / binding / impl / MessageFlowRule.cpp

diff --git a/saml/binding/impl/MessageFlowRule.cpp b/saml/binding/impl/MessageFlowRule.cpp
index f7412c2..4ef7632 100644 (file)
--- a/saml/binding/impl/MessageFlowRule.cpp
+++ b/saml/binding/impl/MessageFlowRule.cpp
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2006 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,26 +16,40 @@
 
 /**
  * MessageFlowRule.cpp
- * 
+ *
  * SAML replay and freshness checking SecurityPolicyRule
  */
 
 #include "internal.h"
 #include "exceptions.h"
-#include "RootObject.h"
-#include "binding/MessageFlowRule.h"
-#include "util/SAMLConstants.h"
+#include "binding/SecurityPolicyRule.h"
 
-#include <xmltooling/util/NDC.h>
+#include <xmltooling/logging.h>
 #include <xmltooling/util/ReplayCache.h>
-#include <log4cpp/Category.hh>
+#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);
@@ -58,62 +72,48 @@ MessageFlowRule::MessageFlowRule(const DOMElement* e)
     }
 }
 
-pair<saml2::Issuer*,const saml2md::RoleDescriptor*> MessageFlowRule::evaluate(
-    const XMLObject& message,
-    const GenericRequest* request,
-    const saml2md::MetadataProvider* metadataProvider,
-    const QName* role,
-    const TrustEngine* trustEngine
-    ) 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");
+    log.debug("evaluating message flow policy (replay checking %s, expiration %lu)", m_checkReplay ? "on" : "off", m_expires);
 
-    try {
-        const XMLCh* ns = message.getElementQName().getNamespaceURI();
-        if (ns && (XMLString::equals(ns, samlconstants::SAML20P_NS) || XMLString::equals(ns, samlconstants::SAML1P_NS))) {
-            const RootObject& obj = dynamic_cast<const RootObject&>(message);
-            check(obj.getID(), obj.getIssueInstantEpoch());
+    time_t now = policy.getTime();
+    time_t skew = XMLToolingConfig::getConfig().clock_skew_secs;
+    time_t issueInstant = policy.getIssueInstant();
+    if (issueInstant == 0) {
+        issueInstant = now;
+    }
+    else {
+        if (issueInstant > now + skew) {
+            log.errorStream() << "rejected not-yet-valid message, timestamp (" << issueInstant <<
+                "), newest allowed (" << now + skew << ")" << logging::eol;
+            throw SecurityPolicyException("Message rejected, was issued in the future.");
         }
-        else {
-            log.debug("ignoring unrecognized message type");
+        else if (issueInstant < now - skew - m_expires) {
+            log.errorStream() << "rejected expired message, timestamp (" << issueInstant <<
+                "), oldest allowed (" << (now - skew - m_expires) << ")" << logging::eol;
+            throw SecurityPolicyException("Message expired, was issued too long ago.");
         }
     }
-    catch (bad_cast&) {
-        log.warn("caught a bad_cast while extracting issuer");
-    }
-    return pair<saml2::Issuer*,const saml2md::RoleDescriptor*>(NULL,NULL);
-}
 
-void MessageFlowRule::check(const XMLCh* id, time_t issueInstant) 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 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.");
-    }
-    
     // Check replay.
     if (m_checkReplay) {
+        const XMLCh* id = policy.getMessageID();
+        if (!id || !*id)
+            return false;
+
         ReplayCache* replayCache = XMLToolingConfig::getConfig().getReplayCache();
-        if (!replayCache)
-            throw BindingException("No ReplayCache instance available.");
-        else if (!id)
-            throw BindingException("Message did not contain an identifier.");
-        auto_ptr_char temp(id);  
-        if (!replayCache->check("SAML", temp.get(), issueInstant + skew + m_expires)) {
+        if (!replayCache) {
+            log.warn("no ReplayCache available, skipping requested replay check");
+            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;
 }