[cpp-sp] branch master updated: SPPCPP-886 - Access discoveryURL via RequestMap within handlers

[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=d0e57237a05a2c6fc1bb432e83c1611c9d87b378

The following commit(s) were added to refs/heads/master by this push:
       new  d0e5723   SPPCPP-886 - Access discoveryURL via RequestMap within handlers
d0e5723 is described below

commit d0e57237a05a2c6fc1bb432e83c1611c9d87b378
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 25 11:34:19 2020 -0500

    SPPCPP-886 - Access discoveryURL via RequestMap within handlers
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-886
---
 shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 6 ++----
 shibsp/handler/impl/WAYFSessionInitiator.cpp   | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/shibsp/handler/impl/SAMLDSSessionInitiator.cpp b/shibsp/handler/impl/SAMLDSSessionInitiator.cpp
index f8130ea..34fcb8f 100644
--- a/shibsp/handler/impl/SAMLDSSessionInitiator.cpp
+++ b/shibsp/handler/impl/SAMLDSSessionInitiator.cpp
@@ -162,7 +162,7 @@ pair<bool,long> SAMLDSSessionInitiator::run(SPRequest& request, string& entityID
     pair<bool,const char*> prop;
     bool isPassive = false;
     const Application& app = request.getApplication();
-    pair<bool,const char*> discoveryURL = pair<bool,const char*>(true, m_url);
+    pair<bool,const char*> discoveryURL = pair<bool,const char*>(false, nullptr);
 
     if (isHandler) {
         prop.second = request.getParameter("SAMLDS");
@@ -182,9 +182,7 @@ pair<bool,long> SAMLDSSessionInitiator::run(SPRequest& request, string& entityID
         pair<bool,bool> passopt = getBool("isPassive", request);
         isPassive = passopt.first && passopt.second;
 
-        prop.second = request.getParameter("discoveryURL");
-        if (prop.second && *prop.second)
-            discoveryURL.second = prop.second;
+        discoveryURL = getString("discoveryURL");
     }
     else {
         // Check for a hardwired target value in the map or handler.
diff --git a/shibsp/handler/impl/WAYFSessionInitiator.cpp b/shibsp/handler/impl/WAYFSessionInitiator.cpp
index 87ad37d..83f7a09 100644
--- a/shibsp/handler/impl/WAYFSessionInitiator.cpp
+++ b/shibsp/handler/impl/WAYFSessionInitiator.cpp
@@ -99,7 +99,7 @@ pair<bool,long> WAYFSessionInitiator::run(SPRequest& request, string& entityID,
     pair<bool,const char*> prop;
     const Handler* ACS = nullptr;
     const Application& app = request.getApplication();
-    pair<bool,const char*> discoveryURL = pair<bool,const char*>(true, m_url);
+    pair<bool,const char*> discoveryURL = pair<bool,const char*>(false, nullptr);
 
     if (isHandler) {
         prop.second = request.getParameter("acsIndex");
@@ -118,9 +118,7 @@ pair<bool,long> WAYFSessionInitiator::run(SPRequest& request, string& entityID,
         recoverRelayState(request.getApplication(), request, request, target, false);
         request.getApplication().limitRedirect(request, target.c_str());
 
-        prop.second = request.getParameter("discoveryURL");
-        if (prop.second && *prop.second)
-            discoveryURL.second = prop.second;
+        discoveryURL = getString("discoveryURL");
     }
     else {
         // Check for a hardwired target value in the map or handler.

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