ci-bonfire / Sprint

myth/Api/Auth/APIAuthentication.php

Spacing +22 added lines, -22 removed lines

@@ -46,7 +46,7 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function __construct($ci=null)
+	public function __construct($ci = null)
 	{
 		parent::__construct($ci);
 
@@ -112,7 +112,7 @@ 
 		// so request authorization by the client.
 		if (empty($username) || empty($password))
 		{
-			$this->ci->output->set_header('WWW-Authenticate: Basic realm="'. config_item('api.realm') .'"');
+			$this->ci->output->set_header('WWW-Authenticate: Basic realm="'.config_item('api.realm').'"');
 			return false;
 		}
 
@@ -162,7 +162,7 @@ 
 		// No digest string? Then you're done. Go home.
 		if (empty($digest_string))
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -172,18 +172,18 @@ 
 		preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
 		$digest = (empty($matches[1]) || empty($matches[2])) ? array() : array_combine($matches[1], $matches[2]);
 
-		if (! array_key_exists('username', $digest))
+		if ( ! array_key_exists('username', $digest))
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
 		// Grab the user that corresponds to that "username"
 		// exact field determined in the api config file - api.auth_field setting.
-		$user = $this->user_model->as_array()->find_by( config_item('api.auth_field'), $digest['username'] );
-		if (!  $user)
+		$user = $this->user_model->as_array()->find_by(config_item('api.auth_field'), $digest['username']);
+		if ( ! $user)
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );          
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));          
             $this->ci->login_model->recordLoginAttempt($_SERVER['REMOTE_ADDR']);
 			return false;
 		}
@@ -193,16 +193,16 @@ 
 
 		if ($digest['qop'] == 'auth')
 		{
-			$A2 = md5( strtoupper( $_SERVER['REQUEST_METHOD'] ) .':'. $digest['uri'] );
+			$A2 = md5(strtoupper($_SERVER['REQUEST_METHOD']).':'.$digest['uri']);
 		} else {
 			$body = file_get_contents('php://input');
-			$A2 = md5( strtoupper( $_SERVER['REQUEST_METHOD'] ) .':'. $digest['uri'] .':'. md5($body) );
+			$A2 = md5(strtoupper($_SERVER['REQUEST_METHOD']).':'.$digest['uri'].':'.md5($body));
 		}
-		$valid_response = md5($A1 .':'. $digest['nonce'].':'. $digest['nc'] .':'. $digest['cnonce'] .':'. $digest['qop'] .':'. $A2);
+		$valid_response = md5($A1.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$A2);
 
 		if ($digest['response'] != $valid_response)
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			$this->ci->login_model->recordLoginAttempt($_SERVER['REMOTE_ADDR'], $user['id']);
 			return false;
 		}
@@ -247,13 +247,13 @@ 
 
 		// If throttling time is above zero, we can't allow
 		// logins now.
-		if ($time = (int)$this->isThrottled($user) > 0)
+		if ($time = (int) $this->isThrottled($user) > 0)
 		{
 			$this->error = sprintf(lang('api.throttled'), $time);
 			return false;
 		}
 
