Allow the blockade to expire with a config item 'expire'

Author: Keoghan

config/blockade.php

@@ -60,6 +60,17 @@
     */
     'redirect' => env('BLOCKADE_REDIRECT', null),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Redirect when blocked
+    |--------------------------------------------------------------------------
+    |
+    | Providing this will redirect the visitor following any other rules until
+    | this time has passed.  Date must be parsable by the date() function.
+    |
+    */
+    'until' => env('BLOCKADE_UNTIL', null),
+
     /*
     |--------------------------------------------------------------------------
     | Not-blocked list

src/IsBlocked.php

@@ -3,6 +3,7 @@
 namespace Konsulting\Laravel\Blockade;
 
 use Closure;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Session\Store as SessionStore;
 
@@ -46,6 +47,13 @@ class IsBlocked
      */
     protected $allowMultipleCodes;
 
+    /**
+     * The expiry date for the blockade
+     *
+     * @var Carbon|null
+     */
+    protected $until;
+
     public function __construct(SessionStore $session)
     {
         $this->session = $session;
@@ -54,6 +62,7 @@ public function __construct(SessionStore $session)
         $this->code = config('blockade.code', false);
         $this->exclude = config('blockade.not_blocked', []);
         $this->redirect = config('blockade.redirect', null);
+        $this->until = config('blockade.until', null) ? Carbon::parse(config('blockade.until')) : null;
         $this->allowMultipleCodes = config('blockade.multiple_codes', false);
     }
 
@@ -70,6 +79,10 @@ public function handle($request, Closure $next)
             return $next($request);
         }
 
+        if ($this->blockHasExpired()) {
+            return $next($request);
+        }
+
         if ($request->exists($this->key)) {
             $this->session->put($this->key, $request->input($this->key));
 
@@ -148,4 +161,16 @@ protected function shouldRedirectWhenBlocked()
     {
         return null !== $this->redirect;
     }
+
+    /**
+     * Check if the block has expired
+     */
+    protected function blockHasExpired()
+    {
+        if (! $this->until) {
+            return false;
+        }
+
+        return $this->until->isPast();
+    }
 }

tests/BlockTest.php

@@ -2,6 +2,8 @@
 
 namespace Konsulting\Laravel\Blockade;
 
+use Illuminate\Support\Carbon;
+
 class BlockTest extends BlockingTestCase
 {
     public function test_it_blocks_access_to_home()
@@ -30,6 +32,19 @@ public function test_it_doesnt_block_access_to_a_non_blocked_route()
             ->see('Not Blocked');
     }
 
+    public function test_it_blocks_until_a_specified_time()
+    {
+        config()->set('blockade.until', Carbon::now()->addHour());
+
+        $this->visitRoute('home')
+            ->dontSee('Home');
+
+        Carbon::setTestNow(now()->addHours(2));
+
+        $this->visitRoute('home')
+            ->see('Home');
+    }
+
     /** @dataProvider passwordProvider */
     public function test_it_accepts_multiple_codes($code, $shouldPass, $enableMultipleCodes = true)
     {