Merge pull request pterodactyl#2684 from mattmalec/develop

Fix API 500 error

Author: DaneEveritt

app/Http/Middleware/Api/AuthenticateIPAccess.php

@@ -29,7 +29,7 @@ public function handle(Request $request, Closure $next)
         }
 
         $find = new IP($request->ip());
-        foreach (json_decode($model->allowed_ips) as $ip) {
+        foreach ($model->allowed_ips as $ip) {
             if (Range::parse($ip)->contains($find)) {
                 return $next($request);
             }

tests/Unit/Http/Middleware/Api/AuthenticateIPAccessTest.php

@@ -26,7 +26,7 @@ public function testWithNoIPRestrictions()
      */
     public function testWithValidIP()
     {
-        $model = factory(ApiKey::class)->make(['allowed_ips' => '["127.0.0.1"]']);
+        $model = factory(ApiKey::class)->make(['allowed_ips' => ['127.0.0.1']]);
         $this->setRequestAttribute('api_key', $model);
 
         $this->request->shouldReceive('ip')->withNoArgs()->once()->andReturn('127.0.0.1');
@@ -39,7 +39,7 @@ public function testWithValidIP()
      */
     public function testValidIPAgainstCIDRRange()
     {
-        $model = factory(ApiKey::class)->make(['allowed_ips' => '["192.168.1.1/28"]']);
+        $model = factory(ApiKey::class)->make(['allowed_ips' => ['192.168.1.1/28']]);
         $this->setRequestAttribute('api_key', $model);
 
         $this->request->shouldReceive('ip')->withNoArgs()->once()->andReturn('192.168.1.15');
@@ -55,7 +55,7 @@ public function testWithInvalidIP()
     {
         $this->expectException(AccessDeniedHttpException::class);
 
-        $model = factory(ApiKey::class)->make(['allowed_ips' => '["127.0.0.1"]']);
+        $model = factory(ApiKey::class)->make(['allowed_ips' => ['127.0.0.1']]);
         $this->setRequestAttribute('api_key', $model);
 
         $this->request->shouldReceive('ip')->withNoArgs()->twice()->andReturn('127.0.0.2');