nilsteampassnet / TeamPass

includes/libraries/csrfp/libs/csrfp.config.sample.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
  */
 
 return array(
-   "CSRFP_TOKEN" => "",
-   "logDirectory" => "../log",
-   "failedAuthAction" => array(
-      "GET" => 0,
-      "POST" => 0),
-   "errorRedirectionPage" => "",
-   "customErrorMessage" => "",
-   "jsPath" => "../js/csrfprotector.js",
-   "jsUrl" => "",
-   "tokenLength" => 50,
-   "disabledJavascriptMessage" => "This site attempts to protect users against <a href=\"https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29\">
+    "CSRFP_TOKEN" => "",
+    "logDirectory" => "../log",
+    "failedAuthAction" => array(
+        "GET" => 0,
+        "POST" => 0),
+    "errorRedirectionPage" => "",
+    "customErrorMessage" => "",
+    "jsPath" => "../js/csrfprotector.js",
+    "jsUrl" => "",
+    "tokenLength" => 50,
+    "disabledJavascriptMessage" => "This site attempts to protect users against <a href=\"https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29\">
    Cross-Site Request Forgeries </a> attacks. In order to do so, you must have JavaScript enabled in your web browser otherwise this site will fail to work correctly for you.
     See details of your web browser for how to enable JavaScript.",
     "verifyGetFor" => array("*page=items&type=duo_check*", "*upload.attachments.php*")

includes/libraries/Authentication/DuoSecurity/Duo.php

Indentation +97 added lines, -97 removed lines

@@ -1,101 +1,101 @@
 <?php
 
 class Duo {
-	const DUO_PREFIX = "TX";
-	const APP_PREFIX = "APP";
-	const AUTH_PREFIX = "AUTH";
-
-	const DUO_EXPIRE = 300;
-	const APP_EXPIRE = 3600;
-
-	const IKEY_LEN = 20;
-	const SKEY_LEN = 40;
-	const AKEY_LEN = 40; // if this changes you have to change ERR_AKEY
-
-	const ERR_USER = 'ERR|The username passed to sign_request() is invalid.';
-	const ERR_IKEY = 'ERR|The Duo integration key passed to sign_request() is invalid.';
-	const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
-	const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
-
-	private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
-		$exp = ($time ? $time : time()) + $expire;
-		$val = $vals . '|' . $exp;
-		$b64 = base64_encode($val);
-		$cookie = $prefix . '|' . $b64;
-
-		$sig = hash_hmac("sha1", $cookie, $key);
-		return $cookie . '|' . $sig;
-	}
-
-	private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
-		$ts = ($time ? $time : time());
-
-		$parts = explode('|', $val);
-		if (count($parts) !== 3) {
-			return null;
-		}
-		list($u_prefix, $u_b64, $u_sig) = $parts;
-
-		$sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
-		if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
-			return null;
-		}
-
-		if ($u_prefix !== $prefix) {
-			return null;
-		}
-
-		$cookie_parts = explode('|', base64_decode($u_b64));
-		if (count($cookie_parts) !== 3) {
-			return null;
-		}
-		list($user, $u_ikey, $exp) = $cookie_parts;
-
-		if ($u_ikey !== $ikey) {
-			return null;
-		}
-		if ($ts >= intval($exp)) {
-			return null;
-		}
-
-		return $user;
-	}
-
-	public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
-		if (!isset($username) || strlen($username) === 0) {
-			return self::ERR_USER;
-		}
-		if (strpos($username, '|') !== FALSE) {
-			return self::ERR_USER;
-		}
-		if (!isset($ikey) || strlen($ikey) !== self::IKEY_LEN) {
-			return self::ERR_IKEY;
-		}
-		if (!isset($skey) || strlen($skey) !== self::SKEY_LEN) {
-			return self::ERR_SKEY;
-		}
-		if (!isset($akey) || strlen($akey) < self::AKEY_LEN) {
-			return self::ERR_AKEY;
-		}
-
-		$vals = $username . '|' . $ikey;
-
-		$duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
-		$app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
-
-		return $duo_sig . ':' . $app_sig;
-	}
-
-	public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
-		list($auth_sig, $app_sig) = explode(':', $sig_response);
-
-		$auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);
-		$app_user = self::parse_vals($akey, $app_sig, self::APP_PREFIX, $ikey, $time);
-
-		if ($auth_user !== $app_user) {
-			return null;
-		}
-
-		return $auth_user;
-	}
+    const DUO_PREFIX = "TX";
+    const APP_PREFIX = "APP";
+    const AUTH_PREFIX = "AUTH";
+
+    const DUO_EXPIRE = 300;
+    const APP_EXPIRE = 3600;
+
+    const IKEY_LEN = 20;
+    const SKEY_LEN = 40;
+    const AKEY_LEN = 40; // if this changes you have to change ERR_AKEY
+
+    const ERR_USER = 'ERR|The username passed to sign_request() is invalid.';
+    const ERR_IKEY = 'ERR|The Duo integration key passed to sign_request() is invalid.';
+    const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
+    const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
+
+    private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
+        $exp = ($time ? $time : time()) + $expire;
+        $val = $vals . '|' . $exp;
+        $b64 = base64_encode($val);
+        $cookie = $prefix . '|' . $b64;
+
+        $sig = hash_hmac("sha1", $cookie, $key);
+        return $cookie . '|' . $sig;
+    }
+
+    private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
+        $ts = ($time ? $time : time());
+
+        $parts = explode('|', $val);
+        if (count($parts) !== 3) {
+            return null;
+        }
+        list($u_prefix, $u_b64, $u_sig) = $parts;
+
+        $sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+        if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
+            return null;
+        }
+
+        if ($u_prefix !== $prefix) {
+            return null;
+        }
+
+        $cookie_parts = explode('|', base64_decode($u_b64));
+        if (count($cookie_parts) !== 3) {
+            return null;
+        }
+        list($user, $u_ikey, $exp) = $cookie_parts;
+
+        if ($u_ikey !== $ikey) {
+            return null;
+        }
+        if ($ts >= intval($exp)) {
+            return null;
+        }
+
+        return $user;
+    }
+
+    public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
+        if (!isset($username) || strlen($username) === 0) {
+            return self::ERR_USER;
+        }
+        if (strpos($username, '|') !== FALSE) {
+            return self::ERR_USER;
+        }
+        if (!isset($ikey) || strlen($ikey) !== self::IKEY_LEN) {
+            return self::ERR_IKEY;
+        }
+        if (!isset($skey) || strlen($skey) !== self::SKEY_LEN) {
+            return self::ERR_SKEY;
+        }
+        if (!isset($akey) || strlen($akey) < self::AKEY_LEN) {
+            return self::ERR_AKEY;
+        }
+
+        $vals = $username . '|' . $ikey;
+
+        $duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
+        $app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
+
+        return $duo_sig . ':' . $app_sig;
+    }
+
+    public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
+        list($auth_sig, $app_sig) = explode(':', $sig_response);
+
+        $auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);
+        $app_user = self::parse_vals($akey, $app_sig, self::APP_PREFIX, $ikey, $time);
+
+        if ($auth_user !== $app_user) {
+            return null;
+        }
+
+        return $auth_user;
+    }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -17,17 +17,17 @@ 
 	const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
 	const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
 
