Policy rule redesign for factor out issuer handling.

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

diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index d2abd41..de2c66b 100644 (file)
--- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@ -125,50 +125,23 @@ XMLObject* SAML2RedirectDecoder::decode(
         root = static_cast<saml2::RootObject*>(request);
     }
     
+    if (!m_validate)
+        SchemaValidators.validate(xmlObject.get());
     
-    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 ((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");
-            throw BindingException("SAML message delivered with Redirect to incorrect server URL.");
-        }
-
-        // Run through the 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())) {
+        log.error("signed SAML message missing Destination attribute");
+        throw BindingException("Signed SAML message missing Destination attribute identifying intended destination.");
     }
-    catch (XMLToolingException& ex) {
-        // 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
-        }
-        annotateException(&ex,provider);  // throws it
+    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.");
     }
 
+    // Run through the policy.
+    policy.evaluate(*root, &genericRequest);
+
     return xmlObject.release();
 }