o2system / security

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/Http.php

Spacing +23 added lines, -23 removed lines

@@ -188,20 +188,20 @@ 
 
                 if ($authorization = input()->server('HTTP_AUTHORIZATION')) {
                     $authentication = unserialize(base64_decode($authorization));
-                    if ($this->login($authentication[ 'username' ], $authentication[ 'password' ])) {
+                    if ($this->login($authentication['username'], $authentication['password'])) {
                         return true;
                     }
                 } else {
                     $authentication = $this->parseBasic();
                 }
 
-                if ($this->login($authentication[ 'username' ], $authentication[ 'password' ])) {
+                if ($this->login($authentication['username'], $authentication['password'])) {
 
                     header('Authorization: Basic ' . base64_encode(serialize($authentication)));
 
                     return true;
                 } else {
-                    unset($_SERVER[ 'PHP_AUTH_USER' ], $_SERVER[ 'PHP_AUTH_PW' ]);
+                    unset($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
                     $this->protect();
                 }
 
@@ -214,37 +214,37 @@ 
                 }
 
                 if (isset($authentication) AND
-                    false !== ($password = $this->login($authentication[ 'username' ]))
+                    false !== ($password = $this->login($authentication['username']))
                 ) {
-                    $A1 = md5($authentication[ 'username' ] . ':' . $this->realm . ':' . $password);
-                    $A2 = md5($_SERVER[ 'REQUEST_METHOD' ] . ':' . $authentication[ 'uri' ]);
+                    $A1 = md5($authentication['username'] . ':' . $this->realm . ':' . $password);
+                    $A2 = md5($_SERVER['REQUEST_METHOD'] . ':' . $authentication['uri']);
                     $response = md5(
                         $A1
                         . ':'
-                        . $authentication[ 'nonce' ]
+                        . $authentication['nonce']
                         . ':'
-                        . $authentication[ 'nc' ]
+                        . $authentication['nc']
                         . ':'
-                        . $authentication[ 'cnonce' ]
+                        . $authentication['cnonce']
                         . ':'
-                        . $authentication[ 'qop' ]
+                        . $authentication['qop']
                         . ':'
                         . $A2
                     );
 
-                    if ($authentication[ 'response' ] === $response) {
+                    if ($authentication['response'] === $response) {
                         header(
                             sprintf(
                                 'Authorization: Digest username="%s", realm="%s", nonce="%s", uri="%s", qop=%s, nc=%s, cnonce="%s", response="%s", opaque="%s"',
-                                $authentication[ 'username' ],
+                                $authentication['username'],
                                 $this->realm,
-                                $authentication[ 'nonce' ],
-                                $authentication[ 'uri' ],
-                                $authentication[ 'qop' ],
-                                $authentication[ 'nc' ],
-                                $authentication[ 'cnonce' ],
+                                $authentication['nonce'],
+                                $authentication['uri'],
+                                $authentication['qop'],
+                                $authentication['nc'],
+                                $authentication['cnonce'],
                                 $response,
-                                $authentication[ 'opaque' ]
+                                $authentication['opaque']
                             )
                         );
 
@@ -252,7 +252,7 @@ 
                     }
                 }
 
-                unset($_SERVER[ 'PHP_AUTH_DIGEST' ], $_SERVER[ 'HTTP_AUTHORIZATION' ]);
+                unset($_SERVER['PHP_AUTH_DIGEST'], $_SERVER['HTTP_AUTHORIZATION']);
                 $this->protect();
 
                 break;
@@ -283,7 +283,7 @@ 
                         return call_user_func_array($this->validation, func_get_args());
                     } else {
                         if (array_key_exists($username, $this->users)) {
-                            if ($this->users[ $username ] === $password) {
+                            if ($this->users[$username] === $password) {
                                 return true;
                             }
                         }
@@ -296,7 +296,7 @@ 
                         return call_user_func_array($this->validation, func_get_args());
                     } else {
                         if (array_key_exists($username, $this->users)) {
-                            return $this->users[ $username ];
+                            return $this->users[$username];
                         }
                     }
                 }
@@ -373,14 +373,14 @@ 
         foreach ($parts as $part) {
             $elements = explode('=', $part);
             $elements = array_map(
-                function ($element) {
+                function($element) {
                     return trim(str_replace('"', '', $element));
 
                 },
                 $elements
             );
 
-            $data[ $elements[ 0 ] ] = $elements[ 1 ];
+            $data[$elements[0]] = $elements[1];
         }
 
         return empty($data)

src/Encryptions/Algorithm.php

Spacing +1 added lines, -1 removed lines

@@ -67,6 +67,6 @@
      */
     public static function map($algorithm)
     {
-        return static::$supported[ $algorithm ];
+        return static::$supported[$algorithm];
     }
 }
\ No newline at end of file

src/Encryptions/Cookie.php

Spacing +15 added lines, -15 removed lines

@@ -59,15 +59,15 @@ 
 
         if (class_exists('\O2System\Framework', false) or class_exists('\O2System\Reactor', false)) {
             $this->options = config()->getItem('cookie')->getArrayCopy();
-            $this->options[ 'expire' ] = time() + $this->options[ 'lifetime' ];
-            unset($this->options[ 'lifetime' ]);
+            $this->options['expire'] = time() + $this->options['lifetime'];
+            unset($this->options['lifetime']);
         }
 
-        $this->options[ 'domain' ] = empty($this->options[ 'domain' ])
-            ? isset($_SERVER[ 'HTTP_HOST' ])
-                ? $_SERVER[ 'HTTP_HOST' ]
-                : $_SERVER[ 'SERVER_NAME' ]
-            : $this->options[ 'domain' ];
+        $this->options['domain'] = empty($this->options['domain'])
+            ? isset($_SERVER['HTTP_HOST'])
+                ? $_SERVER['HTTP_HOST']
+                : $_SERVER['SERVER_NAME']
+            : $this->options['domain'];
     }
 
     // ------------------------------------------------------------------------
@@ -85,7 +85,7 @@ 
     {
         foreach ($options as $key => $value) {
             if (array_key_exists($key, $this->options)) {
-                $this->options[ $key ] = $value;
+                $this->options[$key] = $value;
             }
         }
 
@@ -110,8 +110,8 @@ 
             ? serialize($value)
             : $value;
 
-        $name = isset($this->options[ 'prefix' ])
-            ? $this->options[ 'prefix' ] . $name
+        $name = isset($this->options['prefix'])
+            ? $this->options['prefix'] . $name
             : $name;
 
         $value = $this->crypt->encrypt($value);
@@ -119,9 +119,9 @@ 
         return setcookie(
             $name,
             $value,
-            $this->options[ 'expire' ],
-            $this->options[ 'path' ],
-            '.' . ltrim($this->options[ 'domain' ], '.'),
+            $this->options['expire'],
+            $this->options['path'],
+            '.' . ltrim($this->options['domain'], '.'),
             false,
             false
         );
@@ -140,8 +140,8 @@ 
      */
     public function decrypt($name)
     {
-        $name = isset($this->options[ 'prefix' ])
-            ? $this->options[ 'prefix' ] . $name
+        $name = isset($this->options['prefix'])
+            ? $this->options['prefix'] . $name
             : $name;
 
         if ($value = input()->cookie($name)) {

src/Authentication/User.php

Spacing +12 added lines, -12 removed lines

@@ -63,8 +63,8 @@ 
     {
         if (password_needs_rehash(
             $password,
-            $this->config[ 'password' ][ 'algorithm' ],
-            $this->config[ 'password' ][ 'options' ]
+            $this->config['password']['algorithm'],
+            $this->config['password']['options']
         )) {
             return $this->passwordHash($password);
         }
@@ -76,8 +76,8 @@ 
     {
         return password_hash(
             $password,
-            $this->config[ 'password' ][ 'algorithm' ],
-            $this->config[ 'password' ][ 'options' ]
+            $this->config['password']['algorithm'],
+            $this->config['password']['options']
         );
     }
 
@@ -88,14 +88,14 @@ 
 
     public function attempt()
     {
-        $_SESSION[ 'userAttempts' ] = $this->getAttempts() + 1;
+        $_SESSION['userAttempts'] = $this->getAttempts() + 1;
     }
 
     public function getAttempts()
     {
         $currentAttempts = 0;
-        if (isset($_SESSION[ 'userAttempts' ])) {
-            $currentAttempts = (int)$_SESSION[ 'userAttempts' ];
+        if (isset($_SESSION['userAttempts'])) {
+            $currentAttempts = (int)$_SESSION['userAttempts'];
         }
 
         return (int)$currentAttempts;
@@ -103,8 +103,8 @@ 
 
     public function login(array $account)
     {
-        $_SESSION[ 'account' ] = $account;
-        unset($_SESSION[ 'userAttempts' ]);
+        $_SESSION['account'] = $account;
+        unset($_SESSION['userAttempts']);
     }
 
     public function signOn(array $account)
@@ -132,12 +132,12 @@ 
 
     public function loggedIn()
     {
-        if (isset($_SESSION[ 'account' ])) {
+        if (isset($_SESSION['account'])) {
             return true;
         } elseif ($this->signedOn()) {
             $cacheItemPool = $this->getCacheItemPool();
             $item = $cacheItemPool->getItem('sso-' . input()->cookie('ssid'));
-            $_SESSION[ 'account' ] = $item->get();
+            $_SESSION['account'] = $item->get();
 
             return true;
         }
@@ -159,7 +159,7 @@ 
     public function logout()
     {
         $this->signOff();
-        unset($_SESSION[ 'account' ]);
+        unset($_SESSION['account']);
     }
 
     public function signOff()

src/Authentication/Oauth/Consumer.php

Spacing +4 added lines, -4 removed lines

@@ -119,8 +119,8 @@ 
         $tokenParts = array_map('trim', $tokenParts);
 
         return [
-            'oauth_consumer_key'    => $tokenParts[ 1 ],
-            'oauth_consumer_secret' => $tokenParts[ 0 ],
+            'oauth_consumer_key'    => $tokenParts[1],
+            'oauth_consumer_secret' => $tokenParts[0],
         ];
     }
 
@@ -201,8 +201,8 @@ 
             'oauth_consumer_key'     => $this->key,
         ];
 
-        $parameters[ 'oauth_signature' ] = $oauth->generateSignature($httpMethod, $callbackUrl, $parameters);
-        $parameters[ 'oauth_version' ] = $this->version;
+        $parameters['oauth_signature'] = $oauth->generateSignature($httpMethod, $callbackUrl, $parameters);
+        $parameters['oauth_version'] = $this->version;
 
         $parts = [];
         foreach ($parameters as $key => $value) {

src/Authentication/Oauth/Client/Credential.php

Spacing +4 added lines, -4 removed lines

@@ -31,10 +31,10 @@
      */
     public function getSecretCode(Oauth\Client\Account $client, array $options = [])
     {
-        $scope = $this->config[ 'scope' ];
-        if (isset($options[ 'scope' ])) {
-            if (is_array($options[ 'scope' ])) {
-                $scope = array_merge($scope, $options[ 'scope' ]);
+        $scope = $this->config['scope'];
+        if (isset($options['scope'])) {
+            if (is_array($options['scope'])) {
+                $scope = array_merge($scope, $options['scope']);
             }
         }
 

src/Authentication/Oauth/User/Authorization.php

Spacing +14 added lines, -14 removed lines

@@ -107,19 +107,19 @@ 
             $privateKey = $client->offsetGet('private_key');
         }
 
-        $scope = $this->config[ 'token' ][ 'scope' ];
-        if (isset($options[ 'scope' ])) {
-            if (is_array($options[ 'scope' ])) {
-                $scope = array_merge($scope, $options[ 'scope' ]);
+        $scope = $this->config['token']['scope'];
+        if (isset($options['scope'])) {
+            if (is_array($options['scope'])) {
+                $scope = array_merge($scope, $options['scope']);
             }
         }
 
-        if (isset($options[ 'lifetime' ])) {
-            $this->config[ 'token' ][ 'lifetime' ] = $options[ 'lifetime' ];
+        if (isset($options['lifetime'])) {
+            $this->config['token']['lifetime'] = $options['lifetime'];
         }
 
-        if (isset($options[ 'refresh_lifetime' ])) {
-            $this->config[ 'token' ][ 'refresh_lifetime' ] = $options[ 'refresh_lifetime' ];
+        if (isset($options['refresh_lifetime'])) {
+            $this->config['token']['refresh_lifetime'] = $options['refresh_lifetime'];
         }
 
         $payload = $this->createPayload($client, $scope);
@@ -129,9 +129,9 @@ 
 
         return [
             "access_token" => $accessToken,
-            "expires_in"   => $this->config[ 'token' ][ 'lifetime' ],
-            "token_type"   => $this->config[ 'token' ][ 'type' ],
-            "scope"        => $payload[ 'scope' ],
+            "expires_in"   => $this->config['token']['lifetime'],
+            "token_type"   => $this->config['token']['type'],
+            "scope"        => $payload['scope'],
         ];
     }
 
@@ -149,7 +149,7 @@ 
     protected function createPayload(Oauth\Client\Account $client, array $scope = [])
     {
         // token to encrypt
-        $expires = time() + $this->config[ 'token' ][ 'lifetime' ];
+        $expires = time() + $this->config['token']['lifetime'];
 
         $id = Token::generate(40, Token::ALPHAHASH_STRING);
         $payload = [
@@ -157,7 +157,7 @@ 
             // the internal id of the token
             'jti'        => $id,
             // a unique token identifier for the token (JWT ID)
-            'iss'        => $this->config[ 'issuer' ],
+            'iss'        => $this->config['issuer'],
             // the id of the server who issued the token (Issuer)
             'aud'        => $client->id,
             // the id of the client who requested the token (Audience)
@@ -165,7 +165,7 @@ 
             // the id of the user for which the token was released (Subject)
             'exp'        => $expires,
             'iat'        => time(),
-            'token_type' => $this->config[ 'token' ][ 'type' ],
+            'token_type' => $this->config['token']['type'],
             'scope'      => empty($scope) ? null : implode(' ', $scope),
         ];
 

src/Authentication/Oauth/Provider.php

Spacing +37 added lines, -37 removed lines

@@ -91,51 +91,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();
                     }
@@ -149,8 +149,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];
             }
         }
 
@@ -195,16 +195,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(),
                 ]);
             }
@@ -212,17 +212,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;
         }
@@ -279,15 +279,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,