[cpp-sp] branch main updated: Populate logout-initiator target input via loogutURL.

Wed Jul 8 16:30:33 UTC 2026

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

codeberg pushed a commit to branch main
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/37018563b0b33e72d7671009da1d4307847d7a47

The following commit(s) were added to refs/heads/main by this push:
     new 37018563 Populate logout-initiator target input via loogutURL.
37018563 is described below

commit 37018563b0b33e72d7671009da1d4307847d7a47
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Wed Jul 8 12:29:53 2026 -0400

    Populate logout-initiator target input via loogutURL.
---
 shibsp/handler/impl/LogoutInitiator.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/shibsp/handler/impl/LogoutInitiator.cpp b/shibsp/handler/impl/LogoutInitiator.cpp
index 562d8d1e..59e8f2cd 100644
--- a/shibsp/handler/impl/LogoutInitiator.cpp
+++ b/shibsp/handler/impl/LogoutInitiator.cpp
@@ -84,8 +84,11 @@ pair<bool,long> LogoutInitiator::run(SPRequest& request, bool isHandler) const
         request.getAgent().getSessionCache()->remove(request);
     }
 
-    // Determine return location.
+    // Determine return location, either parameter or local setting.
     const char* dest = request.getParameter("return");
+    if (!dest) {
+        dest = request.getRequestSettings().first->getString(RequestMapper::LOGOUT_URL_PROP_NAME);
+    }
 
     if (!localOnly) {
         DDF input = request.getAgent().getRemotingService()->build("logout-initiator", request);
@@ -120,15 +123,12 @@ pair<bool,long> LogoutInitiator::run(SPRequest& request, bool isHandler) const
     }
 
     if (!dest) {
-        dest = request.getRequestSettings().first->getString(RequestMapper::LOGOUT_URL_PROP_NAME);
-        if (!dest) {
-            stringstream s;
-            s << "<html><title>Logout Complete</title><body><h1>Logout Complete</h1>"
-                "<p>If you're seeing this page, the deployer failed to set a logoutURL setting "
-                "to redirect to a custom page for this application.</p>"
-                "</body></html>";
-            return make_pair(true, request.sendResponse(s));
-        }
+        stringstream s;
+        s << "<html><title>Logout Complete</title><body><h1>Logout Complete</h1>"
+            "<p>If you're seeing this page, the deployer failed to set a logoutURL setting "
+            "to redirect to a custom page for this application.</p>"
+            "</body></html>";
+        return make_pair(true, request.sendResponse(s));
     }
 
     return make_pair(true, request.sendRedirect(dest, true));

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