X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2RedirectDecoder.cpp;h=15a1e53999e5b7e657b09195730833235ba7aaec;hp=6afb59a3a12920f9873a270cc208462594dcef8f;hb=441141898ba4a43910f0185fee5f01de9ac78144;hpb=1bc8e721db3a50294df852662e1eddcdbdae8f9f

diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index 6afb59a..15a1e53 100644
--- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@ -22,17 +22,16 @@
 
 #include "internal.h"
 #include "exceptions.h"
+#include "binding/HTTPRequest.h"
 #include "saml2/binding/SAML2Redirect.h"
 #include "saml2/binding/SAML2RedirectDecoder.h"
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
-#include "security/X509TrustEngine.h"
 
 #include <log4cpp/Category.hh>
 #include <xercesc/util/Base64.hpp>
 #include <xmltooling/util/NDC.h>
-#include <xmltooling/util/ReplayCache.h>
 #include <xmltooling/validation/ValidatorSuite.h>
 
 using namespace opensaml::saml2md;
@@ -59,12 +58,8 @@ SAML2RedirectDecoder::~SAML2RedirectDecoder() {}
 
 XMLObject* SAML2RedirectDecoder::decode(
     string& relayState,
-    const RoleDescriptor*& issuer,
-    const XMLCh*& securityMech,
-    const HTTPRequest& httpRequest,
-    const MetadataProvider* metadataProvider,
-    const QName* role,
-    const opensaml::TrustEngine* trustEngine
+    const GenericRequest& genericRequest,
+    SecurityPolicy& policy
     ) const
 {
 #ifdef _DEBUG
@@ -73,19 +68,24 @@ XMLObject* SAML2RedirectDecoder::decode(
     Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2Redirect");
 
     log.debug("validating input");
-    if (strcmp(httpRequest.getMethod(),"GET"))
+    const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
+    if (!httpRequest) {
+        log.error("unable to cast request to HTTPRequest type");
         return NULL;
-    const char* msg = httpRequest.getParameter("SAMLResponse");
+    }
+    if (strcmp(httpRequest->getMethod(),"GET"))
+        return NULL;
+    const char* msg = httpRequest->getParameter("SAMLResponse");
     if (!msg)
-        msg = httpRequest.getParameter("SAMLRequest");
+        msg = httpRequest->getParameter("SAMLRequest");
     if (!msg)
         return NULL;
-    const char* state = httpRequest.getParameter("RelayState");
+    const char* state = httpRequest->getParameter("RelayState");
     if (state)
         relayState = state;
     else
         relayState.erase();
-    state = httpRequest.getParameter("SAMLEncoding");
+    state = httpRequest->getParameter("SAMLEncoding");
     if (state && strcmp(state,samlconstants::SAML20_BINDING_URL_ENCODING_DEFLATE)) {
         log.warn("SAMLEncoding (%s) was not recognized", state);
         return NULL;
@@ -113,130 +113,42 @@ XMLObject* SAML2RedirectDecoder::decode(
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
     janitor.release();
 
-    StatusResponseType* response = NULL;
-    RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject.get());
-    if (!request) {
-        response = dynamic_cast<StatusResponseType*>(xmlObject.get());
-        if (!response)
-            throw BindingException("XML content for SAML 2.0 HTTP-Redirect Decoder must be a SAML 2.0 protocol message.");
-    }
+    saml2::RootObject* root = dynamic_cast<saml2::RootObject*>(xmlObject.get());
+    if (!root)
+        throw BindingException("XML content for SAML 2.0 HTTP-POST Decoder must be a SAML 2.0 protocol message.");
     
-    /* For SAML 2, the issuer can be established either from the message, or in some profiles
-     * it's possible to omit it and defer to assertions in a Response.
-     * The Issuer is later matched against metadata, and then trust checking can be applied.
-     */
-    const Issuer* claimedIssuer = request ? request->getIssuer() : response->getIssuer();
-    if (!claimedIssuer) {
-        // Check assertion option. I cannot resist the variable name, for the sake of google.
-        const Response* assbag = dynamic_cast<const Response*>(response);
-        if (assbag) {
-            const vector<Assertion*>& assertions=assbag->getAssertions();
-            if (!assertions.empty())
-                claimedIssuer = assertions.front()->getIssuer();
-        }
-    }
-
-    const EntityDescriptor* provider=NULL;
     try {
         if (!m_validate)
             SchemaValidators.validate(xmlObject.get());
         
-        // Check destination URL.
-        auto_ptr_char dest(request ? request->getDestination() : response->getDestination());
-        const char* dest2 = httpRequest.getRequestURL();
-        if (!dest.get() || !*(dest.get())) {
-            log.error("signed SAML message missing Destination attribute");
-            throw BindingException("Signed SAML message missing Destination attribute identifying intended destination.");
-        }
-        else if (dest.get() && (!dest2 || !*dest2 || strcmp(dest.get(),dest2))) {
-            log.error("Redirect targeted at (%s), but delivered to (%s)", dest.get(), dest2 ? dest2 : "none");
-            throw BindingException("SAML message delivered with Redirect to incorrect server URL.");
-        }
-        
-        // Check freshness.
-        time_t now = time(NULL);
-        if ((request ? request->getIssueInstant()->getEpoch() : response->getIssueInstant()->getEpoch())
-                < now-(2*XMLToolingConfig::getConfig().clock_skew_secs))
-            throw BindingException("Detected expired Redirect binding message.");
-        
-        // Check replay.
-        ReplayCache* replayCache = XMLToolingConfig::getConfig().getReplayCache();
-        if (replayCache) {
-            auto_ptr_char id(xmlObject->getXMLID());
-            if (!replayCache->check("SAML2Redirect", id.get(), response->getIssueInstant()->getEpoch() + (2*XMLToolingConfig::getConfig().clock_skew_secs))) {
-                log.error("replay detected of message ID (%s)", id.get());
-                throw BindingException("Rejecting replayed message ID ($1).", params(1,id.get()));
-            }
-        }
-        else
-            log.warn("replay cache was not provided, this is a serious security risk!");
-        
-        issuer = NULL;
-        securityMech = false;
-        log.debug("attempting to establish issuer and integrity of message...");
-        
-        // If we can't identify the issuer, we're done, since we can't lookup or verify anything.
-        if (!claimedIssuer || !claimedIssuer->getName()) {
-            log.warn("unable to establish identity of message issuer");
-            return xmlObject.release();
-        }
-        else if (claimedIssuer->getFormat() && !XMLString::equals(claimedIssuer->getFormat(), NameIDType::ENTITY)) {
-            auto_ptr_char iformat(claimedIssuer->getFormat());
-            log.warn("message issuer was in an unsupported format (%s)", iformat.get());
-            return xmlObject.release();
-        }
-        
-        log.debug("searching metadata for assertion issuer...");
-        provider=metadataProvider ? metadataProvider->getEntityDescriptor(claimedIssuer->getName()) : NULL;
-        if (provider) {
-            log.debug("matched assertion issuer against metadata, searching for applicable role...");
-            issuer=provider->getRoleDescriptor(*role, samlconstants::SAML20P_NS);
-            if (issuer) {
-                /*
-                if (trustEngine && signature) {
-                    if (!trustEngine->validate(*signature, *issuer, metadataProvider->getKeyResolver())) {
-                        log.error("unable to verify signature on message with supplied trust engine");
-                        throw BindingException("Message signature failed verification.");
-                    }
-                    else {
-                        securityMech = samlconstants::SAML20P_NS;
-                    }
-                }
-                else {
-                    log.warn("unable to authenticate the message, leaving untrusted");
-                }
-                */
-            }
-            else {
-                log.warn("unable to find compatible SAML 2.0 role (%s) in metadata", role->toString().c_str());
-            }
-            if (log.isDebugEnabled()) {
-                auto_ptr_char iname(provider->getEntityID());
-                log.debug("message from (%s), integrity %sverified", iname.get(), securityMech ? "" : "NOT ");
-            }
-        }
-        else {
-            auto_ptr_char temp(claimedIssuer->getName());
-            log.warn("no metadata found, can't establish identity of issuer (%s)", temp.get());
-        }
+        // Run through the policy.
+        policy.evaluate(genericRequest, *root);
     }
     catch (XMLToolingException& ex) {
-        if (!provider) {
-            if (!claimedIssuer || !claimedIssuer->getName())
-                throw;
-            if (!metadataProvider || !(provider=metadataProvider->getEntityDescriptor(claimedIssuer->getName(), false))) {
-                // Just record it.
-                auto_ptr_char iname(claimedIssuer->getName());
-                if (iname.get())
-                    ex.addProperty("entityID", iname.get());
-                throw;
-            }
+        // This is just to maximize the likelihood of attaching a source to the message for support purposes.
+        if (policy.getIssuerMetadata())
+            annotateException(&ex,policy.getIssuerMetadata()); // throws it
+
+        const Issuer* claimedIssuer = root->getIssuer();
+        if (!claimedIssuer || !claimedIssuer->getName())
+            throw;
+        const EntityDescriptor* provider=NULL;
+        if (!policy.getMetadataProvider() ||
+                !(provider=policy.getMetadataProvider()->getEntityDescriptor(claimedIssuer->getName(), false))) {
+            // Just record it.
+            auto_ptr_char iname(claimedIssuer->getName());
+            if (iname.get())
+                ex.addProperty("entityID", iname.get());
+            throw;
+        }
+
+        if (policy.getRole()) {
+            const RoleDescriptor* roledesc=provider->getRoleDescriptor(*(policy.getRole()), samlconstants::SAML20P_NS);
+            if (roledesc) annotateException(&ex,roledesc); // throws it
         }
-        if (!issuer)
-            issuer=provider->getRoleDescriptor(*role, samlconstants::SAML20P_NS);
-        if (issuer) annotateException(&ex,issuer); // throws it
         annotateException(&ex,provider);  // throws it
     }
 
-    return xmlObject.release();
+    xmlObject.release();
+    return root;
 }