antonioribeiro / firewall

src/Notifications/Channels/Slack.php

Indentation +4 added lines, -4 removed lines

@@ -51,21 +51,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->getGeolocation($item));
+                            ->fields($this->getGeolocation($item));
             });
         }
 

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,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(
@@ -49,21 +49,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->getGeolocation($item));
             });

src/Repositories/Message.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,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->messages->push($flattened);
             });
         });

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/Support/AttackBlocker.php

Spacing +6 added lines, -6 removed lines

@@ -136,7 +136,7 @@ 
      */
     protected function checkExpiration()
     {
-        $this->enabledItems->each(function ($index, $type) {
+        $this->enabledItems->each(function($index, $type) {
             if (($this->record[$type]['lastRequestAt']->diffInSeconds(Carbon::now())) <= ($this->getMaxSecondsForType($type))) {
                 return $this->record;
             }
@@ -251,7 +251,7 @@ 
      */
     protected function increment()
     {
-        $this->enabledItems->each(function ($index, $type) {
+        $this->enabledItems->each(function($index, $type) {
             $this->save($type, ['requestCount' => $this->record[$type]['requestCount'] + 1]);
         });
     }
@@ -263,7 +263,7 @@ 
      */
     protected function isAttack()
     {
-        return $this->enabledItems->filter(function ($index, $type) {
+        return $this->enabledItems->filter(function($index, $type) {
             if (!$this->isWhitelisted($type) && $isAttack = $this->record[$type]['requestCount'] > $this->getMaxRequestCountForType($type)) {
                 // $this->takeAction($this->record[$type]);
 
@@ -316,7 +316,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;
         });
     }
@@ -344,7 +344,7 @@ 
      */
     protected function loadRecordItems()
     {
-        $this->enabledItems->each(function ($index, $type) {
+        $this->enabledItems->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);
             }
@@ -480,7 +480,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) {
                 try {
                     event(new AttackDetected($record, $channel));
                 } catch (\Exception $exception) {

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/Vendor/Laravel/ServiceProvider.php

Spacing +15 added lines, -15 removed lines

@@ -134,7 +134,7 @@ 
      */
     private function registerAttackBlocker()
     {
-        $this->app->singleton('firewall.attackBlocker', function ($app) {
+        $this->app->singleton('firewall.attackBlocker', function($app) {
             return new AttackBlocker(
                 $app['firewall.config'],
                 $app['firewall.cache']
@@ -149,7 +149,7 @@ 
      */
     private function registerBlacklistCommand()
     {
-        $this->app->singleton('firewall.blacklist.command', function ($app) {
+        $this->app->singleton('firewall.blacklist.command', function($app) {
             return new BlacklistCommand();
         });
 
@@ -163,7 +163,7 @@ 
      */
     private function registerCache()
     {
-        $this->app->singleton('firewall.cache', function ($app) {
+        $this->app->singleton('firewall.cache', function($app) {
             return new CacheManager($app);
         });
     }
@@ -175,7 +175,7 @@ 
      */
     private function registerClearCommand()
     {
-        $this->app->singleton('firewall.clear.command', function ($app) {
+        $this->app->singleton('firewall.clear.command', function($app) {
             return new ClearCommand();
         });
 
@@ -189,7 +189,7 @@ 
      */
     private function registerDataRepository()
     {
-        $this->app->singleton('firewall.dataRepository', function ($app) {
+        $this->app->singleton('firewall.dataRepository', function($app) {
             return new DataRepository(
                 $this->getFirewallModel(),
 
@@ -221,7 +221,7 @@ 
      */
     private function registerFileSystem()
     {
-        $this->app->singleton('firewall.fileSystem', function ($app) {
+        $this->app->singleton('firewall.fileSystem', function($app) {
             return new Filesystem();
         });
     }
@@ -234,7 +234,7 @@ 
      */
     private function registerFirewall()
     {
-        $this->app->singleton('firewall', function ($app) {
+        $this->app->singleton('firewall', function($app) {
             $app['firewall.loaded'] = true;
 
             $this->firewall = new Firewall(
@@ -259,7 +259,7 @@ 
      */
     private function registerMessageRepository()
     {
-        $this->app->singleton('firewall.message', function ($app) {
+        $this->app->singleton('firewall.message', function($app) {
             return new Message();
         });
     }
@@ -271,11 +271,11 @@ 
      */
     private function registerMiddleware()
     {
-        $this->app->singleton('firewall.middleware.blacklist', function ($app) {
+        $this->app->singleton('firewall.middleware.blacklist', function($app) {
             return new FirewallBlacklist(new Blacklist());
         });
 
-        $this->app->singleton('firewall.middleware.whitelist', function ($app) {
+        $this->app->singleton('firewall.middleware.whitelist', function($app) {
             return new FirewallWhitelist(new Whitelist());
         });
     }
@@ -287,7 +287,7 @@ 
 
     private function registerGeoIp()
     {
-        $this->app->singleton('firewall.geoip', function () {
+        $this->app->singleton('firewall.geoip', function() {
             return new GeoIp($this->getConfig('geoip_database_path'));
         });
     }
@@ -299,7 +299,7 @@ 
      */
     private function registerRemoveCommand()
     {
-        $this->app->singleton('firewall.remove.command', function ($app) {
+        $this->app->singleton('firewall.remove.command', function($app) {
             return new RemoveCommand();
         });
 
@@ -313,7 +313,7 @@ 
      */
     private function registerReportCommand()
     {
-        $this->app->singleton('firewall.list.command', function ($app) {
+        $this->app->singleton('firewall.list.command', function($app) {
             return new ReportCommand();
         });
 
@@ -325,7 +325,7 @@ 
      */
     private function registerUpdateGeoIpCommand()
     {
-        $this->app->singleton('firewall.updategeoip.command', function ($app) {
+        $this->app->singleton('firewall.updategeoip.command', function($app) {
             return new UpdateGeoIpCommand();
         });
 
@@ -339,7 +339,7 @@ 
      */
     private function registerWhitelistCommand()
     {
-        $this->app->singleton('firewall.whitelist.command', function ($app) {
+        $this->app->singleton('firewall.whitelist.command', function($app) {
             return new WhitelistCommand();
         });
 

src/Repositories/DataRepository.php

Spacing +6 added lines, -8 removed lines

@@ -237,8 +237,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);
     }
 
     /**
@@ -250,8 +249,7 @@ 
     public function delete($ipAddress)
     {
         $this->config->get('use_database') ?
-            $this->removeFromDatabaseList($ipAddress) :
-            $this->removeFromArrayList($ipAddress);
+            $this->removeFromDatabaseList($ipAddress) : $this->removeFromArrayList($ipAddress);
     }
 
     public function cacheKey($ip)
@@ -325,7 +323,7 @@ 
     {
         $country = $this->makeCountryFromString($country);
 
-        return $this->all()->filter(function ($item) use ($country) {
+        return $this->all()->filter(function($item) use ($country) {
             return $item['ip_address'] == $country ||
                 $this->makeCountryFromString($this->getCountryFromIp($item['ip_address'])) == $country;
         });
@@ -375,13 +373,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;
@@ -497,7 +495,7 @@ 
      */
     private function formatIpArray($list)
     {
-        return array_map(function ($ip) {
+        return array_map(function($ip) {
             return ['ip_address' => $ip];
         }, $this->makeArrayOfIps($list));
     }