Allow IP whitelist to be an array

Author: ivanvermeyen

config/stagefront.php

@@ -79,8 +79,8 @@
 
     /**
      * Allow access from whitelisted IP's.
-     * Enter a string of comma separated IP's or null to allow all IP's.
-     * For example: '1.2.3.4,1.2.3.4'
+     * Enter an array or string of comma separated IP's or null to allow all IP's.
+     * For example: ['1.2.3.4', '1.2.3.4'] or '1.2.3.4,1.2.3.4'
      * If empty, all IP's are allowed.
      *
      * Default: null

src/Shield.php

@@ -77,8 +77,7 @@ protected function currentUrlIsIgnored()
     protected function clientIpIsWhitelisted()
     {
         $clientIp = Request::ip();
-        $whitelist = explode(',', $this->getIpWhitelist());
-        $ips = array_map('trim', $whitelist);
+        $ips = array_map('trim', $this->getIpWhitelist());
 
         return in_array($clientIp, $ips);
     }
@@ -90,17 +89,23 @@ protected function clientIpIsWhitelisted()
      */
     protected function hasIpWhitelist()
     {
-        return ! empty(trim($this->getIpWhitelist()));
+        return ! empty($this->getIpWhitelist());
     }
 
     /**
      * Get the IP whitelist from the config file.
      *
-     * @return string
+     * @return array
      */
     protected function getIpWhitelist()
     {
-        return Config::get('stagefront.ip_whitelist', '');
+        $whitelist = Config::get('stagefront.ip_whitelist', []);
+
+        if (is_array($whitelist)) {
+            return $whitelist;
+        }
+
+        return explode(',', $whitelist);
     }
 
     /**

tests/StageFrontTest.php

@@ -270,6 +270,26 @@ public function it_allows_access_to_whitelisted_ips_only()
             ->assertOk();
     }
 
+    /** @test */
+    public function you_can_add_a_whitelist_as_an_array()
+    {
+        $this->url = Config::get('stagefront.url');
+        $this->registerRoute('/page', 'Some Page');
+
+        $this->enableStageFront();
+        $this->setIntendedUrl('/page');
+
+        Config::set('stagefront.ip_whitelist', ['0.0.0.0', '1.1.1.1']);
+        Config::set('stagefront.ip_whitelist_only', true);
+        Config::set('stagefront.ip_whitelist_require_login', false);
+
+        $this->get('/page', ['REMOTE_ADDR' => '1.2.3.4'])
+            ->assertStatus(403);
+
+        $this->get('/page', ['REMOTE_ADDR' => '1.1.1.1'])
+            ->assertOk();
+    }
+
     /** @test */
     public function it_allows_access_to_whitelisted_ips_only_with_required_login()
     {