terrylinooo / shieldon

src/Firewall/Middleware/UserAgent.php

Spacing +11 added lines, -11 removed lines

@@ -40,19 +40,19 @@ 
     protected $deniedList = [
 
         // Backlink crawlers
-        'Ahrefs',     // http://ahrefs.com/robot/
-        'roger',      // rogerbot (SEOMOZ)
-        'moz.com',    // SEOMOZ crawlers
-        'MJ12bot',    // Majestic crawlers
-        'findlinks',  // http://wortschatz.uni-leipzig.de/findlinks
-        'Semrush',    // http://www.semrush.com/bot.html
+        'Ahrefs', // http://ahrefs.com/robot/
+        'roger', // rogerbot (SEOMOZ)
+        'moz.com', // SEOMOZ crawlers
+        'MJ12bot', // Majestic crawlers
+        'findlinks', // http://wortschatz.uni-leipzig.de/findlinks
+        'Semrush', // http://www.semrush.com/bot.html
 
         // Web information crawlers
-        'domain',     // Domain name information crawlers.
-        'copyright',  // Copyright information crawlers.
+        'domain', // Domain name information crawlers.
+        'copyright', // Copyright information crawlers.
 
         // Others
-        'archive',    // Wayback machine
+        'archive', // Wayback machine
     ];
 
     /**
@@ -65,7 +65,7 @@ 
     public function __construct(array $deniedList = [])
     {
         if (!empty($deniedList)) {
-            $this->deniedList =$deniedList;
+            $this->deniedList = $deniedList;
         }
     }
 
@@ -86,7 +86,7 @@ 
         }
 
         if (!empty($this->deniedList)) {
-            if (preg_match('/(' . implode('|', $this->deniedList). ')/i', $userAgent)) {
+            if (preg_match('/(' . implode('|', $this->deniedList) . ')/i', $userAgent)) {
                 return (new Response)->withStatus(self::HTTP_STATUS_CODE);
             }
         }

src/Firewall/Middleware/Header.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     public function __construct(array $fieldList = [])
     {
         if (!empty($fieldList)) {
-            $this->fieldList =$fieldList;
+            $this->fieldList = $fieldList;
         }
     }
 

src/Firewall/Firewall.php

Spacing +7 added lines, -7 removed lines

@@ -269,7 +269,7 @@ 
                     $this->kernel->add(new Driver\RedisDriver($redis));
 
                 // @codeCoverageIgnoreStart
-                } catch(RedisException $e) {
+                } catch (RedisException $e) {
                     $this->status = false;
 
                     echo $e->getMessage();
@@ -312,7 +312,7 @@ 
                     $this->kernel->add(new Driver\SqliteDriver($pdoInstance));
     
                 // @codeCoverageIgnoreStart
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                     $this->status = false;
 
                     echo $e->getMessage();
@@ -331,7 +331,7 @@ 
                     // Create a PDO instance.
                     $pdoInstance = new PDO(
                         'mysql:host=' 
-                            . $mysqlSetting['host']   . ';dbname=' 
+                            . $mysqlSetting['host'] . ';dbname=' 
                             . $mysqlSetting['dbname'] . ';charset=' 
                             . $mysqlSetting['charset']
                         , (string) $mysqlSetting['user']
@@ -342,7 +342,7 @@ 
                     $this->kernel->add(new Driver\MysqlDriver($pdoInstance));
 
                 // @codeCoverageIgnoreStart
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                     echo $e->getMessage();
                 }
                 // @codeCoverageIgnoreEnd
@@ -804,7 +804,7 @@ 
     protected function setIptablesWatchingFolder(): void
     {
         $iptablesSetting = $this->getOption('config', 'iptables');
-        $this->kernel->setProperty('iptables_watching_folder',  $iptablesSetting['watching_folder']);
+        $this->kernel->setProperty('iptables_watching_folder', $iptablesSetting['watching_folder']);
     }
 
     /**
@@ -841,7 +841,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (!empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart
@@ -984,7 +984,7 @@ 
         if (!empty($ipList)) {
             foreach ($ipList as $ip) {
 
-                if (0 === strpos($this->kernel->getCurrentUrl(), $ip['url']) ) {
+                if (0 === strpos($this->kernel->getCurrentUrl(), $ip['url'])) {
     
                     if ('allow' === $ip['rule']) {
                         $allowedList[] = $ip['ip'];

src/Firewall/IpTrait.php

Spacing +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
 
             // Check if your IP is from localhost, perhaps your are in development environment?
             if (
-                (substr($this->ip, 0 , 8) === '192.168.') ||
-                (substr($this->ip, 0 , 6) === '127.0.')
+                (substr($this->ip, 0, 8) === '192.168.') ||
+                (substr($this->ip, 0, 6) === '127.0.')
             ) {
                 $this->setRdns('localhost');
             } else {

src/Firewall/Utils/Collection.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      */
     public function __construct(array &$data = [])
     {
-        $this->data =& $data;
+        $this->data = & $data;
     }
 
     /**

src/Firewall/Security/Xss.php

Spacing +31 added lines, -31 removed lines

@@ -89,13 +89,13 @@ 
 
         $this->deniedRegexList = [
             'javascript\s*:',
-            '\bon\w+=\S+(?=.*>)',       // Inline JavaScript.
+            '\bon\w+=\S+(?=.*>)', // Inline JavaScript.
             '(document|(document\.)?window)\.(location|on\w*)',
             'expression\s*(\(|&\#40;)', // CSS and IE
-            'vbscript\s*:',             // IE, surprise!
-            'wscript\s*:',              // IE
-            'jscript\s*:',              // IE
-            'vbs\s*:',                  // IE
+            'vbscript\s*:', // IE, surprise!
+            'wscript\s*:', // IE
+            'jscript\s*:', // IE
+            'vbs\s*:', // IE
             'Redirect\s+30\d:',
             "([\"'])?data\s*:[^\\1]*?base64[^\\1]*?,[^\\1]*?\\1?",
         ];
@@ -222,9 +222,9 @@ 
          */
         $words = [
             'javascript', 'expression', 'vbscript', 'jscript', 'wscript',
-            'vbs',        'script',     'base64',   'applet',  'alert', 
-            'document',   'write',      'cookie',   'window',  'confirm',
-            'prompt',     'eval',
+            'vbs', 'script', 'base64', 'applet', 'alert', 
+            'document', 'write', 'cookie', 'window', 'confirm',
+            'prompt', 'eval',
         ];
 
         foreach ($words as $word) {
@@ -279,7 +279,7 @@ 
                 );
             }
 
