nilsteampassnet / TeamPass

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRServerProvider.php

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 
     function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 4, $qzone = 1, $bgcolor = 'ffffff', $color = '000000', $format = 'png') 
     {
-        if (!is_bool($verifyssl))
-            throw new QRException('VerifySSL must be bool');
+        if (!is_bool($verifyssl)) {
+                    throw new QRException('VerifySSL must be bool');
+        }
 
         $this->verifyssl = $verifyssl;
         

includes/libraries/Authentication/TwoFactorAuth/Providers/Rng/MCryptRNGProvider.php

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
     
     public function getRandomBytes($bytecount) {
         $result = mcrypt_create_iv($bytecount, $this->source);
-        if ($result === false)
-            throw new \RNGException('mcrypt_create_iv returned an invalid value');
+        if ($result === false) {
+                    throw new \RNGException('mcrypt_create_iv returned an invalid value');
+        }
         return $result;
     }
     

includes/libraries/Authentication/TwoFactorAuth/Providers/Rng/HashRNGProvider.php

Braces +3 added lines, -2 removed lines

@@ -8,8 +8,9 @@
     
     function __construct($algorithm = 'sha256' ) {
         $algos = array_values(hash_algos());
-        if (!in_array($algorithm, $algos, true))
-            throw new \RNGException('Unsupported algorithm specified');
+        if (!in_array($algorithm, $algos, true)) {
+                    throw new \RNGException('Unsupported algorithm specified');
+        }
         $this->algorithm = $algorithm;
     }
     

includes/libraries/Authentication/TwoFactorAuth/Providers/Rng/OpenSSLRNGProvider.php

Braces +6 added lines, -4 removed lines

@@ -13,10 +13,12 @@
     
     public function getRandomBytes($bytecount) {
         $result = openssl_random_pseudo_bytes($bytecount, $crypto_strong);
-        if ($this->requirestrong && ($crypto_strong === false))
-            throw new \RNGException('openssl_random_pseudo_bytes returned non-cryptographically strong value');
-        if ($result === false)
-            throw new \RNGException('openssl_random_pseudo_bytes returned an invalid value');
+        if ($this->requirestrong && ($crypto_strong === false)) {
+                    throw new \RNGException('openssl_random_pseudo_bytes returned non-cryptographically strong value');
+        }
+        if ($result === false) {
+                    throw new \RNGException('openssl_random_pseudo_bytes returned an invalid value');
+        }
         return $result;
     }
     

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/GoogleQRCodeProvider.php

Braces +3 added lines, -2 removed lines

@@ -11,8 +11,9 @@
 
     function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 1) 
     {
-        if (!is_bool($verifyssl))
-            throw new \QRException('VerifySSL must be bool');
+        if (!is_bool($verifyssl)) {
+                    throw new \QRException('VerifySSL must be bool');
+        }
 
         $this->verifyssl = $verifyssl;
         

includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php

Braces +49 added lines, -31 removed lines

@@ -26,17 +26,20 @@ 
     function __construct($issuer = null, $digits = 6, $period = 30, $algorithm = 'sha1', IQRCodeProvider $qrcodeprovider = null, IRNGProvider $rngprovider = null, ITimeProvider $timeprovider = null)
     {
         $this->issuer = $issuer;
-        if (!is_int($digits) || $digits <= 0)
-            throw new TwoFactorAuthException('Digits must be int > 0');
+        if (!is_int($digits) || $digits <= 0) {
+                    throw new TwoFactorAuthException('Digits must be int > 0');
+        }
         $this->digits = $digits;
 
-        if (!is_int($period) || $period <= 0)
-            throw new TwoFactorAuthException('Period must be int > 0');
+        if (!is_int($period) || $period <= 0) {
+                    throw new TwoFactorAuthException('Period must be int > 0');
+        }
         $this->period = $period;
 
         $algorithm = strtolower(trim($algorithm));
-        if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+        if (!in_array($algorithm, self::$_supportedalgos)) {
+                    throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+        }
         $this->algorithm = $algorithm;
         $this->qrcodeprovider = $qrcodeprovider;
         $this->rngprovider = $rngprovider;
@@ -54,11 +57,14 @@ 
         $secret = '';
         $bytes = ceil($bits / 5);   //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
         $rngprovider = $this->getRngprovider();
-        if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure())
-            throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure()) {
+                    throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        }
         $rnd = $rngprovider->getRandomBytes($bytes);
-        for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31];  //Mask out left 3 bits for 0-31 values
+        for ($i = 0; $i < $bytes; $i++) {
+                    $secret .= self::$_base32[ord($rnd[$i]) & 31];
+        }
+        //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -87,8 +93,9 @@ 
         $timetamp = $this->getTime($time);
 
         // To keep safe from timing-attachs we iterate *all* possible codes even though we already may have verified a code is correct
-        for ($i = -$discrepancy; $i <= $discrepancy; $i++)
-            $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        for ($i = -$discrepancy; $i <= $discrepancy; $i++) {
+                    $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        }
 
         return (bool)$result;
     }