-		if (! $user)
+		if ( ! $user)
 		{
 			$this->user = null;
 			return $user;
@@ -281,13 +281,13 @@ 
 	{
 	    $blacklist = explode(',', config_item('api.ip_blacklist'));
 
-		array_walk($blacklist, function (&$item, $key) {
+		array_walk($blacklist, function(&$item, $key) {
 			$item = trim($item);
 		});
 
 		if (in_array($this->ci->input->ip_address(), $blacklist))
 		{
-			throw new \Exception( lang('api.ip_denied'), 401);
+			throw new \Exception(lang('api.ip_denied'), 401);
 		}
 
 		return true;
@@ -306,13 +306,13 @@ 
 
 		array_push($whitelist, '127.0.0.1', '0.0.0.0');
 
-		array_walk($whitelist, function (&$item, $key) {
+		array_walk($whitelist, function(&$item, $key) {
 			$item = trim($item);
 		});
 
-		if (! in_array($this->ci->input->ip_address(), $whitelist))
+		if ( ! in_array($this->ci->input->ip_address(), $whitelist))
 		{
-			throw new \Exception( lang('api.ip_denied'), 401);
+			throw new \Exception(lang('api.ip_denied'), 401);
 		}
 
 		return true;
@@ -369,9 +369,9 @@ 
 	 *
 	 * @return bool|mixed|void
 	 */
-	public function login($credentials, $remember=false)
+	public function login($credentials, $remember = false)
 	{
-		throw new \BadMethodCallException( lang('api.unused_method') );
+		throw new \BadMethodCallException(lang('api.unused_method'));
 	}
 
 	//--------------------------------------------------------------------
@@ -386,7 +386,7 @@ 
 	 */
 	public function logout()
 	{
-		throw new \BadMethodCallException( lang('api.unused_method') );
+		throw new \BadMethodCallException(lang('api.unused_method'));
 	}
 
 	//--------------------------------------------------------------------

myth/Auth/LocalAuthentication.php

Spacing +59 added lines, -59 removed lines

@@ -62,21 +62,21 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if ($ci)
         {
-            $this->ci= $ci;
+            $this->ci = $ci;
         }
         else
         {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
 
         // Get our compatibility password file loaded up.
-        if (! function_exists('password_hash'))
+        if ( ! function_exists('password_hash'))
         {
-            require_once dirname(__FILE__) .'password.php';
+            require_once dirname(__FILE__).'password.php';
         }
 
         if (empty($this->ci->session))
@@ -101,7 +101,7 @@ 
      * @param bool  $remember
      * @return bool|mixed
      */
-    public function login($credentials, $remember=false)
+    public function login($credentials, $remember = false)
     {
         $user = $this->validate($credentials, true);
 
@@ -112,14 +112,14 @@ 
 
         // If throttling time is above zero, we can't allow
         // logins now.
-        $time = (int)$this->isThrottled($user);
+        $time = (int) $this->isThrottled($user);
         if ($time > 0)
         {
             $this->error = sprintf(lang('auth.throttled'), $time);
             return false;
         }
 
-        if (! $user)
+        if ( ! $user)
         {
         	if (empty($this->error))
             {
@@ -154,14 +154,14 @@ 
      * @param bool $return_user
      * @return mixed
      */
-    public function validate($credentials, $return_user=false)
+    public function validate($credentials, $return_user = false)
     {
         // Get ip address
         $ip_address = $this->ci->input->server('REMOTE_ADDR');
 
         // We do not want to force case-sensitivity on things
         // like username and email for usability sake.
-        if (! empty($credentials['email']))
+        if ( ! empty($credentials['email']))
         {
             $credentials['email'] = strtolower($credentials['email']);
         }
@@ -186,7 +186,7 @@ 
         }
 
         // Ensure that the fields are allowed validation fields
-        if (! in_array(key($credentials), config_item('auth.valid_fields')) )
+        if ( ! in_array(key($credentials), config_item('auth.valid_fields')))
         {
             $this->error = lang('auth.invalid_credentials');
             $this->ci->login_model->recordLoginAttempt($ip_address);
@@ -198,7 +198,7 @@ 
                                  ->where($credentials)
                                  ->first();
 
-        if (! $user)
+        if ( ! $user)
         {
             $this->error = lang('auth.invalid_user');
             $this->ci->login_model->recordLoginAttempt($ip_address);
@@ -206,9 +206,9 @@ 
         }
 
         // Now, try matching the passwords.
-        $result =  password_verify($password, $user['password_hash']);
+        $result = password_verify($password, $user['password_hash']);
 
-        if (! $result)
+        if ( ! $result)
         {
             $this->error = lang('auth.invalid_password');
             $this->ci->login_model->recordLoginAttempt($ip_address, $user['id']);
@@ -219,7 +219,7 @@ 
         // This would be due to the hash algorithm or hash
         // cost changing since the last time that a user
         // logged in.
-        if (password_needs_rehash($user['password_hash'], PASSWORD_DEFAULT, ['cost' => config_item('auth.hash_cost')] ))
+        if (password_needs_rehash($user['password_hash'], PASSWORD_DEFAULT, ['cost' => config_item('auth.hash_cost')]))
         {
             $new_hash = Password::hashPassword($password);
             $this->user_model->skip_validation()
@@ -228,7 +228,7 @@ 
         }
 
         // Is the user active?
-        if (! $user['active'])
+        if ( ! $user['active'])
         {
             $this->error = lang('auth.inactive_account');
             return false;
@@ -248,7 +248,7 @@ 
     {
         $this->ci->load->helper('cookie');
 
-        if (! Events::trigger('beforeLogout', [$this->user]))
+        if ( ! Events::trigger('beforeLogout', [$this->user]))
         {
             return false;
         }
@@ -257,10 +257,10 @@ 
         // available for flash messages, etc.
         if (isset($_SESSION))
         {
-            foreach ( $_SESSION as $key => $value )
+            foreach ($_SESSION as $key => $value)
             {
-                $_SESSION[ $key ] = NULL;
-                unset( $_SESSION[ $key ] );
+                $_SESSION[$key] = NULL;
+                unset($_SESSION[$key]);
             }
         }
         // Also, regenerate the session ID for a touch of added safety.
@@ -286,7 +286,7 @@ 
     {
         $id = $this->ci->session->userdata('logged_in');
 
-        if (! $id)
+        if ( ! $id)
         {
             return false;
         }
@@ -294,10 +294,10 @@ 
         // If the user var hasn't been filled in, we need to fill it in,
         // since this method will typically be used as the only method
         // to determine whether a user is logged in or not.
-        if (! $this->user)
+        if ( ! $this->user)
         {
             $this->user = $this->user_model->as_array()
-                                           ->find_by('id', (int)$id);
+                                           ->find_by('id', (int) $id);
 
             if (empty($this->user))
             {
@@ -321,14 +321,14 @@ 
      */
     public function viaRemember()
     {
-        if (! config_item('auth.allow_remembering'))
+        if ( ! config_item('auth.allow_remembering'))
         {
             return false;
         }
 
         $this->ci->load->helper('cookie');
 
-        if (! $token = get_cookie('remember'))
+        if ( ! $token = get_cookie('remember'))
         {
             return false;
         }
@@ -337,7 +337,7 @@ 
         $query = $this->ci->db->where('hash', $this->ci->login_model->hashRememberToken($token))
                               ->get('auth_tokens');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -375,16 +375,16 @@ 
         // If via email, we need to generate a hash
         $this->ci->load->helper('string');
         $token = random_string('alnum', 24);
-        $user_data['activate_hash'] = hash('sha1', config_item('auth.salt') . $token);
+        $user_data['activate_hash'] = hash('sha1', config_item('auth.salt').$token);
 
         // Email should NOT be case sensitive.
-        if (! empty($user_data['email']))
+        if ( ! empty($user_data['email']))
         {
             $user_data['email'] = strtolower($user_data['email']);
         }
 
         // Save the user
-        if (! $id = $this->user_model->insert($user_data))
+        if ( ! $id = $this->user_model->insert($user_data))
         {
             $this->error = $this->user_model->error();
             return false;
@@ -415,25 +415,25 @@ 
     {
         $post = [
             'email'         => $data['email'],
-            'activate_hash' => hash('sha1', config_item('auth.salt') . $data['code'])
+            'activate_hash' => hash('sha1', config_item('auth.salt').$data['code'])
         ];
 
         $user = $this->user_model->where($post)
                                  ->first();
 
-        if (! $user) {
+        if ( ! $user) {
             $this->error = $this->user_model->error() ? $this->user_model->error() : lang('auth.activate_no_user');
 
             return false;
         }
 
-        if (! $this->user_model->update($user->id, ['active' => 1, 'activate_hash' => null]))
+        if ( ! $this->user_model->update($user->id, ['active' => 1, 'activate_hash' => null]))
         {
             $this->error = $this->user_model->error();
             return false;
         }
 
-        Events::trigger('didActivate', [(array)$user]);
+        Events::trigger('didActivate', [(array) $user]);
 
         return true;
     }
@@ -448,7 +448,7 @@ 
      */
     public function activateUserById($id)
     {
-        if (! $this->user_model->update($id, ['active' => 1, 'activate_hash' => null]))
+        if ( ! $this->user_model->update($id, ['active' => 1, 'activate_hash' => null]))
         {
             $this->error = $this->user_model->error();
             return false;
@@ -480,12 +480,12 @@ 
      */
     public function id()
     {
-        if (! is_array($this->user) || empty($this->user['id']))
+        if ( ! is_array($this->user) || empty($this->user['id']))
         {
             return null;
         }
 
-        return (int)$this->user['id'];
+        return (int) $this->user['id'];
     }
 
     //--------------------------------------------------------------------
@@ -502,7 +502,7 @@ 
     public function isThrottled($user)
     {
         // Not throttling? Get outta here!
-        if (! config_item('auth.allow_throttling'))
+        if ( ! config_item('auth.allow_throttling'))
         {
             return false;
         }
@@ -570,7 +570,7 @@ 
         {
             $this->error = lang('auth.bruteBan_notice');
 
-            $ban_time = 60 * 15;    // 15 minutes
+            $ban_time = 60 * 15; // 15 minutes
             $_SESSION['bruteBan'] = time() + $ban_time;
             return $ban_time;
         }
@@ -618,7 +618,7 @@ 
         // Is it a valid user?
         $user = $this->user_model->find_by('email', $email);
 
-        if (! $user)
+        if ( ! $user)
         {
             $this->error = lang('auth.invalid_email');
             return false;
@@ -627,17 +627,17 @@ 
         // Generate/store our codes
         $this->ci->load->helper('string');
         $token = random_string('alnum', 24);
-        $hash = hash('sha1', config_item('auth.salt') .$token);
+        $hash = hash('sha1', config_item('auth.salt').$token);
 
         $result = $this->user_model->update($user->id, ['reset_hash' => $hash]);
 
-        if (! $result)
+        if ( ! $result)
         {
             $this->error = $this->user_model->error();
             return false;
         }
 
-        Events::trigger('didRemindUser', [(array)$user, $token]);
+        Events::trigger('didRemindUser', [(array) $user, $token]);
 
         return true;
     }
@@ -664,10 +664,10 @@ 
         }
 
         // Generate a hash to match against the table.
-        $credentials['reset_hash'] = hash('sha1', config_item('auth.salt') .$credentials['code']);
+        $credentials['reset_hash'] = hash('sha1', config_item('auth.salt').$credentials['code']);
         unset($credentials['code']);
 
-        if (! empty($credentials['email']))
+        if ( ! empty($credentials['email']))
         {
             $credentials['email'] = strtolower($credentials['email']);
         }
@@ -675,7 +675,7 @@ 
         // Is there a matching user?
         $user = $this->user_model->find_by($credentials);
 
-        if (! $user)
+        if ( ! $user)
         {
             $this->error = lang('auth.reset_no_user');
             return false;
@@ -688,13 +688,13 @@ 
             'reset_hash'   => null
         ];
 
-        if (! $this->user_model->update($user->id, $data))
+        if ( ! $this->user_model->update($user->id, $data))
         {
             $this->error = $this->user_model->error();
             return false;
         }
 
-        Events::trigger('didResetPassword', [(array)$user]);
+        Events::trigger('didResetPassword', [(array) $user]);
 
         return true;
     }
@@ -710,7 +710,7 @@ 
      * @param null $message
      * @return mixed
      */
-    public function changeStatus($newStatus, $message=null)
+    public function changeStatus($newStatus, $message = null)
     {
         // todo actually record new users status!
     }
@@ -727,14 +727,14 @@ 
      * @param bool $allow_any_parent
      * @return mixed
      */
-    public function useModel($model, $allow_any_parent=false)
+    public function useModel($model, $allow_any_parent = false)
     {
-        if (! $allow_any_parent && get_parent_class($model) != 'Myth\Models\CIDbModel')
+        if ( ! $allow_any_parent && get_parent_class($model) != 'Myth\Models\CIDbModel')
         {
             throw new \RuntimeException('Models passed into LocalAuthenticate MUST extend Myth\Models\CIDbModel');
         }
 
-        $this->user_model =& $model;
+        $this->user_model = & $model;
 
         return $this;
     }
@@ -806,7 +806,7 @@ 
      */
     protected function rememberUser($user)
     {
-        if (! config_item('auth.allow_remembering'))
+        if ( ! config_item('auth.allow_remembering'))
         {
             log_message('debug', 'Auth library set to refuse "Remember Me" functionality.');
             return false;
@@ -825,13 +825,13 @@ 
      * @param null $token
      * @return mixed
      */
-    protected function refreshRememberCookie($user, $token=null)
+    protected function refreshRememberCookie($user, $token = null)
     {
         $this->ci->load->helper('cookie');
 
         // If a token is passed in, we know we're removing the
         // old one.
-        if (! empty($token))
+        if ( ! empty($token))
         {
             $this->invalidateRememberCookie($user['email'], $token);
         }
@@ -841,7 +841,7 @@ 
         // Save the token to the database.
         $data = [
             'email'   => $user['email'],
-            'hash'    => sha1(config_item('auth.salt') . $new_token),
+            'hash'    => sha1(config_item('auth.salt').$new_token),
             'created' => date('Y-m-d H:i:s')
         ];
 
@@ -849,13 +849,13 @@ 
 
         // Create the cookie
         set_cookie(
-            'remember',                             // Cookie Name
-            $new_token,                             // Value
-            config_item('auth.remember_length'),    // # Seconds until it expires
+            'remember', // Cookie Name
+            $new_token, // Value
+            config_item('auth.remember_length'), // # Seconds until it expires
             config_item('cookie_domain'),
             config_item('cookie_path'),
             config_item('cookie_prefix'),
-            false,                                  // Only send over HTTPS?
+            false, // Only send over HTTPS?
             true                                    // Hide from Javascript?
         );
 

myth/CIModules/auth/models/Login_model.php

Spacing +11 added lines, -11 removed lines

@@ -73,7 +73,7 @@ 
         $this->db->insert('auth_login_attempts', $data);
 
         // log attempt for ip address
-        if (! empty($ip_address))
+        if ( ! empty($ip_address))
         {
             $data = [
                 'type' => 'ip',
@@ -133,7 +133,7 @@ 
                                 ->where('datetime >=', $start_time)
                                 ->count_all_results('auth_login_attempts');
 
-        if (! $user_id)
+        if ( ! $user_id)
         {
             return $attempts_ip > 100;
         }
@@ -171,7 +171,7 @@ 
      */
     public function distributedBruteForceTime()
     {
-        if (! $time = $this->cache->get('dbrutetime'))
+        if ( ! $time = $this->cache->get('dbrutetime'))
         {
             $time = 0;
 
@@ -180,7 +180,7 @@ 
 
             $query = $this->db->query("SELECT COUNT(*) / COUNT(DISTINCT DATE(`datetime`)) as num_rows FROM `auth_login_attempts` WHERE `type` = 'app' AND `datetime` >= ?", $avg_start_time);
 
-            if (! $query->num_rows())
+            if ( ! $query->num_rows())
             {
                 $average = 0;
             }
@@ -202,7 +202,7 @@ 
             }
 
             // Cache it for 3 hours.
-            $this->cache->save('dbrutetime', $time, 60*60*3);
+            $this->cache->save('dbrutetime', $time, 60 * 60 * 3);
         }
 
         return $time;
@@ -223,7 +223,7 @@ 
     public function recordLogin($user)
     {
         $data = [
-            'user_id'    => (int)$user['id'],
+            'user_id'    => (int) $user['id'],
             'datetime'   => date('Y-m-d H:i:s'),
             'ip_address' => $this->input->ip_address()
         ];
@@ -251,7 +251,7 @@ 
     {
         $this->load->helper('string');
 
-        return str_replace('@', '.', $user['email']) .'|' . random_string('alnum', 128);
+        return str_replace('@', '.', $user['email']).'|'.random_string('alnum', 128);
     }
 
     //--------------------------------------------------------------------
@@ -264,7 +264,7 @@ 
      */
     public function hashRememberToken($token)
     {
-        return sha1(config_item('auth.salt') . $token);
+        return sha1(config_item('auth.salt').$token);
     }
 
     //--------------------------------------------------------------------
@@ -310,7 +310,7 @@ 
      */
     public function purgeOldRememberTokens()
     {
-        if (! config_item('auth.allow_remembering'))
+        if ( ! config_item('auth.allow_remembering'))
         {
             return;
         }
@@ -341,7 +341,7 @@ 
 
         $last_ip = ! $query->num_rows() ? 0 : strtotime($query->row()->datetime);
 
-        if (! $user_id)
+        if ( ! $user_id)
         {
             return $last_ip;
         }
@@ -372,7 +372,7 @@ 
                              ->where('ip_address', $ip_address)
                              ->count_all_results('auth_login_attempts');
 
-        if (! $user_id)
+        if ( ! $user_id)
         {
             return $count_ip;
         }