-        } while($original !== $str);
+        } while ($original !== $str);
 
         unset($original);
 
@@ -581,17 +581,17 @@ 
             "'", '"', '&', '$', '#',
             '{', '}', '[', ']', '=',
             ';', '?', '%20', '%22',
-            '%3c',		// <
-            '%253c',	// <
-            '%3e',		// >
-            '%0e',		// >
-            '%28',		// (
-            '%29',		// )
-            '%2528',	// (
-            '%26',		// &
-            '%24',		// $
-            '%3f',		// ?
-            '%3b',		// ;
+            '%3c', // <
+            '%253c', // <
+            '%3e', // >
+            '%0e', // >
+            '%28', // (
+            '%29', // )
+            '%2528', // (
+            '%26', // &
+            '%24', // $
+            '%3f', // ?
+            '%3b', // ;
             '%3d'		// =
         ];
 
@@ -637,19 +637,19 @@ 
     protected function sanitizeNaughtyHtml(array $matches): string
     {
         static $naughtyTags = [
-            'alert',    'prompt', 'confirm',    'applet',  'audio',
-            'basefont', 'base',   'behavior',   'bgsound', 'blink', 
-            'body',     'embed',  'expression', 'form',    'frameset', 
-            'frame',    'head',   'html',       'ilayer',  'iframe', 
-            'input',    'button', 'select',     'isindex', 'layer', 
-            'link',     'meta',   'keygen',     'object',  'plaintext',
-            'style',    'script', 'textarea',   'title',   'math',
-            'video',    'svg',    'xml',        'xss',
+            'alert', 'prompt', 'confirm', 'applet', 'audio',
+            'basefont', 'base', 'behavior', 'bgsound', 'blink', 
+            'body', 'embed', 'expression', 'form', 'frameset', 
+            'frame', 'head', 'html', 'ilayer', 'iframe', 
+            'input', 'button', 'select', 'isindex', 'layer', 
+            'link', 'meta', 'keygen', 'object', 'plaintext',
+            'style', 'script', 'textarea', 'title', 'math',
+            'video', 'svg', 'xml', 'xss',
         ];
 
         static $evilAttributes = [
-            'on\w+', 'style',      'xmlns',     'seekSegmentTime', 
-            'form',  'xlink:href', 'FSCommand', 'formaction',
+            'on\w+', 'style', 'xmlns', 'seekSegmentTime', 
+            'form', 'xlink:href', 'FSCommand', 'formaction',
         ];
 
         // First, escape unclosed tags
@@ -706,7 +706,7 @@ 
 
             $attributes = empty($attributes)
                 ? ''
-                : ' '.implode(' ', $attributes);
+                : ' ' . implode(' ', $attributes);
             return '<' . $matches['slash'] . $matches['tagName'] . $attributes . '>';
         }
 

