[shibboleth-sp2] 57/89: SSPCPP-424 - Configuration to allow contents of metadata to affect behavior of SP

[Ferenc Wágner]

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

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit c19edf5df0957d0d203b03b253be574eed4cc177
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Tue Jun 14 14:26:16 2016 -0400

    SSPCPP-424 - Configuration to allow contents of metadata to affect behavior of SP
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-424
    
    Add same capability to WS-Fed handler.
---
 adfs/adfs.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp
index c74912f..f567320 100644
--- a/adfs/adfs.cpp
+++ b/adfs/adfs.cpp
@@ -541,8 +541,15 @@ pair<bool,long> ADFSSessionInitiator::doRequest(
     auto_ptr_char dest(ep->getLocation());
     const URLEncoder* urlenc = XMLToolingConfig::getConfig().getURLEncoder();
 
+    const PropertySet* relyingParty = app.getRelyingParty(entity.first);
+
     string req=string(dest.get()) + (strchr(dest.get(),'?') ? '&' : '?') + "wa=wsignin1.0&wreply=" + urlenc->encode(acsLocation) +
-        "&wct=" + urlenc->encode(timebuf) + "&wtrealm=" + urlenc->encode(app.getString("entityID").second);
+        "&wct=" + urlenc->encode(timebuf) + "&wtrealm=" + urlenc->encode(relyingParty->getString("entityID").second);
+    if (!authnContextClassRef) {
+        pair<bool,const char*> rpClass = relyingParty->getString("authnContextClassRef");
+        if (rpClass.first)
+            authnContextClassRef = rpClass.second;
+    }
     if (authnContextClassRef)
         req += "&wauth=" + urlenc->encode(authnContextClassRef);
     if (!relayState.empty())

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git