[cpp-sp] branch master updated: SSPCPP-797 - Resolvers with exceptionId option don't report attribute ID to clear.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=d288d1492f77b985208167d800e77057480a21ac

The following commit(s) were added to refs/heads/master by this push:
       new  d288d14   SSPCPP-797 - Resolvers with exceptionId option don't report attribute ID to clear.
d288d14 is described below

commit d288d1492f77b985208167d800e77057480a21ac
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 23 19:38:58 2018 -0400

    SSPCPP-797 - Resolvers with exceptionId option don't report attribute ID to clear.
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-797
---
 shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp             | 3 ++-
 shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
index bcbd213..86b54cf 100644
--- a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
+++ b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
@@ -209,7 +209,8 @@ namespace shibsp {
         void resolveAttributes(ResolutionContext& ctx) const;
 
         void getAttributeIds(vector<string>& attributes) const {
-            // Nothing to do, only the extractor would actually generate them.
+            if (!m_exceptionId.empty())
+                attributes.push_back(m_exceptionId.front());
         }
 
     private:
diff --git a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
index 00b42c4..bad7db7 100644
--- a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
+++ b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
@@ -191,6 +191,8 @@ namespace shibsp {
         void getAttributeIds(vector<string>& attributes) const {
             if (m_extractor)
                 m_extractor->getAttributeIds(attributes);
+            if (!m_exceptionId.empty())
+                attributes.push_back(m_exceptionId.front());
         }
 
     private:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.