X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml2%2Fbinding%2Fimpl%2FSAML2RedirectDecoder.cpp;h=d1ad87e0b72cf76bb7a0ffe05d9d82a5a0eaf689;hb=40fdf576ed07e3cf8f88d9bf0441e55ea4fc3d05;hp=63a324a9079d7f508f93ea131e96d02f4fb6d4eb;hpb=6056cca67278d65c4343928e4ceaebd1d6f04920;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index 63a324a..d1ad87e 100644
--- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2007 Internet2
- * 
+ *  Copyright 2001-2010 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,22 +16,25 @@
 
 /**
  * SAML2RedirectDecoder.cpp
- * 
- * SAML 2.0 HTTP Redirect binding message encoder
+ *
+ * SAML 2.0 HTTP Redirect binding message encoder.
  */
 
 #include "internal.h"
 #include "exceptions.h"
-#include "binding/HTTPRequest.h"
+#include "binding/SecurityPolicy.h"
+#include "saml2/binding/SAML2MessageDecoder.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 <log4cpp/Category.hh>
 #include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/io/HTTPRequest.h>
 #include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
 #include <xmltooling/validation/ValidatorSuite.h>
 
 using namespace opensaml::saml2md;
@@ -39,21 +42,36 @@ using namespace opensaml::saml2p;
 using namespace opensaml::saml2;
 using namespace opensaml;
 using namespace xmlsignature;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
-    namespace saml2p {              
-        MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const DOMElement* const & e)
+    namespace saml2p {
+        class SAML_DLLLOCAL SAML2RedirectDecoder : public SAML2MessageDecoder
         {
-            return new SAML2RedirectDecoder(e);
+        public:
+            SAML2RedirectDecoder() {}
+            virtual ~SAML2RedirectDecoder() {}
+
+            const char* getShortName() const {
+                return "Redirect";
+            }
+
+            xmltooling::XMLObject* decode(
+                std::string& relayState,
+                const GenericRequest& genericRequest,
+                SecurityPolicy& policy
+                ) const;
+        };
+
+        MessageDecoder* SAML_DLLLOCAL SAML2RedirectDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
+        {
+            return new SAML2RedirectDecoder();
         }
     };
 };
 
-SAML2RedirectDecoder::SAML2RedirectDecoder(const DOMElement* e) {}
-
 XMLObject* SAML2RedirectDecoder::decode(
     string& relayState,
     const GenericRequest& genericRequest,
@@ -67,17 +85,13 @@ XMLObject* SAML2RedirectDecoder::decode(
 
     log.debug("validating input");
     const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);
-    if (!httpRequest) {
-        log.error("unable to cast request to HTTPRequest type");
-        return NULL;
-    }
-    if (strcmp(httpRequest->getMethod(),"GET"))
-        return NULL;
+    if (!httpRequest)
+        throw BindingException("Unable to cast request object to HTTPRequest type.");
     const char* msg = httpRequest->getParameter("SAMLResponse");
     if (!msg)
         msg = httpRequest->getParameter("SAMLRequest");
     if (!msg)
-        return NULL;
+        throw BindingException("Request missing SAMLRequest or SAMLResponse query string parameter.");
     const char* state = httpRequest->getParameter("RelayState");
     if (state)
         relayState = state;
@@ -86,25 +100,33 @@ XMLObject* SAML2RedirectDecoder::decode(
     state = httpRequest->getParameter("SAMLEncoding");
     if (state && strcmp(state,samlconstants::SAML20_BINDING_URL_ENCODING_DEFLATE)) {
         log.warn("SAMLEncoding (%s) was not recognized", state);
-        return NULL;
+        throw BindingException("Unsupported SAMLEncoding value.");
     }
 
     // Decode the compressed message into SAML. First we base64-decode it.
-    unsigned int x;
+    xsecsize_t x;
     XMLByte* decoded=Base64::decode(reinterpret_cast<const XMLByte*>(msg),&x);
     if (!decoded)
         throw BindingException("Unable to decode base64 in Redirect binding message.");
-    
+
     // Now we have to inflate it.
     stringstream s;
-    if (inflate((char*)decoded, x, s)==0) {
+    if (inflate(reinterpret_cast<char*>(decoded), x, s)==0) {
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
         XMLString::release(&decoded);
+#else
+        XMLString::release((char**)&decoded);
+#endif
         throw BindingException("Unable to inflate Redirect binding message.");
     }
     if (log.isDebugEnabled())
         log.debug("decoded SAML message:\n%s", s.str().c_str());
+#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
     XMLString::release(&decoded);
-    
+#else
+    XMLString::release((char**)&decoded);
+#endif
+
     // Parse and bind the document into an XMLObject.
     DOMDocument* doc = (policy.getValidating() ? XMLToolingConfig::getConfig().getValidatingParser()
         : XMLToolingConfig::getConfig().getParser()).parse(s);
@@ -112,8 +134,8 @@ XMLObject* SAML2RedirectDecoder::decode(
     auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
     janitor.release();
 
-    saml2::RootObject* root = NULL;
-    StatusResponseType* response = NULL;
+    saml2::RootObject* root = nullptr;
+    StatusResponseType* response = nullptr;
     RequestAbstractType* request = dynamic_cast<RequestAbstractType*>(xmlObject.get());
     if (!request) {
         response = dynamic_cast<StatusResponseType*>(xmlObject.get());
@@ -124,22 +146,23 @@ XMLObject* SAML2RedirectDecoder::decode(
     else {
         root = static_cast<saml2::RootObject*>(request);
     }
-    
-    if (!policy.getValidating())
-        SchemaValidators.validate(xmlObject.get());
-    
+
+    SchemaValidators.validate(root);
+
     // Run through the policy.
+    extractMessageDetails(*root, genericRequest, samlconstants::SAML20P_NS, policy);
     policy.evaluate(*root, &genericRequest);
 
     // Check destination URL.
     auto_ptr_char dest(request ? request->getDestination() : response->getDestination());
     const char* dest2 = httpRequest->getRequestURL();
-    if ((root->getSignature() || httpRequest->getParameter("Signature")) && !dest.get() || !*(dest.get())) {
+    const char* delim = strchr(dest2, '?');
+    if ((root->getSignature() || httpRequest->getParameter("Signature")) && (!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");
+    else if (dest.get() && *dest.get() && ((delim && strncmp(dest.get(), dest2, delim - dest2)) || (!delim && strcmp(dest.get(),dest2)))) {
+        log.error("Redirect targeted at (%s), but delivered to (%s)", dest.get(), dest2);
         throw BindingException("SAML message delivered with Redirect to incorrect server URL.");
     }