shib redirect frontend

LitusProject · Oct 9, 2023 · 8baf96e · 8baf96e
1 parent ed094b2
commit 8baf96e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/module/CommonBundle/Component/Controller/ActionController/SiteController.php b/module/CommonBundle/Component/Controller/ActionController/SiteController.php
@@ -362,6 +362,10 @@ protected function getShibbolethUrl()
 
         $shibbolethUrl .= '%3Fsource=site';
 
+        if ($this->getParam('redirect') !== null) {
+            $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect'));
+        }
+
         $server = $this->getRequest()->getServer();
         if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) {
             $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']);

diff --git a/module/CommonBundle/Controller/Admin/AuthController.php b/module/CommonBundle/Controller/Admin/AuthController.php
@@ -168,9 +168,6 @@ private function getShibbolethUrl()
 
         if ($this->getParam('redirect') !== null) {
             $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect'));
-            $this->getSentryClient()->logMessage('shiburl: ' . $shibbolethUrl);
-        }else {
-            $this->getSentryClient()->logMessage("no redirect param");
         }
 
         $server = $this->getRequest()->getServer();

diff --git a/module/CudiBundle/Component/Controller/ProfController.php b/module/CudiBundle/Component/Controller/ProfController.php
@@ -85,6 +85,10 @@ private function getShibbolethUrl()
 
         $shibbolethUrl .= '?source=prof';
 
+        if ($this->getParam('redirect') !== null) {
+            $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect'));
+        }
+
         $server = $this->getRequest()->getServer();
         if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) {
             $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']);

diff --git a/module/FormBundle/Component/Controller/FormController.php b/module/FormBundle/Component/Controller/FormController.php
@@ -89,6 +89,10 @@ private function getShibbolethUrl()
 
         $shibbolethUrl .= '?source=form';
 
+        if ($this->getParam('redirect') !== null) {
+            $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect'));
+        }
+
         $server = $this->getRequest()->getServer();
         if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) {
             $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']);

diff --git a/module/LogisticsBundle/Component/Controller/LogisticsController.php b/module/LogisticsBundle/Component/Controller/LogisticsController.php
@@ -68,6 +68,10 @@ private function getShibbolethUrl()
 
         $shibbolethUrl .= '?source=logistics';
 
+        if ($this->getParam('redirect') !== null) {
+            $shibbolethUrl .= '%26redirect=' . urlencode($this->getParam('redirect'));
+        }
+
         $server = $this->getRequest()->getServer();
         if (isset($server['X-Forwarded-Host']) && isset($server['REQUEST_URI'])) {
             $shibbolethUrl .= '%26redirect=' . urlencode('https://' . $server['X-Forwarded-Host'] . $server['REQUEST_URI']);