Added tests to cover convert functionality

[bookstack] / app / Http / Controllers / Auth / LoginController.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 01cc77d8455ed5759e264b10d71d745f834a60f0..742e1047284403518e8b3ac73cb081c560be945b 100644 (file)
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,11 +2,11 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

-use Activity;

 use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;

+use BookStack\Facades\Activity;

 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;


@@ -43,7 +43,8 @@ class LoginController extends Controller
     public function __construct(SocialAuthService $socialAuthService, LoginService $loginService)
     {
         $this->middleware('guest', ['only' => ['getLogin', 'login']]);
     public function __construct(SocialAuthService $socialAuthService, LoginService $loginService)
     {
         $this->middleware('guest', ['only' => ['getLogin', 'login']]);

-        $this->middleware('guard:standard,ldap', ['only' => ['login', 'logout']]);
+        $this->middleware('guard:standard,ldap', ['only' => ['login']]);
+        $this->middleware('guard:standard,ldap,oidc', ['only' => ['logout']]);

 
         $this->socialAuthService = $socialAuthService;
         $this->loginService = $loginService;
 
         $this->socialAuthService = $socialAuthService;
         $this->loginService = $loginService;


@@ -81,13 +82,7 @@ class LoginController extends Controller
         }
 
         // Store the previous location for redirect after login
         }
 
         // Store the previous location for redirect after login

-        $previous = url()->previous('');
-        if ($previous && $previous !== url('/login') && setting('app-public')) {
-            $isPreviousFromInstance = (strpos($previous, url('/')) === 0);
-            if ($isPreviousFromInstance) {
-                redirect()->setIntendedUrl($previous);
-            }
-        }
+        $this->updateIntendedFromPrevious();

 
         return view('auth.login', [
             'socialDrivers' => $socialDrivers,
 
         return view('auth.login', [
             'socialDrivers' => $socialDrivers,


@@ -181,16 +176,16 @@ class LoginController extends Controller
      */
     protected function validateLogin(Request $request)
     {
      */
     protected function validateLogin(Request $request)
     {

-        $rules = ['password' => 'required|string'];
+        $rules = ['password' => ['required', 'string']];

         $authMethod = config('auth.method');
 
         if ($authMethod === 'standard') {
         $authMethod = config('auth.method');
 
         if ($authMethod === 'standard') {

-            $rules['email'] = 'required|email';
+            $rules['email'] = ['required', 'email'];

         }
 
         if ($authMethod === 'ldap') {
         }
 
         if ($authMethod === 'ldap') {

-            $rules['username'] = 'required|string';
-            $rules['email'] = 'email';
+            $rules['username'] = ['required', 'string'];
+            $rules['email'] = ['email'];

         }
 
         $request->validate($rules);
         }
 
         $request->validate($rules);


@@ -228,4 +223,32 @@ class LoginController extends Controller
             $this->username() => [trans('auth.failed')],
         ])->redirectTo('/login');
     }
             $this->username() => [trans('auth.failed')],
         ])->redirectTo('/login');
     }

+
+    /**
+     * Update the intended URL location from their previous URL.
+     * Ignores if not from the current app instance or if from certain
+     * login or authentication routes.
+     */
+    protected function updateIntendedFromPrevious(): void
+    {
+        // Store the previous location for redirect after login
+        $previous = url()->previous('');
+        $isPreviousFromInstance = (strpos($previous, url('/')) === 0);
+        if (!$previous || !setting('app-public') || !$isPreviousFromInstance) {
+            return;
+        }
+
+        $ignorePrefixList = [
+            '/login',
+            '/mfa',
+        ];
+
+        foreach ($ignorePrefixList as $ignorePrefix) {
+            if (strpos($previous, url($ignorePrefix)) === 0) {
+                return;
+            }
+        }
+
+        redirect()->setIntendedUrl($previous);
+    }

 }
 }