Merged trust engines back into a unified version, made metadata roles a "KeyInfoSource".

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

diff --git a/saml/binding/impl/XMLSigningRule.cpp b/saml/binding/impl/XMLSigningRule.cpp
index cad0e6d..6cc736d 100644 (file)
--- a/saml/binding/impl/XMLSigningRule.cpp
+++ b/saml/binding/impl/XMLSigningRule.cpp
@@ -22,14 +22,13 @@
 
 #include "internal.h"
 #include "exceptions.h"
-#include "RootObject.h"
 #include "binding/XMLSigningRule.h"
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/core/Protocols.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataProvider.h"
-#include "security/TrustEngine.h"
+#include "signature/SignatureProfileValidator.h"
 
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/ReplayCache.h>
@@ -48,12 +47,12 @@ namespace opensaml {
     }
 };
 
-pair<saml2::Issuer*,const saml2md::RoleDescriptor*> XMLSigningRule::evaluate(
+pair<saml2::Issuer*,const RoleDescriptor*> XMLSigningRule::evaluate(
     const GenericRequest& request,
     const XMLObject& message,
     const MetadataProvider* metadataProvider,
     const QName* role,
-    const opensaml::TrustEngine* trustEngine
+    const TrustEngine* trustEngine
     ) const
 {
     Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.XMLSigning");
@@ -67,12 +66,23 @@ pair<saml2::Issuer*,const saml2md::RoleDescriptor*> XMLSigningRule::evaluate(
     }
     
     try {
-        const RootObject& root = dynamic_cast<const RootObject&>(message);
-        if (!root.getSignature()) {
-            log.debug("ignoring unsigned message");
+        const SignableObject* signable = dynamic_cast<const SignableObject*>(&message);
+        if (!signable || !signable->getSignature()) {
+            log.debug("ignoring unsigned or unrecognized message");
             return ret;
         }
         
+        log.debug("validating signature profile");
+        try {
+            SignatureProfileValidator sigval;
+            sigval.validate(signable->getSignature());
+        }
+        catch (ValidationException& ve) {
+            log.error("signature profile failed to validate: %s", ve.what());
+            return ret;
+        }
+        
+        
         log.debug("extracting issuer from message");
         pair<saml2::Issuer*,const XMLCh*> issuerInfo = getIssuerAndProtocol(message);
         
@@ -91,14 +101,14 @@ pair<saml2::Issuer*,const saml2md::RoleDescriptor*> XMLSigningRule::evaluate(
             return ret;
         }
 
-        log.debug("matched assertion issuer against metadata, searching for applicable role...");
+        log.debug("matched message issuer against metadata, searching for applicable role...");
         const RoleDescriptor* roledesc=entity->getRoleDescriptor(*role, issuerInfo.second);
         if (!roledesc) {
             log.warn("unable to find compatible role (%s) in metadata", role->toString().c_str());
             return ret;
         }
 
-        if (!trustEngine->validate(*(root.getSignature()), *roledesc, metadataProvider->getKeyResolver())) {
+        if (!trustEngine->validate(*(signable->getSignature()), *roledesc, metadataProvider->getKeyResolver())) {
             log.error("unable to verify signature on message with supplied trust engine");
             return ret;
         }
@@ -159,19 +169,6 @@ pair<saml2::Issuer*,const XMLCh*> XMLSigningRule::getIssuerAndProtocol(const XML
                 }
             }
         }
-        else if (XMLString::equals(ns, samlconstants::SAML1_NS)) {
-            // Should be a saml:Assertion.
-            const saml1::Assertion& a = dynamic_cast<const saml1::Assertion&>(message);
-            if (a.getIssuer()) {
-                issuer = saml2::IssuerBuilder::buildIssuer();
-                issuer->setName(a.getIssuer());
-                pair<bool,int> minor = a.getMinorVersion();
-                return make_pair(
-                    issuer,
-                    (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM
-                    );
-            }
-        }
     }
     return pair<saml2::Issuer*,const XMLCh*>(NULL,NULL);
 }