-	private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
+	private static function sign_vals($key, $vals, $prefix, $expire, $time = NULL) {
 		$exp = ($time ? $time : time()) + $expire;
-		$val = $vals . '|' . $exp;
+		$val = $vals.'|'.$exp;
 		$b64 = base64_encode($val);
-		$cookie = $prefix . '|' . $b64;
+		$cookie = $prefix.'|'.$b64;
 
 		$sig = hash_hmac("sha1", $cookie, $key);
-		return $cookie . '|' . $sig;
+		return $cookie.'|'.$sig;
 	}
 
-	private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
+	private static function parse_vals($key, $val, $prefix, $ikey, $time = NULL) {
 		$ts = ($time ? $time : time());
 
 		$parts = explode('|', $val);
@@ -36,7 +36,7 @@ 
 		}
 		list($u_prefix, $u_b64, $u_sig) = $parts;
 
-		$sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+		$sig = hash_hmac("sha1", $u_prefix.'|'.$u_b64, $key);
 		if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
 			return null;
 		}
@@ -61,7 +61,7 @@ 
 		return $user;
 	}
 
-	public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
+	public static function signRequest($ikey, $skey, $akey, $username, $time = NULL) {
 		if (!isset($username) || strlen($username) === 0) {
 			return self::ERR_USER;
 		}
@@ -78,15 +78,15 @@ 
 			return self::ERR_AKEY;
 		}
 
