Fixes

Author: Bruno Cabral

src/BlockBotsServiceProvider.php

@@ -14,8 +14,14 @@ class BlockBotsServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/config/config.php' => config_path('config.php'),
-        ], 'config');
+            __DIR__ . '/config/block-bots.php' => config_path('block-bots.php'),
+        ]);
+
+        $this->loadViewsFrom(__DIR__.'/views', 'block-bots');
+
+        $this->publishes([
+            __DIR__.'/views' => resource_path('views/vendor/block-bots'),
+        ]);
     }
 
     /**
@@ -26,7 +32,7 @@ public function boot()
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__.'/config/config.php', 'block'
+            __DIR__.'/config/block-bots.php', 'block-bots'
         );
     }
 }

src/Jobs/CheckIfBotIsReal.php

@@ -15,8 +15,11 @@ class CheckIfBotIsReal implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $ip;
+
     protected $user_agent;
 
+    protected $config;
+
 
     /**
      * Checks whether the given IP address really belongs to a valid host or not
@@ -28,7 +31,7 @@ public function __construct($ip, $user_agent)
     {
         $this->ip = $ip;
         $this->user_agent = $user_agent;
-        $this->config = config('block');
+        $this->config = config('block-bots');
     }
 
     /**

src/Middleware/BlockBots.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Potelo\LaravelBlockBots;
+namespace Potelo\LaravelBlockBots\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Redirect;
@@ -10,19 +10,15 @@
 
 use Carbon\Carbon;
 use Potelo\LaravelBlockBots\CheckIfBotIsReal;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class BlockBots
 {
     protected $config;
 
     public function __construct()
     {
-        $this->config = config('block');
-    }
-
-    private function enabled()
-    {
-        return $this->config['enabled'];
+        $this->config = config('block-bots');
     }
 
     /**
@@ -33,22 +29,21 @@ private function enabled()
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $dailyLimit, $redirectUrl)
+    public function handle($request, Closure $next, $dailyLimit)
     {
+        try {
+            $blocked = $this->blocked($request, $dailyLimit);
 
-        if ($this->enabled() && ($request->getRequestUri() != $redirectUrl)) {
-
-            try {
-                $blocked = $this->blocked($request, $dailyLimit);
-
-            } catch (Exception $e) {
-                Log::error("[Block-Bots] Error at handling request: {$e->getMessage()}");
-                $blocked = false;
-            }
+        } catch (Exception $e) {
+            Log::error("[Block-Bots] Error at handling request: {$e->getMessage()}");
+            $blocked = false;
+        }
 
-            if ($blocked) {
-                return Redirect::to($redirectUrl);
+        if ($blocked) {
+            if ($request->expectsJson()) {
+                return response()->json(['message' => 'You are over the specified limit.'], 403);
             }
+            return response(view('block-bots::error'), 403);
         }
 
         return $next($request);
@@ -160,6 +155,9 @@ public function isWhitelisted($ip, $user_agent)
 
             // If we got here, it is an unverified bot. Lets create a job to test it
             \Potelo\LaravelBlockBots\Jobs\CheckIfBotIsReal::dispatch($ip, $user_agent);
+            Redis::sadd($key_pending_bot, $ip);
+            return true;
+
 
         }
 

src/config/config.php renamed to src/config/block-bots.php

@@ -8,6 +8,7 @@
      */
 
     'enabled' => env('BLOCK_BOTS_ENABLED', true),
+
     /*
      * Whitelisted  IP addresses
      *      '127.0.0.1',
@@ -19,7 +20,7 @@
     ],
 
     'allow_logged_user' => env('BLOCK_BOTS_ALLOW_LOGGED_USER', true),
-    'fake_mode' => env('BLOCK_BOTS_FAKE_MODE', true), //
+    'fake_mode' => env('BLOCK_BOTS_FAKE_MODE', true), // minutes - disabled by default
 
     /*
      * Send suspicious events to log?

src/views/error.blade.php

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>Forbidden</title>
+
+    <!-- Fonts -->
+    <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+
+    <!-- Styles -->
+    <style>
+        html, body {
+            background-color: #fff;
+            color: #636b6f;
+            font-family: 'Raleway', sans-serif;
+            font-weight: 100;
+            height: 100vh;
+            margin: 0;
+        }
+
+        .full-height {
+            height: 100vh;
+        }
+
+        .flex-center {
+            align-items: center;
+            display: flex;
+            justify-content: center;
+        }
+
+        .position-ref {
+            position: relative;
+        }
+
+        .content {
+            text-align: center;
+        }
+
+        .title {
+            font-size: 36px;
+            padding: 20px;
+        }
+    </style>
+</head>
+<body>
+<div class="flex-center position-ref full-height">
+    <div class="content">
+        <div class="title">
+            You are over the specified limit.
+        </div>
+    </div>
+</div>
+</body>
+</html>