https://issues.shibboleth.net/jira/browse/SSPCPP-132

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

diff --git a/saml/saml1/binding/impl/SAML1MessageDecoder.cpp b/saml/saml1/binding/impl/SAML1MessageDecoder.cpp
index 7a59796..b0079ac 100644 (file)
--- a/saml/saml1/binding/impl/SAML1MessageDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1MessageDecoder.cpp
@@ -1,6 +1,6 @@
 /*
  *  Copyright 2001-2007 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,7 +16,7 @@
 
 /**
  * SAML1MessageDecoder.cpp
- * 
+ *
  * Base class for SAML 1.x MessageDecoders.
  */
 
@@ -93,18 +93,21 @@ void SAML1MessageDecoder::extractMessageDetails(
 
     if (policy.getMetadataProvider() && policy.getRole()) {
         log.debug("searching metadata for response issuer...");
-        const EntityDescriptor* entity = policy.getMetadataProvider()->getEntityDescriptor(issuer);
-        if (entity) {
-            log.debug("matched response issuer against metadata, searching for applicable role...");
-            const RoleDescriptor* roledesc=entity->getRoleDescriptor(*policy.getRole(), protocol);
-            if (roledesc)
-                policy.setIssuerMetadata(roledesc);
-            else if (log.isWarnEnabled())
-                log.warn("unable to find compatible role (%s) in metadata", policy.getRole()->toString().c_str());
-        }
-        else if (log.isWarnEnabled()) {
+        MetadataProvider::Criteria& mc = policy.getMetadataProviderCriteria();
+        mc.entityID_unicode = issuer;
+        mc.role = policy.getRole();
+        mc.protocol = protocol;
+        pair<const EntityDescriptor*,const RoleDescriptor*> entity = policy.getMetadataProvider()->getEntityDescriptor(mc);
+
+        if (!entity.first) {
             auto_ptr_char iname(issuer);
             log.warn("no metadata found, can't establish identity of issuer (%s)", iname.get());
+            return;
+        }
+        else if (!entity.second) {
+            log.warn("unable to find compatible role (%s) in metadata", policy.getRole()->toString().c_str());
+            return;
         }
+        policy.setIssuerMetadata(entity.second);
     }
 }