-		$vals = $username . '|' . $ikey;
+		$vals = $username.'|'.$ikey;
 
 		$duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
 		$app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
 
-		return $duo_sig . ':' . $app_sig;
+		return $duo_sig.':'.$app_sig;
 	}
 
-	public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
+	public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time = NULL) {
 		list($auth_sig, $app_sig) = explode(':', $sig_response);
 
 		$auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);

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

Indentation +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
 {
     function __construct($message = "", $code = 0, $exception = null)
     {
-    	parent::__construct($message, $code, $exception);
+        parent::__construct($message, $code, $exception);
     }
 }
\ No newline at end of file

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

Indentation +3 added lines, -3 removed lines

@@ -26,11 +26,11 @@
     {
         switch (strtolower($this->format))
         {
-        	case 'p':
+            case 'p':
                 return 'image/png';
-        	case 'g':
+            case 'g':
                 return 'image/gif';
-        	case 'j':
+            case 'j':
                 return 'image/jpeg';
         }
         throw new QRException(sprintf('Unknown MIME-type: %s', $this->format));

Spacing +6 added lines, -6 removed lines

@@ -44,11 +44,11 @@
     public function getUrl($qrtext, $size) 
     {
         return 'http://qrickit.com/api/qr'
-            . '?qrsize=' . $size
-            . '&e=' . strtolower($this->errorcorrectionlevel)
-            . '&bgdcolor=' . $this->bgcolor
-            . '&fgdcolor=' . $this->color
-            . '&t=' . strtolower($this->format)
-            . '&d=' . rawurlencode($qrtext);
+            . '?qrsize='.$size
+            . '&e='.strtolower($this->errorcorrectionlevel)
+            . '&bgdcolor='.$this->bgcolor
+            . '&fgdcolor='.$this->color
+            . '&t='.strtolower($this->format)
+            . '&d='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

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

Spacing +3 added lines, -3 removed lines

@@ -33,8 +33,8 @@
     public function getUrl($qrtext, $size)
     {
         return 'https://chart.googleapis.com/chart?cht=qr'
-            . '&chs=' . $size . 'x' . $size
-            . '&chld=' . $this->errorcorrectionlevel . '|' . $this->margin
-            . '&chl=' . rawurlencode($qrtext);
+            . '&chs='.$size.'x'.$size
+            . '&chld='.$this->errorcorrectionlevel.'|'.$this->margin
+            . '&chl='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

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/Providers/Rng/MCryptRNGProvider.php

Braces +3 added lines, -2 removed lines

@@ -12,8 +12,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/OpenSSLRNGProvider.php

Braces +6 added lines, -4 removed lines

@@ -12,10 +12,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/Rng/HashRNGProvider.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 {
     private $algorithm;
     
-    function __construct($algorithm = 'sha256' ) {
+    function __construct($algorithm = 'sha256') {
         $algos = array_values(hash_algos());
         if (!in_array($algorithm, $algos, true))
             throw new RNGException('Unsupported algorithm specified');

Braces +3 added lines, -2 removed lines

@@ -7,8 +7,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/CSRNGProvider.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 class CSRNGProvider implements IRNGProvider
 {
     public function getRandomBytes($bytecount) {
-        return random_bytes($bytecount);    // PHP7+
+        return random_bytes($bytecount); // PHP7+
     }
 
     public function isCryptographicallySecure() {