o2system / security

src/Filters/Xss.php

Spacing +31 added lines, -31 removed lines

@@ -33,7 +33,7 @@ 
         // Is the string an array?

         if (is_array($string)) {

             while (list($key) = each($string)) {

-                $string[ $key ] = self::clean($string[ $key ]);

+                $string[$key] = self::clean($string[$key]);

             }

 

             return $string;

@@ -291,7 +291,7 @@ 
             $config = require('../Config/Xss.php');

         }

 

-        return $config[ $index ];

+        return $config[$index];

     }

 

     // --------------------------------------------------------------------

@@ -310,7 +310,7 @@ 
      */

     protected static function compactExplodedWords($matches)

     {

-        return preg_replace('/\s+/s', '', $matches[ 1 ]) . $matches[ 2 ];

+        return preg_replace('/\s+/s', '', $matches[1]) . $matches[2];

     }

 

     // --------------------------------------------------------------------

@@ -329,13 +329,13 @@ 
     protected static function sanitizeNaughtyHTML($matches)

     {

         // First, escape unclosed tags

-        if (empty($matches[ 'closeTag' ])) {

-            return '<' . $matches[ 1 ];

+        if (empty($matches['closeTag'])) {

+            return '<' . $matches[1];

         } // Is the element that we caught naughty? If so, escape it

-        elseif (in_array(strtolower($matches[ 'tagName' ]), self::getConfig('naughty_tags'), true)) {

-            return '<' . $matches[ 1 ] . '>';

+        elseif (in_array(strtolower($matches['tagName']), self::getConfig('naughty_tags'), true)) {

+            return '<' . $matches[1] . '>';

         } // For other tags, see if their attributes are "evil" and strip those

-        elseif (isset($matches[ 'attributes' ])) {

+        elseif (isset($matches['attributes'])) {

             // We'll store the already fitlered attributes here

             $attributes = [];

 

@@ -356,37 +356,37 @@ 
                 // Strip any non-alpha characters that may preceed an attribute.

                 // Browsers often parse these incorrectly and that has been a

                 // of numerous XSS issues we've had.

-                $matches[ 'attributes' ] = preg_replace('#^[^a-z]+#i', '', $matches[ 'attributes' ]);

+                $matches['attributes'] = preg_replace('#^[^a-z]+#i', '', $matches['attributes']);

 

-                if ( ! preg_match($attributesPattern, $matches[ 'attributes' ], $attribute, PREG_OFFSET_CAPTURE)) {

+                if ( ! preg_match($attributesPattern, $matches['attributes'], $attribute, PREG_OFFSET_CAPTURE)) {

                     // No (valid) attribute found? Discard everything else inside the tag

                     break;

                 }

 

                 if (

                     // Is it indeed an "evil" attribute?

-                    preg_match($is_evil_pattern, $attribute[ 'name' ][ 0 ])

+                    preg_match($is_evil_pattern, $attribute['name'][0])

                     // Or does it have an equals sign, but no value and not quoted? Strip that too!

-                    OR (trim($attribute[ 'value' ][ 0 ]) === '')

+                    OR (trim($attribute['value'][0]) === '')

                 ) {

                     $attributes[] = 'xss=removed';

                 } else {

-                    $attributes[] = $attribute[ 0 ][ 0 ];

+                    $attributes[] = $attribute[0][0];

                 }

 

-                $matches[ 'attributes' ] = substr(

-                    $matches[ 'attributes' ],

-                    $attribute[ 0 ][ 1 ] + strlen($attribute[ 0 ][ 0 ])

+                $matches['attributes'] = substr(

+                    $matches['attributes'],

+                    $attribute[0][1] + strlen($attribute[0][0])

                 );

-            } while ($matches[ 'attributes' ] !== '');

+            } while ($matches['attributes'] !== '');

             $attributes = empty($attributes)

                 ? ''

                 : ' ' . implode(' ', $attributes);

 

-            return '<' . $matches[ 'slash' ] . $matches[ 'tagName' ] . $attributes . '>';

+            return '<' . $matches['slash'] . $matches['tagName'] . $attributes . '>';

         }

 

-        return $matches[ 0 ];

+        return $matches[0];

     }

 

     // --------------------------------------------------------------------

@@ -409,13 +409,13 @@ 
     protected static function jsLinkRemoval($match)

     {

         return str_replace(

-            $match[ 1 ],

+            $match[1],

             preg_replace(

                 '#href=.*?(?:(?:alert|prompt|confirm)(?:\(|&\#40;)|javascript:|livescript:|mocha:|charset=|window\.|document\.|\.cookie|<script|<xss|data\s*:)#si',

                 '',

-                self::filterAttributes(str_replace(['<', '>'], '', $match[ 1 ]))

+                self::filterAttributes(str_replace(['<', '>'], '', $match[1]))

             ),

-            $match[ 0 ]

+            $match[0]

         );

     }

 

@@ -437,7 +437,7 @@ 
     {

         $out = '';

         if (preg_match_all('#\s*[a-z\-]+\s*=\s*(\042|\047)([^\\1]*?)\\1#is', $str, $matches)) {

-            foreach ($matches[ 0 ] as $match) {

+            foreach ($matches[0] as $match) {

                 $out .= preg_replace('#/\*.*?\*/#s', '', $match);

             }

         }

@@ -465,13 +465,13 @@ 
     protected static function jsImgRemoval($match)

     {

         return str_replace(

-            $match[ 1 ],

+            $match[1],

             preg_replace(

                 '#src=.*?(?:(?:alert|prompt|confirm)(?:\(|&\#40;)|javascript:|livescript:|mocha:|charset=|window\.|document\.|\.cookie|<script|<xss|base64\s*,)#si',

                 '',

-                self::filterAttributes(str_replace(['<', '>'], '', $match[ 1 ]))

+                self::filterAttributes(str_replace(['<', '>'], '', $match[1]))

             ),

-            $match[ 0 ]

+            $match[0]

         );

     }

 

@@ -488,7 +488,7 @@ 
      */

     protected static function convertAttribute($match)

     {

-        return str_replace(['>', '<', '\\'], ['&gt;', '&lt;', '\\\\'], $match[ 0 ]);

+        return str_replace(['>', '<', '\\'], ['&gt;', '&lt;', '\\\\'], $match[0]);

     }

 

     // ------------------------------------------------------------------------

@@ -506,7 +506,7 @@ 
     {

         // Protect GET variables in URLs

         // 901119URL5918AMP18930PROTECT8198

-        $match = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', self::token . '\\1=\\2', $match[ 0 ]);

+        $match = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', self::token . '\\1=\\2', $match[0]);

 

         $charset = 'UTF-8';

         if (function_exists('config')) {

@@ -570,10 +570,10 @@ 
                 }

 

                 $replace = [];

-                $matches = array_unique(array_map('strtolower', $matches[ 0 ]));

+                $matches = array_unique(array_map('strtolower', $matches[0]));

                 for ($i = 0; $i < $c; $i++) {

-                    if (($char = array_search($matches[ $i ] . ';', $entities, true)) !== false) {

-                        $replace[ $matches[ $i ] ] = $char;

+                    if (($char = array_search($matches[$i] . ';', $entities, true)) !== false) {

+                        $replace[$matches[$i]] = $char;

                     }

                 }

 

src/Filters/Rules.php

Spacing +22 added lines, -22 removed lines

@@ -104,7 +104,7 @@ 
      */
     public function addSource($key, $value)
     {
-        $this->sourceVars[ $key ] = $value;
+        $this->sourceVars[$key] = $value;
     }
 
     // --------------------------------------------------------------------
@@ -117,7 +117,7 @@ 
     public function sets(array $rules)
     {
         foreach ($rules as $rule) {
-            $this->add($rule[ 'field' ], $rule[ 'label' ], $rule[ 'rules' ], $rule[ 'messages' ]);
+            $this->add($rule['field'], $rule['label'], $rule['rules'], $rule['messages']);
         }
     }
 
@@ -133,7 +133,7 @@ 
      */
     public function add($field, $label, $rules, $messages = [])
     {
-        $this->clauses[ $field ] = [
+        $this->clauses[$field] = [
             'field'    => $field,
             'label'    => $label,
             'rules'    => $rules,
@@ -169,7 +169,7 @@ 
      */
     public function setMessage($field, $message)
     {
-        $this->customErrors[ $field ] = $message;
+        $this->customErrors[$field] = $message;
     }
 
     // ------------------------------------------------------------------------
@@ -195,15 +195,15 @@ 
                 throw new OutOfRangeException('SECURITY_RULES_E_HEADER_OUTOFRANGEEXCEPTION', 1);
             }
 
-            if (is_string($fieldParams[ 'rules' ])) {
+            if (is_string($fieldParams['rules'])) {
                 /**
                  * Explode field rules by | as delimiter
                  */
-                $fieldRules = explode('|', $fieldParams[ 'rules' ]);
+                $fieldRules = explode('|', $fieldParams['rules']);
 
                 foreach ($fieldRules as $fieldRuleMethod) {
                     /* Get parameter from given data */
-                    $fieldValue = $this->sourceVars[ $fieldName ];
+                    $fieldValue = $this->sourceVars[$fieldName];
                     if ( ! is_array($fieldValue)) {
                         $fieldValue = [$fieldValue];
                     }
@@ -219,12 +219,12 @@ 
                         $fieldRuleMethod = preg_replace("/\[.*\]/", '', $fieldRuleMethod);
 
                         /* Explode rule parameter */
-                        $fieldRuleParams = explode(',', preg_replace("/,[ ]+/", ',', $fieldRuleParams[ 1 ][ 0 ]));
+                        $fieldRuleParams = explode(',', preg_replace("/,[ ]+/", ',', $fieldRuleParams[1][0]));
 
                         if ($fieldRuleMethod === 'match') {
                             foreach ($fieldRuleParams as $fieldRuleParamKey => $fieldRuleParamValue) {
                                 if (array_key_exists($fieldRuleParamValue, $this->sourceVars)) {
-                                    $fieldRuleParams[ $fieldRuleParamKey ] = $this->sourceVars[ $fieldRuleParamValue ];
+                                    $fieldRuleParams[$fieldRuleParamKey] = $this->sourceVars[$fieldRuleParamValue];
                                 }
                             }
                         } elseif ($fieldRuleMethod === 'listed') {
@@ -249,33 +249,33 @@ 
                     }
 
                     if ($validationStatus === false) {
-                        if ( ! empty($fieldParams[ 'messages' ])) {
-                            $message = $fieldParams[ 'messages' ];
+                        if ( ! empty($fieldParams['messages'])) {
+                            $message = $fieldParams['messages'];
 
                             /* If $rule message is array, replace $message with specified message */
-                            if (is_array($fieldParams[ 'messages' ])) {
-                                if (isset($fieldParams[ 'messages' ][ $fieldRuleMethod ])) {
-                                    $message = $fieldParams[ 'messages' ][ $fieldRuleMethod ];
+                            if (is_array($fieldParams['messages'])) {
+                                if (isset($fieldParams['messages'][$fieldRuleMethod])) {
+                                    $message = $fieldParams['messages'][$fieldRuleMethod];
                                 } else {
-                                    $message = $fieldParams[ 'messages' ][ $fieldName ];
+                                    $message = $fieldParams['messages'][$fieldName];
                                 }
                             }
                         } elseif (array_key_exists($fieldName, $this->customErrors)) {
-                            $message = $this->customErrors[ $fieldName ];
+                            $message = $this->customErrors[$fieldName];
                         } elseif (array_key_exists($fieldRuleMethod, $this->customErrors)) {
-                            $message = $this->customErrors[ $fieldRuleMethod ];
+                            $message = $this->customErrors[$fieldRuleMethod];
                         } else {
                             $message = 'RULE_' . strtoupper($fieldRuleMethod);
                         }
 
                         /* Replace message placeholder, :attribute, :params */
                         $message = str_replace(':attribute',
-                            (isset($fieldParams[ 'label' ]) ? $fieldParams[ 'label' ] : $fieldName), $message);
-                        if (isset($fieldRuleParams) AND ! empty($fieldRuleParams[ 0 ])) {
+                            (isset($fieldParams['label']) ? $fieldParams['label'] : $fieldName), $message);
+                        if (isset($fieldRuleParams) AND ! empty($fieldRuleParams[0])) {
                             $message = str_replace(':params', implode(',', $fieldRuleParams), $message);
                         }
 
-                        $this->setFieldError($fieldName, language($fieldParams[ 'label' ]),
+                        $this->setFieldError($fieldName, language($fieldParams['label']),
                             language($message, [$fieldValue]));
                     }
 
@@ -297,7 +297,7 @@ 
      */
     protected function setFieldError($field, $label, $message)
     {
-        $this->errors[ $field ] = [
+        $this->errors[$field] = [
             'label'   => $label,
             'message' => $message,
         ];
@@ -316,7 +316,7 @@ 
             $ul = new \O2System\Framework\Libraries\Ui\Contents\Lists\Unordered();
 
             foreach ($this->getErrors() as $field => $errorParams) {
-                $ul->createList($errorParams[ 'label' ] . ': ' . $errorParams[ 'message' ]);
+                $ul->createList($errorParams['label'] . ': ' . $errorParams['message']);
             }
 
             return $ul->render();

src/Generators/Token.php

Spacing +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
             $max = strlen($codeAlphabet);
 
             for ($i = 0; $i < $length; $i++) {
-                $token .= $codeAlphabet[ random_int(0, $max - 1) ];
+                $token .= $codeAlphabet[random_int(0, $max - 1)];
             }
 
             return $token;
@@ -275,7 +275,7 @@ 
      */
     public function addHeader($key, $value)
     {
-        $this->headers[ $key ] = $value;
+        $this->headers[$key] = $value;
 
         return $this;
     }