antonioribeiro / firewall

src/migrations/2014_02_01_311070_create_firewall_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('firewall', function (Blueprint $table) {
+        Schema::create('firewall', function(Blueprint $table) {
             $table->increments('id');
 
             $table->string('ip_address', 39)->unique()->index();

src/Listeners/NotifyAdmins.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     private function getNotifiableUsers()
     {
-        return collect(config('firewall.notifications.users.emails'))->map(function ($item) {
+        return collect(config('firewall.notifications.users.emails'))->map(function($item) {
             if (class_exists($class = config('firewall.notifications.users.model'))) {
                 $model = app($class);
 

src/Notifications/Channels/Slack.php

Indentation +4 added lines, -4 removed lines

@@ -55,21 +55,21 @@
             })
             ->attachment(function ($attachment) use ($item) {
                 $attachment->title($title = config('firewall.notifications.message.uri.title'))
-                           ->content($item['server']['REQUEST_URI']);
+                            ->content($item['server']['REQUEST_URI']);
             })
             ->attachment(function ($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.user_agent.title'))
-                           ->content($item['userAgent']);
+                            ->content($item['userAgent']);
             })
             ->attachment(function ($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.blacklisted.title'))
-                           ->content($item['isBlacklisted'] ? 'YES' : 'NO');
+                            ->content($item['isBlacklisted'] ? 'YES' : 'NO');
             });
 
         if ($item['geoIp']) {
             $message->attachment(function ($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.geolocation.title'))
-                           ->fields($this->makeGeolocation($item));
+                            ->fields($this->makeGeolocation($item));
             });
         }
 

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
                 config('firewall.notifications.from.icon_emoji')
             )
             ->content($this->getMessage($item))
-            ->attachment(function ($attachment) use ($item) {
+            ->attachment(function($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.request_count.title'))
                             ->content(
                                 sprintf(
@@ -53,21 +53,21 @@ 
                                 )
                             );
             })
-            ->attachment(function ($attachment) use ($item) {
+            ->attachment(function($attachment) use ($item) {
                 $attachment->title($title = config('firewall.notifications.message.uri.title'))
                            ->content($item['server']['REQUEST_URI']);
             })
-            ->attachment(function ($attachment) use ($item) {
+            ->attachment(function($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.user_agent.title'))
                            ->content($item['userAgent']);
             })
-            ->attachment(function ($attachment) use ($item) {
+            ->attachment(function($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.blacklisted.title'))
                            ->content($item['isBlacklisted'] ? 'YES' : 'NO');
             });
 
         if ($item['geoIp']) {
-            $message->attachment(function ($attachment) use ($item) {
+            $message->attachment(function($attachment) use ($item) {
                 $attachment->title(config('firewall.notifications.message.geolocation.title'))
                            ->fields($this->makeGeolocation($item));
             });

src/Repositories/DataRepository.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     {
         $country = $this->makeCountryFromString($country);
 
-        return $this->ipList()->all()->filter(function ($item) use ($country) {
+        return $this->ipList()->all()->filter(function($item) use ($country) {
             return $item['ip_address'] == $country ||
                 $this->makeCountryFromString($this->getCountryFromIp($item['ip_address'])) == $country;
         });

src/Repositories/Message.php

Spacing +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
      */
     public function addMessage($message)
     {
-        collect((array) $message)->each(function ($item) {
-            collect($item)->flatten()->each(function ($flattened) {
+        collect((array) $message)->each(function($item) {
+            collect($item)->flatten()->each(function($flattened) {
                 $this->messageList->push($flattened);
             });
         });

src/Vendor/Laravel/ServiceProvider.php

Spacing +18 added lines, -18 removed lines

@@ -142,7 +142,7 @@ 
      */
     private function registerAttackBlocker()
     {
-        $this->app->singleton('firewall.attackBlocker', function () {
+        $this->app->singleton('firewall.attackBlocker', function() {
             return new AttackBlocker();
         });
     }
@@ -152,7 +152,7 @@ 
      */
     private function registerCountriesRepository()
     {
-        $this->app->singleton('firewall.countries', function () {
+        $this->app->singleton('firewall.countries', function() {
             return new Countries();
         });
     }
@@ -164,7 +164,7 @@ 
      */
     private function registerBlacklistCommand()
     {
-        $this->app->singleton('firewall.blacklist.command', function () {
+        $this->app->singleton('firewall.blacklist.command', function() {
             return new BlacklistCommand();
         });
 
@@ -178,7 +178,7 @@ 
      */
     private function registerCache()
     {
-        $this->app->singleton('firewall.cache', function () {
+        $this->app->singleton('firewall.cache', function() {
             return new Cache(app('cache'));
         });
     }
@@ -190,7 +190,7 @@ 
      */
     private function registerClearCommand()
     {
-        $this->app->singleton('firewall.clear.command', function () {
+        $this->app->singleton('firewall.clear.command', function() {
             return new ClearCommand();
         });
 
@@ -204,7 +204,7 @@ 
      */
     private function registerDataRepository()
     {
-        $this->app->singleton('firewall.datarepository', function () {
+        $this->app->singleton('firewall.datarepository', function() {
             return new DataRepository();
         });
     }
@@ -224,7 +224,7 @@ 
      */
     private function registerFileSystem()
     {
-        $this->app->singleton('firewall.filesystem', function () {
+        $this->app->singleton('firewall.filesystem', function() {
             return new Filesystem();
         });
     }
@@ -237,7 +237,7 @@ 
      */
     private function registerFirewall()
     {
-        $this->app->singleton('firewall', function ($app) {
+        $this->app->singleton('firewall', function($app) {
             $app['firewall.loaded'] = true;
 
             $this->firewall = new Firewall(
@@ -256,7 +256,7 @@ 
 
     private function registerIpAddress()
     {
-        $this->app->singleton('firewall.ipaddress', function () {
+        $this->app->singleton('firewall.ipaddress', function() {
             return new IpAddress();
         });
     }
@@ -267,7 +267,7 @@ 
      */
     private function registerIpList()
     {
-        $this->app->singleton('firewall.iplist', function () {
+        $this->app->singleton('firewall.iplist', function() {
             return new IpList($this->getFirewallModel());
         });
     }
@@ -278,7 +278,7 @@ 
      */
     private function registerMessageRepository()
     {
-        $this->app->singleton('firewall.messages', function () {
+        $this->app->singleton('firewall.messages', function() {
             return new Message();
         });
     }
@@ -290,11 +290,11 @@ 
      */
     private function registerMiddleware()
     {
-        $this->app->singleton('firewall.middleware.blacklist', function () {
+        $this->app->singleton('firewall.middleware.blacklist', function() {
             return new FirewallBlacklist(new Blacklist());
         });
 
-        $this->app->singleton('firewall.middleware.whitelist', function () {
+        $this->app->singleton('firewall.middleware.whitelist', function() {
             return new FirewallWhitelist(new Whitelist());
         });
     }
@@ -306,7 +306,7 @@ 
 
     private function registerGeoIp()
     {
-        $this->app->singleton('firewall.geoip', function () {
+        $this->app->singleton('firewall.geoip', function() {
             return new GeoIp($this->getConfig('geoip_database_path'));
         });
     }
@@ -318,7 +318,7 @@ 
      */
     private function registerRemoveCommand()
     {
-        $this->app->singleton('firewall.remove.command', function () {
+        $this->app->singleton('firewall.remove.command', function() {
             return new RemoveCommand();
         });
 
@@ -332,7 +332,7 @@ 
      */
     private function registerReportCommand()
     {
-        $this->app->singleton('firewall.list.command', function () {
+        $this->app->singleton('firewall.list.command', function() {
             return new ReportCommand();
         });
 
@@ -344,7 +344,7 @@ 
      */
     private function registerUpdateGeoIpCommand()
     {
-        $this->app->singleton('firewall.updategeoip.command', function () {
+        $this->app->singleton('firewall.updategeoip.command', function() {
             return new UpdateGeoIpCommand();
         });
 
@@ -358,7 +358,7 @@ 
      */
     private function registerWhitelistCommand()
     {
-        $this->app->singleton('firewall.whitelist.command', function () {
+        $this->app->singleton('firewall.whitelist.command', function() {
             return new WhitelistCommand();
         });
 

src/Repositories/IpList.php

Doc Comments +9 added lines, -9 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * Remove the ip address from an array list.
      *
-     * @param $type
+     * @param string $type
      * @param $ip
      *
      * @return bool
@@ -91,7 +91,7 @@ 
      *
      * @param \Illuminate\Database\Eloquent\Model $ip
      *
-     * @return bool
+     * @return boolean|null
      */
     private function removeFromDatabaseList($ip)
     {
@@ -137,7 +137,7 @@ 
     /**
      * Read a file contents.
      *
-     * @param $file
+     * @param string $file
      *
      * @return array
      */
@@ -246,8 +246,8 @@ 
     /**
      * Merge IP lists.
      *
-     * @param $database_ips
-     * @param $config_ips
+     * @param \Illuminate\Support\Collection $database_ips
+     * @param \Illuminate\Support\Collection $config_ips
      *
      * @return \Illuminate\Support\Collection
      */
@@ -367,7 +367,7 @@ 
      * Add ip or range to array list.
      *
      * @param $whitelist
-     * @param $ip
+     * @param string $ip
      *
      * @return array|mixed
      */
@@ -476,7 +476,7 @@ 
     /**
      * Find ip address in all lists.
      *
-     * @param $ip
+     * @param string $ip
      *
      * @return \Illuminate\Database\Eloquent\Model|null|static
      */
@@ -496,7 +496,7 @@ 
      *
      * @param $ip
      *
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return FirewallModel|null
      */
     private function nonDatabaseFind($ip)
     {
@@ -511,7 +511,7 @@ 
      * Add ip or range to database.
      *
      * @param $whitelist
-     * @param $ip
+     * @param string $ip
      *
      * @return \Illuminate\Database\Eloquent\Model
      */

Spacing +5 added lines, -7 removed lines

@@ -34,13 +34,13 @@ 
     private function getNonDatabaseIps()
     {
         return array_merge_recursive(
-            array_map(function ($ip) {
+            array_map(function($ip) {
                 $ip['whitelisted'] = true;
 
                 return $ip;
             }, $this->formatIpArray($this->config()->get('whitelist'))),
 
-            array_map(function ($ip) {
+            array_map(function($ip) {
                 $ip['whitelisted'] = false;
 
                 return $ip;
@@ -161,7 +161,7 @@ 
      */
     private function formatIpArray($list)
     {
-        return array_map(function ($ip) {
+        return array_map(function($ip) {
             return ['ip_address' => $ip];
         }, $this->makeArrayOfIps($list));
     }
@@ -426,8 +426,7 @@ 
     public function addToProperList($whitelist, $ip)
     {
         $this->config()->get('use_database') ?
-            $this->addToDatabaseList($whitelist, $ip) :
-            $this->addToArrayList($whitelist, $ip);
+            $this->addToDatabaseList($whitelist, $ip) : $this->addToArrayList($whitelist, $ip);
     }
 
     /**
@@ -440,8 +439,7 @@ 
     public function delete($ip)
     {
         $this->config()->get('use_database') ?
-            $this->removeFromDatabaseList($ip) :
-            $this->removeFromArrayList($ip);
+            $this->removeFromDatabaseList($ip) : $this->removeFromArrayList($ip);
     }
 
     /**

src/Support/IpAddress.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     /**
      * Check if an ip v4 is valid.
      *
-     * @param $item
+     * @param string $item
      *
      * @return bool
      */

src/Support/AttackBlocker.php

Doc Comments +2 added lines, -2 removed lines

@@ -231,7 +231,7 @@ 
     /**
      * Check for attacks.
      *
-     * @param $ipAddress
+     * @param null|string $ipAddress
      *
      * @return bool
      */
@@ -367,7 +367,7 @@ 
     /**
      * Make the cache key to record countries.
      *
-     * @param $ipAddress
+     * @param string $ipAddress
      *
      * @return string|null
      */

Spacing +6 added lines, -6 removed lines

@@ -109,7 +109,7 @@ 
      */
     protected function checkExpiration()
     {
-        $this->getEnabledItems()->each(function ($index, $type) {
+        $this->getEnabledItems()->each(function($index, $type) {
             if (($this->now()->diffInSeconds($this->record[$type]['lastRequestAt'])) <= ($this->getMaxSecondsForType($type))) {
                 return $this->record;
             }
@@ -211,7 +211,7 @@ 
      */
     protected function increment()
     {
-        $this->getEnabledItems()->each(function ($index, $type) {
+        $this->getEnabledItems()->each(function($index, $type) {
             $this->save($type, ['requestCount' => $this->record[$type]['requestCount'] + 1]);
         });
     }
@@ -223,7 +223,7 @@ 
      */
     protected function isAttack()
     {
-        return $this->getEnabledItems()->filter(function ($index, $type) {
+        return $this->getEnabledItems()->filter(function($index, $type) {
             if (!$this->isWhitelisted($type) && $this->record[$type]['requestCount'] > $this->getMaxRequestCountForType($type)) {
                 $this->takeAction($this->record[$type]);
 
@@ -280,7 +280,7 @@ 
      */
     private function loadConfig()
     {
-        $this->enabledItems = collect($this->config()->get('attack_blocker.enabled'))->filter(function ($item) {
+        $this->enabledItems = collect($this->config()->get('attack_blocker.enabled'))->filter(function($item) {
             return $item === true;
         });
     }
@@ -310,7 +310,7 @@ 
      */
     protected function loadRecordItems()
     {
-        $this->getEnabledItems()->each(function ($index, $type) {
+        $this->getEnabledItems()->each(function($index, $type) {
             if (is_null($this->record[$type] = $this->cache()->get($key = $this->makeKeyForType($type, $this->ipAddress)))) {
                 $this->record[$type] = $this->getEmptyRecord($key, $type);
             }
@@ -463,7 +463,7 @@ 
         if (!$record['wasNotified'] && $this->config()->get('notifications.enabled')) {
             $this->save($record['type'], ['wasNotified' => true]);
 
-            collect($this->config()->get('notifications.channels'))->filter(function ($value, $channel) use ($record) {
+            collect($this->config()->get('notifications.channels'))->filter(function($value, $channel) use ($record) {
                 event(new AttackDetected($record, $channel));
             });
         }