Move logFailedAccess into Activity

diff --git a/app/Actions/ActivityService.php b/app/Actions/ActivityService.php
index f56f1ca57e03c304c4f4fdcd7201293afe45f8ba..ca09aaef11c49ed1d065d420ff10e6dc50e9b774 100644 (file)
--- a/app/Actions/ActivityService.php
+++ b/app/Actions/ActivityService.php
@@ -183,4 +183,21 @@ class ActivityService
             session()->flash('success', $message);
         }
     }
             session()->flash('success', $message);
         }
     }

+
+    /**
+     * Log failed accesses, for further processing by tools like Fail2Ban
+     *
+     * @param username
+     * @return void
+      */
+    public function logFailedAccess($username)
+    {
+        $log_msg = config('logging.failed_access_message');
+
+        if (!is_string($username) || !is_string($log_msg) || strlen($log_msg)<1)
+            return;
+
+        $log_msg = str_replace("%u", $username, $log_msg);
+        error_log($log_msg, 4);
+    }

 }
 }

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index cf9e44e43421a0c0438ab2f2c1f4c7bc02f10cd1..f5479814a52ac830c2b86cf0a9eb6d42a9fe3543 100644 (file)
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

+use Activity;

 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;


@@ -102,7 +103,7 @@ class LoginController extends Controller
             $this->fireLockoutEvent($request);
 
             // Also log some error message
             $this->fireLockoutEvent($request);
 
             // Also log some error message

-            $this->logFailedAccess($request);
+            Activity::logFailedAccess($request->get($this->username()));

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


@@ -121,7 +122,7 @@ class LoginController extends Controller
         $this->incrementLoginAttempts($request);
 
         // Also log some error message
         $this->incrementLoginAttempts($request);
 
         // Also log some error message

-        $this->logFailedAccess($request);
+        Activity::logFailedAccess($request->get($this->username()));

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


@@ -168,21 +169,4 @@ class LoginController extends Controller
         return redirect('/login');
     }
 
         return redirect('/login');
     }
 

-    /**
-     * Log failed accesses, for further processing by tools like Fail2Ban
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-      */
-    protected function logFailedAccess($request)
-    {
-        $log_msg = config('logging.failed_access_message');
-
-        if (!is_string($request->get($this->username())) || !is_string($log_msg) || strlen($log_msg)<1)
-            return;
-
-        $log_msg = str_replace("%u", $request->get($this->username()), $log_msg);
-        error_log($log_msg, 4);
-    }
-

 }
 }