Removed bad trailing comma in method

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

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

+use BookStack\Auth\Access\LoginService;

 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 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;

+use Illuminate\Validation\ValidationException;

 
 class LoginController extends Controller
 {
 
 class LoginController extends Controller
 {


@@ -25,24 +28,29 @@ 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', 'postLogin']]);
+        $this->middleware('guest', ['only' => ['getLogin', 'login']]);
+        $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');

-        parent::__construct();

     }
 
     public function username()
     }
 
     public function username()


@@ -68,28 +76,33 @@ 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
+        $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)
     {
         $this->validateLogin($request);
      */
     public function login(Request $request)
     {
         $this->validateLogin($request);

+        $username = $request->get($this->username());

 
         // If the class is using the ThrottlesLogins trait, we can automatically throttle
         // the login attempts for this application. We'll key this by the username and
 
         // If the class is using the ThrottlesLogins trait, we can automatically throttle
         // the login attempts for this application. We'll key this by the username and


@@ -98,6 +111,8 @@ class LoginController extends Controller
             $this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
 
             $this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
 

+            Activity::logFailedLogin($username);
+

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


@@ -106,6 +121,8 @@ class LoginController extends Controller
                 return $this->sendLoginResponse($request);
             }
         } catch (LoginAttemptException $exception) {
                 return $this->sendLoginResponse($request);
             }
         } catch (LoginAttemptException $exception) {

+            Activity::logFailedLogin($username);
+

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


@@ -114,29 +131,61 @@ class LoginController extends Controller
         // user surpasses their maximum number of attempts they will get locked out.
         $this->incrementLoginAttempts($request);
 
         // user surpasses their maximum number of attempts they will get locked out.
         $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.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param mixed                    $user
+     *
+     * @return mixed
+     */
+    protected function authenticated(Request $request, $user)
+    {
+        return redirect()->intended($this->redirectPath());
+    }
+

     /**
      * Validate the user login request.
      *
     /**
      * 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);


@@ -160,13 +209,46 @@ class LoginController extends Controller
     }
 
     /**
     }
 
     /**

-     * Log the user out of the application.
+     * 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.

      */
      */

-    public function logout(Request $request)
+    protected function updateIntendedFromPrevious(): void

     {
     {

-        $this->guard()->logout();
-        $request->session()->invalidate();
+        // 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;
+            }
+        }

 
 

-        return $this->loggedOut($request) ?: redirect('/');
+        redirect()->setIntendedUrl($previous);

     }
 }
     }
 }