o2system / security

src/Protections/Throttle.php

Spacing +10 added lines, -10 removed lines

@@ -64,16 +64,16 @@ 
 
         if ($this->repository->has($consumerId)) {
             $consumerData = $this->repository->get($consumerId);
-            $consumerData[ 'id' ] = $consumerId;
-            $consumerData[ 'currentCallTime' ] = $request->getTime();
-            $consumerData[ 'attempts' ] = 1;
+            $consumerData['id'] = $consumerId;
+            $consumerData['currentCallTime'] = $request->getTime();
+            $consumerData['attempts'] = 1;
 
             $this->consumer->merge($consumerData);
         } else {
             $consumerData = $this->consumer->getArrayCopy();
-            $consumerData[ 'id' ] = $consumerId;
-            $consumerData[ 'lastCallTime' ] = $consumerData[ 'currentCallTime' ] = $request->getTime();
-            $consumerData[ 'attempts' ] = $consumerData[ 'attempts' ] + 1;
+            $consumerData['id'] = $consumerId;
+            $consumerData['lastCallTime'] = $consumerData['currentCallTime'] = $request->getTime();
+            $consumerData['attempts'] = $consumerData['attempts'] + 1;
 
             $this->repository->store($consumerId, $consumerData);
         }
@@ -82,13 +82,13 @@ 
     public function verify()
     {
         $currentTime = strtotime(date('r'));
-        $timeCall = abs($this->consumer[ 'lastCallTime' ] - $currentTime);
+        $timeCall = abs($this->consumer['lastCallTime'] - $currentTime);
 
-        $this->consumer[ 'lastCallTime' ] = $currentTime;
+        $this->consumer['lastCallTime'] = $currentTime;
 
-        if ($timeCall > $this->rate[ 'span' ]) {
+        if ($timeCall > $this->rate['span']) {
             return false;
-        } elseif ($this->consumer[ 'attempts' ] > $this->rate[ 'attempts' ]) {
+        } elseif ($this->consumer['attempts'] > $this->rate['attempts']) {
             return false;
         }
 

src/Protections/Captcha.php

Spacing +3 added lines, -3 removed lines

@@ -60,8 +60,8 @@ 
      */
     protected function getToken()
     {
-        if (isset($_SESSION[ 'captchaToken' ])) {
-            return $_SESSION[ 'captchaToken' ];
+        if (isset($_SESSION['captchaToken'])) {
+            return $_SESSION['captchaToken'];
         }
 
         return false;
@@ -78,7 +78,7 @@ 
      */
     public function regenerate()
     {
-        $_SESSION[ 'captchaToken' ] = $this->token = strtoupper(
+        $_SESSION['captchaToken'] = $this->token = strtoupper(
             substr(
                 md5(
                     uniqid(

src/Protections/Throttle/Repository.php

Spacing +20 added lines, -20 removed lines

@@ -37,8 +37,8 @@ 
      */
     public function __construct()
     {
-        if (empty($_SESSION[ 'throttle' ])) {
-            $_SESSION[ 'throttle' ] = [];
+        if (empty($_SESSION['throttle'])) {
+            $_SESSION['throttle'] = [];
         }
     }
 
@@ -54,7 +54,7 @@ 
      */
     public function getIterator()
     {
-        return new \ArrayIterator($_SESSION[ 'throttle' ]);
+        return new \ArrayIterator($_SESSION['throttle']);
     }
 
     // ------------------------------------------------------------------------
@@ -110,7 +110,7 @@ 
      */
     public function offsetExists($offset)
     {
-        return isset($_SESSION[ 'throttle' ][ $offset ]);
+        return isset($_SESSION['throttle'][$offset]);
     }
 
     // ------------------------------------------------------------------------
@@ -127,7 +127,7 @@ 
      */
     public function &__get($offset)
     {
-        return $_SESSION[ 'throttle' ][ $offset ];
+        return $_SESSION['throttle'][$offset];
     }
 
     // ------------------------------------------------------------------------
@@ -183,7 +183,7 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        $_SESSION[ 'throttle' ][ $offset ] = $value;
+        $_SESSION['throttle'][$offset] = $value;
     }
 
     // ------------------------------------------------------------------------
@@ -236,8 +236,8 @@ 
      */
     public function offsetUnset($offset)
     {
-        if (isset($_SESSION[ 'throttle' ][ $offset ])) {
-            unset($_SESSION[ 'throttle' ][ $offset ]);
+        if (isset($_SESSION['throttle'][$offset])) {
+            unset($_SESSION['throttle'][$offset]);
         }
     }
 
@@ -254,8 +254,8 @@ 
      */
     public function merge(array $data)
     {
-        $oldData = $_SESSION[ 'throttle' ];
-        $_SESSION[ 'throttle' ] = array_merge($_SESSION[ 'throttle' ], $data);
+        $oldData = $_SESSION['throttle'];
+        $_SESSION['throttle'] = array_merge($_SESSION['throttle'], $data);
 
         return $oldData;
     }
@@ -273,8 +273,8 @@ 
      */
     public function exchange(array $data)
     {
-        $oldData = $_SESSION[ 'throttle' ];
-        $_SESSION[ 'throttle' ] = $data;
+        $oldData = $_SESSION['throttle'];
+        $_SESSION['throttle'] = $data;
 
         return $oldData;
     }
@@ -290,9 +290,9 @@ 
      */
     public function destroy()
     {
-        $storage = $_SESSION[ 'throttle' ];
+        $storage = $_SESSION['throttle'];
 
-        $_SESSION[ 'throttle' ] = [];
+        $_SESSION['throttle'] = [];
 
         return $storage;
     }
@@ -309,7 +309,7 @@ 
      */
     public function count()
     {
-        return (int)count($_SESSION[ 'throttle' ]);
+        return (int)count($_SESSION['throttle']);
     }
 
     // ------------------------------------------------------------------------
@@ -325,7 +325,7 @@ 
      */
     public function serialize()
     {
-        return serialize($_SESSION[ 'throttle' ]);
+        return serialize($_SESSION['throttle']);
     }
 
     // ------------------------------------------------------------------------
@@ -343,7 +343,7 @@ 
      */
     public function unserialize($serialized)
     {
-        $_SESSION[ 'throttle' ] = unserialize($serialized);
+        $_SESSION['throttle'] = unserialize($serialized);
     }
 
     // ------------------------------------------------------------------------
@@ -360,7 +360,7 @@ 
      */
     public function jsonSerialize()
     {
-        return $_SESSION[ 'throttle' ];
+        return $_SESSION['throttle'];
     }
 
     // ------------------------------------------------------------------------
@@ -374,7 +374,7 @@ 
      */
     public function getArrayCopy()
     {
-        return $_SESSION[ 'throttle' ];
+        return $_SESSION['throttle'];
     }
 
     // ------------------------------------------------------------------------
@@ -432,6 +432,6 @@ 
      */
     public function offsetGet($offset)
     {
-        return (isset($_SESSION[ 'throttle' ][ $offset ])) ? $_SESSION[ 'throttle' ][ $offset ] : false;
+        return (isset($_SESSION['throttle'][$offset])) ? $_SESSION['throttle'][$offset] : false;
     }
 }
\ No newline at end of file

src/Protections/Csrf.php

Spacing +3 added lines, -3 removed lines

@@ -54,8 +54,8 @@ 
      */

     public function getToken()

     {

-        if (isset($_SESSION[ 'csrfToken' ])) {

-            return $_SESSION[ 'csrfToken' ];

+        if (isset($_SESSION['csrfToken'])) {

+            return $_SESSION['csrfToken'];

         }

 

         return false;

@@ -72,7 +72,7 @@ 
      */

     public function regenerate()

     {

-        $_SESSION[ 'csrfToken' ] = $this->token = 'CSRF-' . bin2hex(random_bytes(32));

+        $_SESSION['csrfToken'] = $this->token = 'CSRF-' . bin2hex(random_bytes(32));

     }

 

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

src/Rules.php

Spacing +29 added lines, -29 removed lines

@@ -101,7 +101,7 @@ 
      */
     public function addSource($key, $value)
     {
-        $this->sourceVars[ $key ] = $value;
+        $this->sourceVars[$key] = $value;
     }
 
     // --------------------------------------------------------------------
@@ -114,7 +114,7 @@ 
     public function addRules(array $rules)
     {
         foreach ($rules as $rule) {
-            $this->addRule($rule[ 'field' ], $rule[ 'label' ], $rule[ 'rules' ], $rule[ 'messages' ]);
+            $this->addRule($rule['field'], $rule['label'], $rule['rules'], $rule['messages']);
         }
     }
 
@@ -130,7 +130,7 @@ 
      */
     public function addRule($field, $label, $rules, $messages = [])
     {
-        $this->rules[ $field ] = [
+        $this->rules[$field] = [
             'field'    => $field,
             'label'    => $label,
             'rules'    => $rules,
@@ -166,7 +166,7 @@ 
      */
     public function setMessage($field, $message)
     {
-        $this->customErrors[ $field ] = $message;
+        $this->customErrors[$field] = $message;
     }
 
     // ------------------------------------------------------------------------
@@ -186,15 +186,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];
                     }
@@ -210,16 +210,16 @@ 
                         $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 ];
+                        if ($fieldRuleMethod === 'match') {
+                            foreach ($fieldRuleParams as $fieldRuleParamKey => $fieldRuleParamValue) {
+                                if (array_key_exists($fieldRuleParamValue, $this->sourceVars)) {
+                                    $fieldRuleParams[$fieldRuleParamKey] = $this->sourceVars[$fieldRuleParamValue];
                                 }
                             }
-                        } elseif($fieldRuleMethod === 'listed') {
-                            $fieldRuleParams = [ $fieldRuleParams ];
+                        } elseif ($fieldRuleMethod === 'listed') {
+                            $fieldRuleParams = [$fieldRuleParams];
                         }
 
                         /* Merge method's param with field rule's params */
@@ -233,40 +233,40 @@ 
                     /* Throw exception if method not exists in validation class */
                     if (method_exists($validationClass, $validationMethod)) {
                         $validationStatus = call_user_func_array([&$validationClass, $validationMethod], $fieldValue);
-                    } elseif(function_exists($fieldRuleMethod)) {
+                    } elseif (function_exists($fieldRuleMethod)) {
                         $validationStatus = call_user_func_array($fieldRuleMethod, $fieldValue);
-                    } elseif(is_callable($fieldRuleMethod)) {
+                    } elseif (is_callable($fieldRuleMethod)) {
                         $validationStatus = call_user_func_array($fieldRuleMethod, $fieldValue);
                     }
 
                     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]));
                     }
 
@@ -281,7 +281,7 @@ 
 
     protected function setFieldError($field, $label, $message)
     {
-        $this->errors[ $field ] = [
+        $this->errors[$field] = [
             'label'   => $label,
             'message' => $message,
         ];
@@ -294,7 +294,7 @@ 
         $ul = new Unordered();
 
         foreach ($this->getErrors() as $field => $errorParams) {
-            $ul->createList($errorParams[ 'label' ] . ': ' . $errorParams[ 'message' ]);
+            $ul->createList($errorParams['label'] . ': ' . $errorParams['message']);
         }
 
         return $ul->render();

src/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @param $className

  */

 spl_autoload_register(

-    function ($className) {

+    function($className) {

         if (strpos($className, 'O2System\Security\\') === false) {

             return;

         }

src/Authentication/Oauth/Consumer.php

Spacing +6 added lines, -6 removed lines

@@ -141,15 +141,15 @@ 
         ];
 
         if (isset($httpUrl)) {
-            $parameters[ 'oauth_signature' ] = $this->getSignature($signatureMethod, $httpUrl, $httpMethod,
+            $parameters['oauth_signature'] = $this->getSignature($signatureMethod, $httpUrl, $httpMethod,
                 $parameters);
         } else {
-            $parameters[ 'oauth_signature' ] = $this->getSignature($signatureMethod, null, null,
+            $parameters['oauth_signature'] = $this->getSignature($signatureMethod, null, null,
                 $parameters);
         }
 
         if ( ! empty($this->callbackUrl)) {
-            $parameters[ 'callback' ] = $this->callbackUrl;
+            $parameters['callback'] = $this->callbackUrl;
         }
 
         $parts = [];
@@ -182,9 +182,9 @@ 
     ) {
         if (isset($httpUrl)) {
             $urlParts = parse_url($httpUrl);
-            $scheme = $urlParts[ 'scheme' ];
-            $host = strtolower($urlParts[ 'host' ]);
-            $path = $urlParts[ 'path' ];
+            $scheme = $urlParts['scheme'];
+            $host = strtolower($urlParts['host']);
+            $path = $urlParts['path'];
             $httpUrl = "$scheme://$host$path";
 
             $parts = [

src/Authentication/Oauth/Provider.php

Spacing +37 added lines, -37 removed lines

@@ -90,51 +90,51 @@ 
             $httpAuthorization = explode(' ', $httpAuthorization);
             $httpAuthorization = array_map('trim', $httpAuthorization);
 
-            switch (strtoupper($httpAuthorization[ 0 ])) {
+            switch (strtoupper($httpAuthorization[0])) {
                 default:
                 case 'OAUTH':
                     array_shift($httpAuthorization);
-                    $httpAuthorization = array_map(function ($string) {
+                    $httpAuthorization = array_map(function($string) {
                         $string = str_replace(['"', ','], '', $string);
                         $string = explode('=', $string);
 
                         return [
-                            'key'   => str_replace('oauth_', '', $string[ 0 ]),
-                            'value' => $string[ 1 ],
+                            'key'   => str_replace('oauth_', '', $string[0]),
+                            'value' => $string[1],
                         ];
                     }, $httpAuthorization);
 
                     $oauthParams = [];
                     foreach ($httpAuthorization as $param) {
-                        $oauthParams[ $param[ 'key' ] ] = $param[ 'value' ];
+                        $oauthParams[$param['key']] = $param['value'];
                     }
 
-                    $this->oauth->signature_method = $oauthParams[ 'signature_method' ];
-                    $this->oauth->nonce = $oauthParams[ 'nonce' ];
-                    $this->oauth->timestamp = $oauthParams[ 'timestamp' ];
-                    $this->oauth->consumer_key = $oauthParams[ 'consumer_key' ];
-                    $this->oauth->version = $oauthParams[ 'version' ];
+                    $this->oauth->signature_method = $oauthParams['signature_method'];
+                    $this->oauth->nonce = $oauthParams['nonce'];
+                    $this->oauth->timestamp = $oauthParams['timestamp'];
+                    $this->oauth->consumer_key = $oauthParams['consumer_key'];
+                    $this->oauth->version = $oauthParams['version'];
 
-                    if (isset($oauthParams[ 'callback' ])) {
-                        $this->oauth->callback = urldecode($oauthParams[ 'callback' ]);
+                    if (isset($oauthParams['callback'])) {
+                        $this->oauth->callback = urldecode($oauthParams['callback']);
                     }
 
-                    if (isset($oauthParams[ 'signature' ])) {
-                        $this->oauth->signature = $oauthParams[ 'signature' ];
+                    if (isset($oauthParams['signature'])) {
+                        $this->oauth->signature = $oauthParams['signature'];
                     }
 
                     $this->oauth->callconsumerHandler();
                     break;
                 case 'BASIC':
                 case 'BEARER':
-                    $this->oauth->bearer = $httpAuthorization[ 1 ];
+                    $this->oauth->bearer = $httpAuthorization[1];
                     $bearer = base64_decode($this->oauth->bearer);
                     $bearer = explode(':', $bearer);
                     $bearer = array_map('trim', $bearer);
 
                     if (count($bearer) == 2) {
-                        $this->oauth->consumer_key = $bearer[ 0 ];
-                        $this->oauth->consumer_secret = $bearer[ 1 ];
+                        $this->oauth->consumer_key = $bearer[0];
+                        $this->oauth->consumer_secret = $bearer[1];
 
                         $this->oauth->callconsumerHandler();
                     }
@@ -148,8 +148,8 @@ 
             $verifier = array_map('trim', $verifier);
 
             if (count($verifier) == 2) {
-                $this->oauth->token = $verifier[ 0 ];
-                $this->oauth->token_secret = $verifier[ 1 ];
+                $this->oauth->token = $verifier[0];
+                $this->oauth->token_secret = $verifier[1];
             }
         }
 
@@ -194,16 +194,16 @@ 
         if ( ! empty($this->token)) {
             if ($this->model->insertTokenNonce([
                 'id_consumer_token' => $this->token->id,
-                'nonce'             => $token[ 'nonce' ] = Oauth::generateNonce(),
-                'timestamp'         => $token[ 'timestamp' ] = date('Y-m-d H:m:s'),
-                'expires'           => $token[ 'expires' ] = time() + 3600,
+                'nonce'             => $token['nonce'] = Oauth::generateNonce(),
+                'timestamp'         => $token['timestamp'] = date('Y-m-d H:m:s'),
+                'expires'           => $token['expires'] = time() + 3600,
             ])) {
                 return new Datastructures\Token([
                     'key'       => $this->token->key,
                     'secret'    => $this->token->secret,
-                    'nonce'     => $token[ 'nonce' ],
-                    'timestamp' => $token[ 'timestamp' ],
-                    'expires'   => $token[ 'expires' ],
+                    'nonce'     => $token['nonce'],
+                    'timestamp' => $token['timestamp'],
+                    'expires'   => $token['expires'],
                     'verifier'  => (new Token($this->token->key, $this->token->secret))->getVerifier(),
                 ]);
             }
@@ -211,17 +211,17 @@ 
 
         $token = $this->generateToken('ACCESS');
         $token = new Datastructures\Token([
-            'id'       => $token[ 'id' ],
-            'key'      => $token[ 'key' ],
-            'secret'   => $token[ 'secret' ],
-            'verifier' => (new Token($token[ 'key' ], $token[ 'secret' ]))->getVerifier(),
+            'id'       => $token['id'],
+            'key'      => $token['key'],
+            'secret'   => $token['secret'],
+            'verifier' => (new Token($token['key'], $token['secret']))->getVerifier(),
         ]);
 
         if ($this->model->insertTokenNonce([
-            'id_consumer_token' => $token[ 'id' ],
-            'nonce'             => $token[ 'nonce' ] = Oauth::generateNonce(),
-            'timestamp'         => $token[ 'timestamp' ] = date('Y-m-d H:m:s'),
-            'expires'           => $token[ 'expires' ] = time() + 3600,
+            'id_consumer_token' => $token['id'],
+            'nonce'             => $token['nonce'] = Oauth::generateNonce(),
+            'timestamp'         => $token['timestamp'] = date('Y-m-d H:m:s'),
+            'expires'           => $token['expires'] = time() + 3600,
         ])) {
             return $token;
         }
@@ -284,15 +284,15 @@ 
 
                 if ($this->model->insertToken([
                     'id_consumer' => $this->consumer->id,
-                    'key'         => $token[ 'key' ],
-                    'secret'      => $token[ 'secret' ],
+                    'key'         => $token['key'],
+                    'secret'      => $token['secret'],
                     'type'        => $type,
                     'callback'    => $callback,
                 ])) {
-                    $token[ 'id' ] = $this->model->db->getLastInsertId();
+                    $token['id'] = $this->model->db->getLastInsertId();
 
                     if ($this->model->insertTokenNonce([
-                        'id_consumer_token' => $token[ 'id' ],
+                        'id_consumer_token' => $token['id'],
                         'nonce'             => $nonce,
                         'timestamp'         => date('Y-m-d H:m:s'),
                         'expires'           => time() + 3600,

src/Authentication/User/Role.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 {
     public function __construct(array $role)
     {
-        foreach($role as $key => $value) {
+        foreach ($role as $key => $value) {
             $this->store($key, $value);
         }
     }