src/Firewall/Log/ActionLogger.php

Spacing +5 added lines, -5 removed lines

@@ -100,10 +100,10 @@ 
             $record['session_id'] = substr($record['session_id'], 0, 4);
         }
 
-        $data[0] = $record['ip']          ?? 'null';
-        $data[1] = $record['session_id']  ?? 'null';
+        $data[0] = $record['ip'] ?? 'null';
+        $data[1] = $record['session_id'] ?? 'null';
         $data[2] = $record['action_code'] ?? 'null';
-        $data[3] = $record['timesamp']    ?? 'null';
+        $data[3] = $record['timesamp'] ?? 'null';
 
         file_put_contents($this->filePath, implode(',', $data) . "\n", FILE_APPEND | LOCK_EX);
     }
@@ -247,7 +247,7 @@ 
             $it = new RecursiveDirectoryIterator($this->directory, RecursiveDirectoryIterator::SKIP_DOTS);
             $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
 
-            foreach($files as $file) {
+            foreach ($files as $file) {
                 if ($file->isDir()) {
                     // @codeCoverageIgnoreStart
                     rmdir($file->getRealPath());
@@ -277,7 +277,7 @@ 
             $it = new RecursiveDirectoryIterator($this->directory, RecursiveDirectoryIterator::SKIP_DOTS);
             $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
 
-            foreach($files as $file) {
+            foreach ($files as $file) {
                 if ($file->isFile()) {
                     $key = $file->getBasename('.log');
                     $size = $file->getSize();

src/Firewall/Log/ActionLogParser.php

Spacing +29 added lines, -29 removed lines

@@ -208,7 +208,7 @@ 
             default:
 
                 // We also accept querying N days data from logs. For example: `past_365_days`.
-                if (preg_match('/past_([0-9]+)_days/', $this->type, $matches) ) {
+                if (preg_match('/past_([0-9]+)_days/', $this->type, $matches)) {
 
                     $dayCount = $matches[1];
                     $startDate = date('Ymd', strtotime('-' . $dayCount . ' days'));
@@ -233,7 +233,7 @@ 
         // Fetch data from log files.
         $logs = $this->logger->get($startDate, $endDate);
 
-        foreach($logs as $log) {
+        foreach ($logs as $log) {
 
             $logTimesamp = (int) $log['timesamp'];
             $logIp = $log['ip'];
@@ -331,21 +331,21 @@ 
             return [];
         }
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['captcha_success_count'] = 0;      // integer
-        $results['captcha_failure_count'] = 0;      // integer
-        $results['captcha_count'] = 0;              // integer
-        $results['pageview_count'] = 0;             // integer
-        $results['captcha_percentageage'] = 0;      // integer
+        $results['captcha_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['captcha_success_count'] = 0; // integer
+        $results['captcha_failure_count'] = 0; // integer
+        $results['captcha_count'] = 0; // integer
+        $results['pageview_count'] = 0; // integer
+        $results['captcha_percentageage'] = 0; // integer
         $results['captcha_failure_percentage'] = 0; // integer
         $results['captcha_success_percentage'] = 0; // integer
 
-        $results['action_ban_count'] = 0;           // integer
-        $results['action_temp_ban_count'] = 0;      // integer
-        $results['action_unban_count'] = 0;         // integer
-        $results['blacklist_count'] = 0;            // integer
-        $results['session_limit_count'] = 0;        // integer
+        $results['action_ban_count'] = 0; // integer
+        $results['action_temp_ban_count'] = 0; // integer
+        $results['action_unban_count'] = 0; // integer
+        $results['blacklist_count'] = 0; // integer
+        $results['session_limit_count'] = 0; // integer
 
         $ipdData = $this->getIpData();
 
@@ -386,22 +386,22 @@ 
     {
         $periodData = $this->getPeriodData();
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['label_chart_string'] = '';        // string
-        $results['captcha_success_count'] = 0;      // integer
-        $results['captcha_failure_count'] = 0;      // integer
-        $results['captcha_count'] = 0;              // integer
-        $results['pageview_count'] = 0;             // integer
-        $results['captcha_percentageage'] = 0;      // integer
+        $results['captcha_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['label_chart_string'] = ''; // string
+        $results['captcha_success_count'] = 0; // integer
+        $results['captcha_failure_count'] = 0; // integer
+        $results['captcha_count'] = 0; // integer
+        $results['pageview_count'] = 0; // integer
+        $results['captcha_percentageage'] = 0; // integer
         $results['captcha_failure_percentage'] = 0; // integer
         $results['captcha_success_percentage'] = 0; // integer
 
-        $results['action_ban_count'] = 0;           // integer
-        $results['action_temp_ban_count'] = 0;      // integer
-        $results['action_unban_count'] = 0;         // integer
-        $results['blacklist_count'] = 0;            // integer
-        $results['session_limit_count'] = 0;        // integer
+        $results['action_ban_count'] = 0; // integer
+        $results['action_temp_ban_count'] = 0; // integer
+        $results['action_unban_count'] = 0; // integer
+        $results['blacklist_count'] = 0; // integer
+        $results['session_limit_count'] = 0; // integer
 
         if (!empty($periodData)) {
 
@@ -431,7 +431,7 @@ 
             }
 
             $results['captcha_chart_string'] = implode(',', $chartCaptcha);
-            $results['pageview_chart_string']= implode(',', $chartPageview);
+            $results['pageview_chart_string'] = implode(',', $chartPageview);
             $results['captcha_success_chart_string'] = implode(',', $chartCaptchaSuccess);
             $results['captcha_failure_chart_string'] = implode(',', $chartCaptchaFailure);
             $results['label_chart_string'] = "'" . implode("','", $labels) . "'";
@@ -461,7 +461,7 @@ 
         $ip = $log['ip'];
         $sessionId = $log['session_id'];
 
-        $this->ipDetail[$t][$ip]['session_id'][$sessionId ] = 1;
+        $this->ipDetail[$t][$ip]['session_id'][$sessionId] = 1;
 
         if ($logActionCode === self::LOG_TEMPORARILY_BAN) {
             $this->periodDetail[$t][$k]['action_temp_ban_count']++;

src/Firewall/Helpers.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
         $masked = implode('.', $tmp);
 
     } else {
-        $masked =  str_repeat('*', strlen($str) - 6) . substr(str, -6);
+        $masked = str_repeat('*', strlen($str) - 6) . substr(str, -6);
     }
 
     return $masked;