Refactored search runner a little to be neater

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

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 1252e6217a8b66f1bda3b405af28085a177308de..427d88a02473fcf99a7b828682df5b3db5355f3a 100644 (file)
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -3,13 +3,14 @@
 namespace BookStack\Http\Controllers\Auth;
 
 use Activity;
 namespace BookStack\Http\Controllers\Auth;
 
 use Activity;

-use BookStack\Actions\ActivityType;
+use BookStack\Auth\Access\LoginService;

 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;

+use Illuminate\Validation\ValidationException;

 
 class LoginController extends Controller
 {
 
 class LoginController extends Controller
 {


@@ -27,23 +28,27 @@ class LoginController extends Controller
     use AuthenticatesUsers;
 
     /**
     use AuthenticatesUsers;
 
     /**

-     * Redirection paths
+     * Redirection paths.

      */
     protected $redirectTo = '/';
     protected $redirectPath = '/';
     protected $redirectAfterLogout = '/login';
 
     protected $socialAuthService;
      */
     protected $redirectTo = '/';
     protected $redirectPath = '/';
     protected $redirectAfterLogout = '/login';
 
     protected $socialAuthService;

+    protected $loginService;

 
     /**
      * Create a new controller instance.
      */
 
     /**
      * Create a new controller instance.
      */

-    public function __construct(SocialAuthService $socialAuthService)
+    public function __construct(SocialAuthService $socialAuthService, LoginService $loginService)

     {
         $this->middleware('guest', ['only' => ['getLogin', 'login']]);
     {
         $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->socialAuthService = $socialAuthService;

+        $this->loginService = $loginService;
+

         $this->redirectPath = url('/');
         $this->redirectAfterLogout = url('/login');
     }
         $this->redirectPath = url('/');
         $this->redirectAfterLogout = url('/login');
     }


@@ -71,33 +76,28 @@ class LoginController extends Controller
 
         if ($request->has('email')) {
             session()->flashInput([
 
         if ($request->has('email')) {
             session()->flashInput([

-                'email' => $request->get('email'),
-                'password' => (config('app.env') === 'demo') ? $request->get('password', '') : ''
+                'email'    => $request->get('email'),
+                'password' => (config('app.env') === 'demo') ? $request->get('password', '') : '',

             ]);
         }
 
         // 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', [
 
         return view('auth.login', [

-          'socialDrivers' => $socialDrivers,
-          'authMethod' => $authMethod,
+            'socialDrivers' => $socialDrivers,
+            'authMethod'    => $authMethod,

         ]);
     }
 
     /**
      * Handle a login request to the application.
      *
         ]);
     }
 
     /**
      * Handle a login request to the application.
      *

-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
+     * @param \Illuminate\Http\Request $request

      *
      * @throws \Illuminate\Validation\ValidationException
      *
      * @throws \Illuminate\Validation\ValidationException

+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse

      */
     public function login(Request $request)
     {
      */
     public function login(Request $request)
     {


@@ -112,6 +112,7 @@ class LoginController extends Controller
             $this->fireLockoutEvent($request);
 
             Activity::logFailedLogin($username);
             $this->fireLockoutEvent($request);
 
             Activity::logFailedLogin($username);

+

             return $this->sendLockoutResponse($request);
         }
 
             return $this->sendLockoutResponse($request);
         }
 


@@ -121,6 +122,7 @@ class LoginController extends Controller
             }
         } catch (LoginAttemptException $exception) {
             Activity::logFailedLogin($username);
             }
         } catch (LoginAttemptException $exception) {
             Activity::logFailedLogin($username);

+

             return $this->sendLoginAttemptExceptionResponse($exception, $request);
         }
 
             return $this->sendLoginAttemptExceptionResponse($exception, $request);
         }
 


@@ -130,50 +132,60 @@ class LoginController extends Controller
         $this->incrementLoginAttempts($request);
 
         Activity::logFailedLogin($username);
         $this->incrementLoginAttempts($request);
 
         Activity::logFailedLogin($username);

+

         return $this->sendFailedLoginResponse($request);
     }
 
         return $this->sendFailedLoginResponse($request);
     }
 

+    /**
+     * Attempt to log the user into the application.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return bool
+     */
+    protected function attemptLogin(Request $request)
+    {
+        return $this->loginService->attempt(
+            $this->credentials($request),
+            auth()->getDefaultDriver(),
+            $request->filled('remember')
+        );
+    }
+

     /**
      * The user has been authenticated.
      *
     /**
      * The user has been authenticated.
      *

-     * @param  \Illuminate\Http\Request  $request
-     * @param  mixed  $user
+     * @param \Illuminate\Http\Request $request
+     * @param mixed                    $user
+     *

      * @return mixed
      */
     protected function authenticated(Request $request, $user)
     {
      * @return mixed
      */
     protected function authenticated(Request $request, $user)
     {

-        // Authenticate on all session guards if a likely admin
-        if ($user->can('users-manage') && $user->can('user-roles-manage')) {
-            $guards = ['standard', 'ldap', 'saml2'];
-            foreach ($guards as $guard) {
-                auth($guard)->login($user);
-            }
-        }
-
-        $this->logActivity(ActivityType::AUTH_LOGIN, $user);

         return redirect()->intended($this->redirectPath());
     }
 
     /**
      * Validate the user login request.
      *
         return redirect()->intended($this->redirectPath());
     }
 
     /**
      * Validate the user login request.
      *

-     * @param  \Illuminate\Http\Request  $request
-     * @return void
+     * @param \Illuminate\Http\Request $request

      *
      * @throws \Illuminate\Validation\ValidationException
      *
      * @throws \Illuminate\Validation\ValidationException

+     *
+     * @return void

      */
     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);


@@ -196,4 +208,47 @@ class LoginController extends Controller
         return redirect('/login');
     }
 
         return redirect('/login');
     }
 

+    /**
+     * Get the failed login response instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        throw ValidationException::withMessages([
+            $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);
+    }

 }
 }