terrylinooo / shieldon

src/Firewall/Component/Rdns.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function isDenied(): bool
     {
         if (!empty($this->deniedList)) {
-            if (preg_match('/(' . implode('|', $this->deniedList). ')/i', $this->rdns)) {
+            if (preg_match('/(' . implode('|', $this->deniedList) . ')/i', $this->rdns)) {
                 return true;
             }
         }

src/Firewall/Component/UserAgent.php

Spacing +10 added lines, -10 removed lines

@@ -49,19 +49,19 @@ 
         $this->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
         ];
     }
 
@@ -71,7 +71,7 @@ 
     public function isDenied(): bool
     {
         if (!empty($this->deniedList)) {
-            if (preg_match('/(' . implode('|', $this->deniedList). ')/i', $this->userAgent)) {
+            if (preg_match('/(' . implode('|', $this->deniedList) . ')/i', $this->userAgent)) {
                 return true;
             }
         }

src/Firewall/Component/Ip.php

Indentation +2 added lines, -2 removed lines

@@ -257,7 +257,7 @@ 
         $ip = $ipData[0];
         $cidr = (int) $ipData[1] ?? 32;
 
-		$result[0] = long2ip((ip2long($ip)) & ((-1 << (32 - $cidr))));
+        $result[0] = long2ip((ip2long($ip)) & ((-1 << (32 - $cidr))));
         $result[1] = long2ip((ip2long($ip)) + pow(2, (32 - $cidr)) - 1);
 
         if ($isDecimal) {
@@ -265,7 +265,7 @@ 
             $result[1] = ip2long($result[1]);
         }
 
-		return $result;
+        return $result;
     }
 
     /**

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

Indentation +39 added lines, -39 removed lines

@@ -35,9 +35,9 @@ 
 use function time;
 use function version_compare;
 
- /**
-  * Cross-Site Scripting protection.
-  */
+    /**
+     * Cross-Site Scripting protection.
+     */
 class Xss
 {
     /**
@@ -284,7 +284,7 @@ 
         unset($original);
 
         // Remove evil attributes such as style, onclick and xmlns
-		$str = $this->removeEvilAttributes($str, $isImage);
+        $str = $this->removeEvilAttributes($str, $isImage);
 
         /*
          * Sanitize naughty HTML elements
@@ -448,62 +448,62 @@ 
 	 * @param boolean $is_image TRUE if this is an image
 	 * @return string The string with the evil attributes removed
 	 */
-	protected function removeEvilAttributes($str, $is_image)
-	{
-		// All javascript event handlers (e.g. onload, onclick, onmouseover), style, and xmlns
-		$evilAttributes = array('on\w*', 'style', 'xmlns', 'formaction', 'form', 'xlink:href');
+    protected function removeEvilAttributes($str, $is_image)
+    {
+        // All javascript event handlers (e.g. onload, onclick, onmouseover), style, and xmlns
+        $evilAttributes = array('on\w*', 'style', 'xmlns', 'formaction', 'form', 'xlink:href');
 
-		if ($is_image) {
-			/*
+        if ($is_image) {
+            /*
 			 * Adobe Photoshop puts XML metadata into JFIF images,
 			 * including namespacing, so we have to allow this for images.
 			 */
-			unset($evilAttributes[array_search('xmlns', $evilAttributes)]);
-		}
+            unset($evilAttributes[array_search('xmlns', $evilAttributes)]);
+        }
 
-		do {
-			$count = 0;
-			$attribs = array();
+        do {
+            $count = 0;
+            $attribs = array();
 
-			// find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
-			preg_match_all(
+            // find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
+            preg_match_all(
                 '/(?<!\w)(' . implode('|', $evilAttributes) . ')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is',
                 $str,
                 $matches,
                 PREG_SET_ORDER
             );
 
-			foreach ($matches as $attr) {
-				$attribs[] = preg_quote($attr[0], '/');
-			}
+            foreach ($matches as $attr) {
+                $attribs[] = preg_quote($attr[0], '/');
+            }
 
-			// find occurrences of illegal attribute strings without quotes
-			preg_match_all(
+            // find occurrences of illegal attribute strings without quotes
+            preg_match_all(
                 '/(?<!\w)(' . implode('|', $evilAttributes) . ')\s*=\s*([^\s>]*)/is',
                 $str,
                 $matches,
                 PREG_SET_ORDER
             );
 
-			foreach ($matches as $attr) {
-				$attribs[] = preg_quote($attr[0], '/');
-			}
+            foreach ($matches as $attr) {
+                $attribs[] = preg_quote($attr[0], '/');
+            }
 
-			// replace illegal attribute strings that are inside an html tag
-			if (count($attribs) > 0) {
-				$str = preg_replace(
+            // replace illegal attribute strings that are inside an html tag
+            if (count($attribs) > 0) {
+                $str = preg_replace(
                     '/(<?)(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(' . implode('|', $attribs) . ')(.*?)([\s><]?)([><]*)/i',
                     '$1$2 $4$6$7$8',
                     $str,
                     -1,
                     $count
                 );
-			}
+            }
 
-		} while ($count);
+        } while ($count);
 
-		return $str;
-	}
+        return $str;
+    }
 
     /**
      * Random Hash for protecting URLs
@@ -856,16 +856,16 @@ 
      * @return bool
      */
     protected function isPHP($version): bool
-	{
+    {
         static $_isPHP;
 
-		$version = (string) $version;
+        $version = (string) $version;
 
-		if (!isset($_isPHP[$version])) {
-			$_isPHP[$version] = version_compare(PHP_VERSION, $version, '>=');
-		}
+        if (!isset($_isPHP[$version])) {
+            $_isPHP[$version] = version_compare(PHP_VERSION, $version, '>=');
+        }
 
-		return $_isPHP[$version];
-	}
+        return $_isPHP[$version];
+    }
 }
 

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 . '>';
         }