@@ -104,8 +111,9 @@ 
         // we don't leak information about the difference of the two strings.
         if (strlen($safe)===strlen($user)) {
             $result = 0;
-            for ($i = 0; $i < strlen($safe); $i++)
-                $result |= (ord($safe[$i]) ^ ord($user[$i]));
+            for ($i = 0; $i < strlen($safe); $i++) {
+                            $result |= (ord($safe[$i]) ^ ord($user[$i]));
+            }
             return $result === 0;
         }
         return false;
@@ -116,8 +124,9 @@ 
      */
     public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
     {
-        if (!is_int($size) || $size <= 0)
-            throw new TwoFactorAuthException('Size must be int > 0');
+        if (!is_int($size) || $size <= 0) {
+                    throw new TwoFactorAuthException('Size must be int > 0');
+        }
 
         $qrcodeprovider = $this->getQrCodeProvider();
         return 'data:'
@@ -131,26 +140,30 @@ 
      */
     public function ensureCorrectTime(array $timeproviders = null, $leniency = 5)
     {
-        if ($timeproviders != null && !is_array($timeproviders))
-            throw new TwoFactorAuthException('No timeproviders specified');
+        if ($timeproviders != null && !is_array($timeproviders)) {
+                    throw new TwoFactorAuthException('No timeproviders specified');
+        }
 
-        if ($timeproviders == null)
-            $timeproviders = array(
+        if ($timeproviders == null) {
+                    $timeproviders = array(
                 new Providers\Time\ConvertUnixTimeDotComTimeProvider(),
                 new Providers\Time\HttpTimeProvider()
             );
+        }
 
         // Get default time provider
         $timeprovider = $this->getTimeProvider();
 
         // Iterate specified time providers
         foreach ($timeproviders as $t) {
-            if (!($t instanceof ITimeProvider))
-                throw new TwoFactorAuthException('Object does not implement ITimeProvider');
+            if (!($t instanceof ITimeProvider)) {
+                            throw new TwoFactorAuthException('Object does not implement ITimeProvider');
+            }
 
             // Get time from default time provider and compare to specific time provider and throw if time difference is more than specified number of seconds leniency
-            if (abs($timeprovider->getTime() - $t->getTime()) > $leniency)
-                throw new TwoFactorAuthException(sprintf('Time for timeprovider is off by more than %d seconds when compared to %s', $leniency, get_class($t)));
+            if (abs($timeprovider->getTime() - $t->getTime()) > $leniency) {
+                            throw new TwoFactorAuthException(sprintf('Time for timeprovider is off by more than %d seconds when compared to %s', $leniency, get_class($t)));
+            }
         }
     }
 
@@ -179,23 +192,28 @@ 
 
     private function base32Decode($value)
     {
-        if (strlen($value)==0) return '';
+        if (strlen($value)==0) {
+            return '';
+        }
 
-        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
-            throw new TwoFactorAuthException('Invalid base32 string');
+        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0) {
+                    throw new TwoFactorAuthException('Invalid base32 string');
+        }
 
         $buffer = '';
         foreach (str_split($value) as $char)
         {
-            if ($char !== '=')
-                $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            if ($char !== '=') {
+                            $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            }
         }
         $length = strlen($buffer);
         $blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
 
         $output = '';
-        foreach (explode(' ', $blocks) as $block)
-            $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        foreach (explode(' ', $blocks) as $block) {
+                    $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        }
         return $output;
     }
 

includes/libraries/Authentication/TwoFactorAuth/Providers/Time/HttpTimeProvider.php

Braces +4 added lines, -4 removed lines

@@ -42,12 +42,12 @@
             fclose($fd);
 
             foreach ($headers['wrapper_data'] as $h) {
-                if (strcasecmp(substr($h, 0, 5), 'Date:') === 0)
-                    return \DateTime::createFromFormat($this->expectedtimeformat, trim(substr($h,5)))->getTimestamp();
+                if (strcasecmp(substr($h, 0, 5), 'Date:') === 0) {
+                                    return \DateTime::createFromFormat($this->expectedtimeformat, trim(substr($h,5)))->getTimestamp();
+                }
             }
             throw new \TimeException(sprintf('Unable to retrieve time from %s (Invalid or no "Date:" header found)', $this->url));
-        }
-        catch (Exception $ex) {
+        } catch (Exception $ex) {
             throw new \TimeException(sprintf('Unable to retrieve time from %s (%s)', $this->url, $ex->getMessage()));
         }
     }

includes/libraries/Authentication/TwoFactorAuth/Providers/Time/ConvertUnixTimeDotComTimeProvider.php

Braces +3 added lines, -2 removed lines

@@ -9,8 +9,9 @@
         $json = @json_decode(
             @file_get_contents('http://www.convert-unix-time.com/api?timestamp=now')
         );
-        if ($json === null || !is_int($json->timestamp))
-            throw new \TimeException('Unable to retrieve time from convert-unix-time.com');
+        if ($json === null || !is_int($json->timestamp)) {
+                    throw new \TimeException('Unable to retrieve time from convert-unix-time.com');
+        }
         return $json->timestamp;
     }
 }
\ No newline at end of file