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

[shibboleth/cpp-sp.git] / shibsp / attribute / filtering / impl / BasicFilteringContext.cpp

diff --git a/shibsp/attribute/filtering/impl/BasicFilteringContext.cpp b/shibsp/attribute/filtering/impl/BasicFilteringContext.cpp
index 06dada7..1fd98ac 100644 (file)
--- a/shibsp/attribute/filtering/impl/BasicFilteringContext.cpp
+++ b/shibsp/attribute/filtering/impl/BasicFilteringContext.cpp
@@ -74,7 +74,12 @@ const XMLCh* BasicFilteringContext::getAuthnContextDeclRef() const
 
 const XMLCh* BasicFilteringContext::getAttributeRequester() const
 {
-    return m_app.getXMLString("entityID").second;
+    if (getAttributeIssuerMetadata()) {
+        return getApplication().getRelyingParty(
+            dynamic_cast<const EntityDescriptor*>(getAttributeIssuerMetadata()->getParent())
+            )->getXMLString("entityID").second;
+    }
+    return getApplication().getRelyingParty(getAttributeIssuer())->getXMLString("entityID").second;
 }
 
 const XMLCh* BasicFilteringContext::getAttributeIssuer() const