Merge pull request #16 from mozami/master

Allow user to (optionally) specify their own Log and Ip models in config file

Author: denisdulici

src/Commands/UnblockIp.php

@@ -39,7 +39,8 @@ public function handle()
     {
         $now = Carbon::now(config('app.timezone'));
 
-        Ip::with('log')->blocked()->each(function ($ip) use ($now) {
+        $ip = config('firewall.models.ip', Ip::class);
+        $ip::with('log')->blocked()->each(function ($ip) use ($now) {
             if (empty($ip->log)) {
                 return;
             }

src/Config/firewall.php

@@ -8,6 +8,8 @@
 
     'models' => [
         'user' => '\App\User',
+        // 'log' => '\App\YourLogModel',
+        // 'ip'  => '\App\YourIpModel',
     ],
 
     'responses' => [

src/Listeners/BlockIp.php

@@ -21,13 +21,15 @@ public function handle(AttackDetected $event)
         $end = Carbon::now(config('app.timezone'));
         $start = $end->copy()->subSeconds(config('firewall.middleware.' . $event->log->middleware . '.auto_block.frequency'));
 
-        $count = Log::where('ip', $event->log->ip)->whereBetween('created_at', [$start, $end])->count();
+        $log = config('firewall.models.log', Log::class);
+        $count = $log::where('ip', $event->log->ip)->whereBetween('created_at', [$start, $end])->count();
 
         if ($count != config('firewall.middleware.' . $event->log->middleware . '.auto_block.attempts')) {
             return;
         }
 
-        Ip::create([
+        $ip = config('firewall.models.ip', Ip::class);
+        $ip::create([
             'ip' => $event->log->ip,
             'log_id' => $event->log->id,
         ]);

src/Middleware/Ip.php

@@ -13,7 +13,8 @@ public function check($patterns)
         $status = false;
 
         try {
-            $status = Model::blocked($this->ip())->pluck('id')->first();
+            $ip = config('firewall.models.ip', Model::class);
+            $status = $ip::blocked($this->ip())->pluck('id')->first();
         } catch (QueryException $e) {
             // Base table or view not found
             //$status = ($e->getCode() == '42S02') ? false : true;

src/Traits/Helper.php

@@ -86,7 +86,8 @@ public function log($middleware = null, $user_id = null, $level = 'medium')
         $middleware = $middleware ?? $this->middleware;
         $user_id = $user_id ?? $this->user_id;
 
-        return Log::create([
+        $log = config('firewall.models.log', Log::class);
+        return $log::create([
             'ip' => $this->ip(),
             'level' => $level,
             'middleware' => $middleware,