SAML auto logout : Attempt to redirect to priorRoute instead of homepage

xibosignage/xibo#2487 (cherry picked from commit 4b31fbe)
PeterMis · May 13, 2021 · ea56d12 · ea56d12
1 parent 5139aab
commit ea56d12
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/lib/Middleware/AuthenticationTrait.php b/lib/Middleware/AuthenticationTrait.php
@@ -73,6 +73,15 @@ protected function getLog()
         return $this->app->getContainer()->get('logService');
     }
 
+    /**
+     * @param $array
+     * @return \Xibo\Support\Sanitizer\SanitizerInterface
+     */
+    protected function getSanitizer($array)
+    {
+        return $this->app->getContainer()->get('sanitizerService')->getSanitizer($array);
+    }
+
     /**
      * @return \Xibo\Factory\UserFactory
      */

diff --git a/lib/Middleware/SAMLAuthentication.php b/lib/Middleware/SAMLAuthentication.php
@@ -29,6 +29,7 @@
 use OneLogin\Saml2\Utils;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Slim\Routing\RouteContext;
 use Xibo\Helper\ApplicationState;
 use Xibo\Helper\Random;
 use Xibo\Support\Exception\AccessDeniedException;
@@ -52,7 +53,7 @@ public function addRoutes()
         $app->getContainer()->logoutRoute = 'saml.logout';
 
         // Route providing SAML metadata
-        $app->get('/saml/metadata', function (Request $request, Response $response) {
+        $app->get('/saml/metadata', function (\Slim\Http\ServerRequest $request, \Slim\Http\Response $response) {
             $settings = new Settings($this->getConfig()->samlSettings, true);
             $metadata = $settings->getSPMetadata();
             $errors = $settings->validateMetadata($metadata);
@@ -69,28 +70,32 @@ public function addRoutes()
         });
 
         // SAML Login
-        $app->get('/saml/login', function (Request $request, Response $response) {
+        $app->get('/saml/login', function (\Slim\Http\ServerRequest $request, \Slim\Http\Response $response) {
             // Initiate SAML SSO
             $auth = new Auth($this->getConfig()->samlSettings);
             return $auth->login();
         });
 
         // SAML Logout
-        $app->get('/saml/logout', function (Request $request, Response $response) {
+        $app->get('/saml/logout', function (\Slim\Http\ServerRequest $request, \Slim\Http\Response $response) {
             return $this->samlLogout($request, $response);
         })->setName('saml.logout');
 
         // SAML Assertion Consumer Endpoint
-        $app->post('/saml/acs', function (Request $request, Response $response) {
+        $app->post('/saml/acs', function (\Slim\Http\ServerRequest $request, \Slim\Http\Response $response) {
             // Log some interesting things
             $this->getLog()->debug('Arrived at the ACS route with own URL: ' . Utils::getSelfRoutedURLNoQuery());
+            $parsedRequest = $this->getSanitizer($request->getParsedBody());
+            $routeParser = RouteContext::fromRequest($request)->getRouteParser();
 
             // Pull out the SAML settings
             $samlSettings = $this->getConfig()->samlSettings;
-
             $auth = new Auth($samlSettings);
             $auth->processResponse();
 
+            $priorRoute = ($parsedRequest->getString('priorRoute'));
+            $redirect = ($priorRoute == '' || $priorRoute == '/' || stripos($priorRoute, $routeParser->urlFor('login'))) ? $routeParser->urlFor('home') : $priorRoute;
+
             // Check for errors
             $errors = $auth->getErrors();
 
@@ -271,12 +276,12 @@ public function addRoutes()
                 }
 
                 // Redirect to User Homepage
-                return $response->withRedirect($this->getRouteParser()->urlFor('home'));
+                return $response->withRedirect($redirect);
             }
         });
 
         // Single Logout Service
-        $app->get('/saml/sls', function (Request $request, Response $response) use ($app) {
+        $app->get('/saml/sls', function (\Slim\Http\ServerRequest $request, \Slim\Http\Response $response) use ($app) {
 
             $auth = new Auth( $app->getContainer()->get('configService')->samlSettings);
             $auth->processSLO(false, null, false, function() use ($app, $request, $response) {