Tiqr / tiqr-server-libphp

library/tiqr/OATH/OCRAParser.php

Indentation +288 added lines, -288 removed lines

@@ -2,295 +2,295 @@
 
 class OATH_OCRAParser {
 
-	private $key = NULL;
-
-	private $OCRASuite = NULL;
-
-	private $OCRAVersion = NULL;
-
-	private $CryptoFunctionType = NULL;
-	private $CryptoFunctionHash = NULL;
-	private $CryptoFunctionHashLength = NULL;
-	private $CryptoFunctionTruncation = NULL;
-
-	private $C = FALSE;
-	private $Q = FALSE;
-	private $QType = 'N';
-	private $QLength = 8;
-
-	private $P = FALSE;
-	private $PType = 'SHA1';
-	private $PLength = 20;
-
-	private $S = FALSE;
-	private $SLength = 64;
-
-	private $T = FALSE;
-	private $TLength = 60; // 1M
-	private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
-
-	private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
-
-
-	public function __construct($ocraSuite) {
-		$this->parseOCRASuite($ocraSuite);
-	}
-
-	/**
-	 * Inspired by https://github.com/bdauvergne/python-oath
-	 */
-	private function parseOCRASuite($ocraSuite) {
-		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
-		}
-
-		$ocraSuite = strtoupper($ocraSuite);
-		$this->OCRASuite = $ocraSuite;
-
-		$s = explode(':', $ocraSuite);
-		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
-		}
-
-		$algo = explode('-', $s[0]);
-		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
-		}
-
-		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
-		}
-
-		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
-		}
-		$this->OCRAVersion = $algo[1];
-
-		$cf = explode('-', $s[1]);
-		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
-		}
-
-		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
-		}
-		$this->CryptoFunctionType = $cf[0];
-
-		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
-		}
-		$this->CryptoFunctionHash = $cf[1];
-		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
-
-		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
-		}
-		$this->CryptoFunctionTruncation = intval($cf[2]);
-
-		$di = explode('-', $s[2]);
-		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
-		}
-
-		$data_input = array();
-		foreach($di as $elem) {
-			$letter = $elem[0];
-			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
-			}
-			$data_input[$letter] = 1;
-
-			if ($letter === 'C' && strlen($elem) == 1) {
-				$this->C = TRUE;
-			} elseif ($letter === 'Q') {
-				if (strlen($elem) == 1) {
-					$this->Q = TRUE;
-				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
-					$q_len = intval($match[2]);
-					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
-					}
-					$this->Q = TRUE;
-					$this->QType = $match[1];
-					$this->QLength = $q_len;
-				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
-				}
-			} elseif ($letter === 'P') {
-				if (strlen($elem) == 1) {
-					$this->P = TRUE;
-				} else {
-					$p_algo = substr($elem, 1);
-					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
-					}
-					$this->P = TRUE;
-					$this->PType = $p_algo;
-					$this->PLength = $this->supportedHashFunctions[$p_algo];
-				}
-			} elseif ($letter === 'S') {
-				if (strlen($elem) == 1) {
-					$this->S = TRUE;
-				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
-					$s_len = intval($match[1]);
-					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
-					}
-
-					$this->S = TRUE;
-					$this->SLength = $s_len;
-				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
-				}
-			} elseif ($letter === 'T') {
-				if (strlen($elem) == 1) {
-					$this->T = TRUE;
-				} elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
-					preg_match_all('/(\d+)([HMS])/', $elem, $match);
-
-					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-					}
-
-					$length = 0;
-					for ($i = 0; $i < count($match[1]); $i++) {
-						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
-					}
-					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-					}
-
-					$this->T = TRUE;
-					$this->TLength = $length;
-				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-				}
-			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
-			}
-		}
-
-		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
-		}
-	}
-
-	public function generateChallenge() {
-		$q_length = $this->QLength;
-		$q_type = $this->QType;
-
-		$bytes = self::generateRandomBytes($q_length);
-
-		switch($q_type) {
-			case 'A':
-				$challenge = base64_encode($bytes);
-				$tr = implode("", unpack('H*', $bytes));
-				$challenge = rtrim(strtr($challenge, '+/', $tr), '=');
-				break;
-			case 'H':
-				$challenge = implode("", unpack('H*', $bytes));
-				break;
-			case 'N':
-				$challenge = implode("", unpack('N*', $bytes));
-				break;
-			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
-				break;
-		}
-
-		$challenge = substr($challenge, 0, $q_length);
-
-		return $challenge;
-	}
-
-
-	public function generateSessionInformation() {
-		if (!$this->S) {
-			throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
-		}
-
-		$s_length = $this->SLength;
-		$bytes = self::generateRandomBytes($s_length);
-
-		// The OCRA spec doesn't specify that the session data should be hexadecimal.
-		// However the reference implementation in the RFC does treat it as hex.
-		$session = bin2hex($bytes);
+    private $key = NULL;
+
+    private $OCRASuite = NULL;
+
+    private $OCRAVersion = NULL;
+
+    private $CryptoFunctionType = NULL;
+    private $CryptoFunctionHash = NULL;
+    private $CryptoFunctionHashLength = NULL;
+    private $CryptoFunctionTruncation = NULL;
+
+    private $C = FALSE;
+    private $Q = FALSE;
+    private $QType = 'N';
+    private $QLength = 8;
+
+    private $P = FALSE;
+    private $PType = 'SHA1';
+    private $PLength = 20;
+
+    private $S = FALSE;
+    private $SLength = 64;
+
+    private $T = FALSE;
+    private $TLength = 60; // 1M
+    private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
+
+    private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
+
+
+    public function __construct($ocraSuite) {
+        $this->parseOCRASuite($ocraSuite);
+    }
+
+    /**
+     * Inspired by https://github.com/bdauvergne/python-oath
+     */
+    private function parseOCRASuite($ocraSuite) {
+        if (!is_string($ocraSuite)) {
+            throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+        }
+
+        $ocraSuite = strtoupper($ocraSuite);
+        $this->OCRASuite = $ocraSuite;
+
+        $s = explode(':', $ocraSuite);
+        if (count($s) != 3) {
+            throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+        }
+
+        $algo = explode('-', $s[0]);
+        if (count($algo) != 2) {
+            throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+        }
+
+        if ($algo[0] !== 'OCRA') {
+            throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+        }
+
+        if ($algo[1] !== '1') {
+            throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+        }
+        $this->OCRAVersion = $algo[1];
+
+        $cf = explode('-', $s[1]);
+        if (count($cf) != 3) {
+            throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+        }
+
+        if ($cf[0] !== 'HOTP') {
+            throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+        }
+        $this->CryptoFunctionType = $cf[0];
+
+        if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
+            throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+        }
+        $this->CryptoFunctionHash = $cf[1];
+        $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
+
+        if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
+            throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+        }
+        $this->CryptoFunctionTruncation = intval($cf[2]);
+
+        $di = explode('-', $s[2]);
+        if (count($cf) == 0) {
+            throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+        }
+
+        $data_input = array();
+        foreach($di as $elem) {
+            $letter = $elem[0];
+            if (array_key_exists($letter, $data_input)) {
+                throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+            }
+            $data_input[$letter] = 1;
+
+            if ($letter === 'C' && strlen($elem) == 1) {
+                $this->C = TRUE;
+            } elseif ($letter === 'Q') {
+                if (strlen($elem) == 1) {
+                    $this->Q = TRUE;
+                } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
+                    $q_len = intval($match[2]);
+                    if ($q_len < 4 || $q_len > 64) {
+                        throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+                    }
+                    $this->Q = TRUE;
+                    $this->QType = $match[1];
+                    $this->QLength = $q_len;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+                }
+            } elseif ($letter === 'P') {
+                if (strlen($elem) == 1) {
+                    $this->P = TRUE;
+                } else {
+                    $p_algo = substr($elem, 1);
+                    if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
+                        throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+                    }
+                    $this->P = TRUE;
+                    $this->PType = $p_algo;
+                    $this->PLength = $this->supportedHashFunctions[$p_algo];
+                }
+            } elseif ($letter === 'S') {
+                if (strlen($elem) == 1) {
+                    $this->S = TRUE;
+                } elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
+                    $s_len = intval($match[1]);
+                    if ($s_len <= 0 || $s_len > 512) {
+                        throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+                    }
+
+                    $this->S = TRUE;
+                    $this->SLength = $s_len;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+                }
+            } elseif ($letter === 'T') {
+                if (strlen($elem) == 1) {
+                    $this->T = TRUE;
+                } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
+                    preg_match_all('/(\d+)([HMS])/', $elem, $match);
+
+                    if (count($match[1]) !== count(array_unique($match[2]))) {
+                        throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                    }
+
+                    $length = 0;
+                    for ($i = 0; $i < count($match[1]); $i++) {
+                        $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
+                    }
+                    if ($length <= 0) {
+                        throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                    }
+
+                    $this->T = TRUE;
+                    $this->TLength = $length;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                }
+            } else {
+                throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+            }
+        }
+
+        if (!$this->Q) {
+            throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+        }
+    }
+
+    public function generateChallenge() {
+        $q_length = $this->QLength;
+        $q_type = $this->QType;
+
+        $bytes = self::generateRandomBytes($q_length);
+
+        switch($q_type) {
+            case 'A':
+                $challenge = base64_encode($bytes);
+                $tr = implode("", unpack('H*', $bytes));
+                $challenge = rtrim(strtr($challenge, '+/', $tr), '=');
+                break;
+            case 'H':
+                $challenge = implode("", unpack('H*', $bytes));
+                break;
+            case 'N':
+                $challenge = implode("", unpack('N*', $bytes));
+                break;
+            default:
+                throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+                break;
+        }
+
+        $challenge = substr($challenge, 0, $q_length);
+
+        return $challenge;
+    }
+
+
+    public function generateSessionInformation() {
+        if (!$this->S) {
+            throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
+        }
+
+        $s_length = $this->SLength;
+        $bytes = self::generateRandomBytes($s_length);
+
+        // The OCRA spec doesn't specify that the session data should be hexadecimal.
+        // However the reference implementation in the RFC does treat it as hex.
+        $session = bin2hex($bytes);
 		
-		$session = substr($session, 0, $s_length);
+        $session = substr($session, 0, $s_length);
 		
-		return $session;
-	}
-
-	/**
-	 * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
-	 */
-	public static function generateRandomBytesMTrand($length) {
-
-		/* Use mt_rand to generate $length random bytes. */
-		$data = '';
-		for($i = 0; $i < $length; $i++) {
-			$data .= chr(mt_rand(0, 255));
-		}
-
-		return $data;
-	}
-
-
-	/**
-	 * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
-	 */
-	public static function generateRandomBytes($length, $fallback = TRUE) {
-		static $fp = NULL;
-
-		if (function_exists('openssl_random_pseudo_bytes')) {
-			return openssl_random_pseudo_bytes($length);
-		}
-
-		if($fp === NULL) {
-			if (@file_exists('/dev/urandom')) {
-				$fp = @fopen('/dev/urandom', 'rb');
-			} else {
-				$fp = FALSE;
-			}
-		}
-
-		if($fp !== FALSE) {
-			/* Read random bytes from /dev/urandom. */
-			$data = fread($fp, $length);
-			if($data === FALSE) {
-				throw new Exception('Error reading random data.');
-			}
-			if(strlen($data) != $length) {
-				if ($fallback) {
-					$data = self::generateRandomBytesMTrand($length);
-				} else {
-					throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
-				}
-			}
-		} else {
-			/* Use mt_rand to generate $length random bytes. */
-			$data = self::generateRandomBytesMTrand($length);
-		}
-
-		return $data;
-	}
-
-
-	/**
-	 * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
-	 */
-	public static function constEqual($s1, $s2) {
-		if (strlen($s1) != strlen($s2)) {
-			return FALSE;
-		}
-
-		$result = TRUE;
-		$length = strlen($s1);
-		for ($i = 0; $i < $length; $i++) {
-			$result &= ($s1[$i] == $s2[$i]);
-		}
-
-		return (boolean)$result;
-	}
+        return $session;
+    }
+
+    /**
+     * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
+     */
+    public static function generateRandomBytesMTrand($length) {
+
+        /* Use mt_rand to generate $length random bytes. */
+        $data = '';
+        for($i = 0; $i < $length; $i++) {
+            $data .= chr(mt_rand(0, 255));
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
+     */
+    public static function generateRandomBytes($length, $fallback = TRUE) {
+        static $fp = NULL;
+
+        if (function_exists('openssl_random_pseudo_bytes')) {
+            return openssl_random_pseudo_bytes($length);
+        }
+
+        if($fp === NULL) {
+            if (@file_exists('/dev/urandom')) {
+                $fp = @fopen('/dev/urandom', 'rb');
+            } else {
+                $fp = FALSE;
+            }
+        }
+
+        if($fp !== FALSE) {
+            /* Read random bytes from /dev/urandom. */
+            $data = fread($fp, $length);
+            if($data === FALSE) {
+                throw new Exception('Error reading random data.');
+            }
+            if(strlen($data) != $length) {
+                if ($fallback) {
+                    $data = self::generateRandomBytesMTrand($length);
+                } else {
+                    throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
+                }
+            }
+        } else {
+            /* Use mt_rand to generate $length random bytes. */
+            $data = self::generateRandomBytesMTrand($length);
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
+     */
+    public static function constEqual($s1, $s2) {
+        if (strlen($s1) != strlen($s2)) {
+            return FALSE;
+        }
+
+        $result = TRUE;
+        $length = strlen($s1);
+        for ($i = 0; $i < $length; $i++) {
+            $result &= ($s1[$i] == $s2[$i]);
+        }
+
+        return (boolean)$result;
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	private function parseOCRASuite($ocraSuite) {
 		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('OCRASuite not in string format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$ocraSuite = strtoupper($ocraSuite);
@@ -49,54 +49,54 @@ 
 
 		$s = explode(':', $ocraSuite);
 		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('Invalid OCRASuite format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$algo = explode('-', $s[0]);
 		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+			throw new Exception('Invalid OCRA version: '.var_export($s[0], TRUE));
 		}
 
 		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+			throw new Exception('Unsupported OCRA algorithm: '.var_export($algo[0], TRUE));
 		}
 
 		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+			throw new Exception('Unsupported OCRA version: '.var_export($algo[1], TRUE));
 		}
 		$this->OCRAVersion = $algo[1];
 
 		$cf = explode('-', $s[1]);
 		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function: '.var_export($s[1], TRUE));
 		}
 
 		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+			throw new Exception('Unsupported OCRA suite crypto function: '.var_export($cf[0], TRUE));
 		}
 		$this->CryptoFunctionType = $cf[0];
 
 		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+			throw new Exception('Unsupported hash function in OCRA suite crypto function: '.var_export($cf[1], TRUE));
 		}
 		$this->CryptoFunctionHash = $cf[1];
 		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
 
 		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function truncation length: '.var_export($cf[2], TRUE));
 		}
 		$this->CryptoFunctionTruncation = intval($cf[2]);
 
 		$di = explode('-', $s[2]);
 		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+			throw new Exception('Invalid OCRA suite data input: '.var_export($s[2], TRUE));
 		}
 
 		$data_input = array();
-		foreach($di as $elem) {
+		foreach ($di as $elem) {
 			$letter = $elem[0];
 			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+				throw new Exception('Duplicate field in OCRA suite data input: '.var_export($elem, TRUE));
 			}
 			$data_input[$letter] = 1;
 
@@ -108,13 +108,13 @@ 
 				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
 					$q_len = intval($match[2]);
 					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input question length: '.var_export($q_len, TRUE));
 					}
 					$this->Q = TRUE;
 					$this->QType = $match[1];
 					$this->QLength = $q_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input question: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'P') {
 				if (strlen($elem) == 1) {
@@ -122,7 +122,7 @@ 
 				} else {
 					$p_algo = substr($elem, 1);
 					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+						throw new Exception('Unsupported OCRA suite PIN hash function: '.var_export($elem, TRUE));
 					}
 					$this->P = TRUE;
 					$this->PType = $p_algo;
@@ -134,13 +134,13 @@ 
 				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
 					$s_len = intval($match[1]);
 					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input session information length: '.var_export($s_len, TRUE));
 					}
 
 					$this->S = TRUE;
 					$this->SLength = $s_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input session information length: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'T') {
 				if (strlen($elem) == 1) {
@@ -149,7 +149,7 @@ 
 					preg_match_all('/(\d+)([HMS])/', $elem, $match);
 
 					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$length = 0;
@@ -157,21 +157,21 @@ 
 						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
 					}
 					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$this->T = TRUE;
 					$this->TLength = $length;
 				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 				}
 			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+				throw new Exception('Unsupported OCRA suite data input field: '.var_export($elem, TRUE));
 			}
 		}
 
 		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+			throw new Exception('OCRA suite data input question not defined: '.var_export($s[2], TRUE));
 		}
 	}
 
@@ -181,7 +181,7 @@ 
 
 		$bytes = self::generateRandomBytes($q_length);
 
-		switch($q_type) {
+		switch ($q_type) {
 			case 'A':
 				$challenge = base64_encode($bytes);
 				$tr = implode("", unpack('H*', $bytes));
@@ -194,7 +194,7 @@ 
 				$challenge = implode("", unpack('N*', $bytes));
 				break;
 			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+				throw new Exception('Unsupported OCRASuite challenge type: '.var_export($q_type, TRUE));
 				break;
 		}
 
@@ -206,7 +206,7 @@ 
 
 	public function generateSessionInformation() {
 		if (!$this->S) {
-			throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
+			throw new Exception('Session information not defined in OCRASuite: '.var_export($this->OCRASuite, TRUE));
 		}
 
 		$s_length = $this->SLength;
@@ -228,7 +228,7 @@ 
 
 		/* Use mt_rand to generate $length random bytes. */
 		$data = '';
-		for($i = 0; $i < $length; $i++) {
+		for ($i = 0; $i < $length; $i++) {
 			$data .= chr(mt_rand(0, 255));
 		}
 
@@ -246,7 +246,7 @@ 
 			return openssl_random_pseudo_bytes($length);
 		}
 
-		if($fp === NULL) {
+		if ($fp === NULL) {
 			if (@file_exists('/dev/urandom')) {
 				$fp = @fopen('/dev/urandom', 'rb');
 			} else {
@@ -254,17 +254,17 @@ 
 			}
 		}
 
-		if($fp !== FALSE) {
+		if ($fp !== FALSE) {
 			/* Read random bytes from /dev/urandom. */
 			$data = fread($fp, $length);
-			if($data === FALSE) {
+			if ($data === FALSE) {
 				throw new Exception('Error reading random data.');
 			}
-			if(strlen($data) != $length) {
+			if (strlen($data) != $length) {
 				if ($fallback) {
 					$data = self::generateRandomBytesMTrand($length);
 				} else {
-					throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
+					throw new Exception('Did not get requested number of bytes from random source. Requested ('.$length.') got ('.strlen($data).')');
 				}
 			}
 		} else {
@@ -290,7 +290,7 @@ 
 			$result &= ($s1[$i] == $s2[$i]);
 		}
 
-		return (boolean)$result;
+		return (boolean) $result;
 	}
 
 }

library/tiqr/Tiqr/UserStorage/Encryption/Dummy.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     }
     
     /**
-      * Decrypts the given data.
+     * Decrypts the given data.
      *
      * @param String $data Data to decrypt.
      *

library/tiqr/Tiqr/Message/Exception/SendFailure.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * @param boolean   $temporary  temporary failure?
      * @param Exception $parent     parent exception
      */
-    public function __construct($message, $temporary=false, Exception $parent=null)
+    public function __construct($message, $temporary = false, Exception $parent = null)
     {
         parent::__construct($message, $parent);
         $this->_temporary = $temporary;

library/tiqr/Tiqr/Message/FCM.php

Indentation +3 added lines, -3 removed lines

@@ -97,9 +97,9 @@
 
         // Wait and retry once in case of a 502 Bad Gateway error
         if ($statusCode === 502 && !($retry)) {
-          sleep(2);
-          $this->_sendFirebase($deviceToken, $alert, $challenge, $apiKey, true);
-          return;
+            sleep(2);
+            $this->_sendFirebase($deviceToken, $alert, $challenge, $apiKey, true);
+            return;
         }
 
         if ($statusCode !== 200) {

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      *
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function _sendFirebase($deviceToken, $alert, $challenge, $apiKey, $retry=false)
+    private function _sendFirebase($deviceToken, $alert, $challenge, $apiKey, $retry = false)
     {
         $msg = array(
             'challenge' => $challenge,
@@ -71,7 +71,7 @@ 
         );
 
         $headers = array(
-            'Authorization: key=' . $apiKey,
+            'Authorization: key='.$apiKey,
             'Content-Type: application/json',
         );
 
@@ -84,7 +84,7 @@ 
         $result = curl_exec($ch);
         $errors = curl_error($ch);
         $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $remoteip = curl_getinfo($ch,CURLINFO_PRIMARY_IP);
+        $remoteip = curl_getinfo($ch, CURLINFO_PRIMARY_IP);
         curl_close($ch);
 
         if ($result === false) {
@@ -92,7 +92,7 @@ 
         }
 
         if (!empty($errors)) {
-            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ". $errors, true);
+            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ".$errors, true);
         }
 
         // Wait and retry once in case of a 502 Bad Gateway error
@@ -110,7 +110,7 @@ 
         $response = json_decode($result, true);
         foreach ($response['results'] as $k => $v) {
             if (isset($v['error'])) {
-                throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: " . $v['error'], true);
+                throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: ".$v['error'], true);
             }
         }
     }

library/tiqr/Tiqr/AutoLoader.php

Indentation +96 added lines, -96 removed lines

@@ -1,100 +1,100 @@
 <?php
 class Tiqr_AutoLoader {
 
-	protected static $instance;
-
-	protected $tiqrPath;
-	protected $qrcodePath;
-	protected $zendPath;
-
-	protected function __construct($options) {
-		if ($options !== NULL) {
-			$this->setOptions($options);
-		}
-		spl_autoload_register(array(__CLASS__, 'autoload'));
-	}
-
-	public static function getInstance($options = NULL) {
-		if (null === self::$instance) {
-			self::$instance = new self($options);
-		}
-
-		return self::$instance;
-	}
-
-	public static function autoload($className) {
-		if($className === NULL) {
-			return;
-		}
-
-		$self = self::getInstance();
-
-		$substr5 = substr($className, 0, 5);
-
-		if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
-			$file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-		} elseif ($className === 'QRcode') {
-			$file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
-		} elseif ($substr5 === 'Zend_') {
-			$file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-		} else {
-			return;
-		}
-
-		if (file_exists($file)) {
-			require_once($file);
-		}
-	}
-
-	public function setOptions($options) {
-		if (isset($options["tiqr.path"])) {
-			$tiqr_dir = $options["tiqr.path"];
-			$tiqr_path = realpath($tiqr_dir);
-		} else {
-			$tiqr_dir = dirname(__FILE__);
-			$tiqr_path = $tiqr_dir;
-		}
-		if (is_dir($tiqr_path)) {
-			$this->tiqrPath = $tiqr_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
-		}
-
-		if (isset($options["phpqrcode.path"])) {
-			$qrcode_dir = $options["phpqrcode.path"];
-			$qrcode_path = realpath($qrcode_dir);
-		} else {
-			$qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
-			$qrcode_path = $qrcode_dir;
-		}
-
-		if (is_dir($qrcode_path)) {
-			$this->qrcodePath = $qrcode_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
-		}
-
-		if (isset($options["zend.path"])) {
-			$zend_dir = $options["zend.path"];
-			$zend_path = realpath($zend_dir);
-		} else {
-			$zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
-			$zend_path = $zend_dir;
-		}
-		if (is_dir($zend_path)) {
-			$this->zendPath = $zend_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
-		}
-	}
-
-
-	public function setIncludePath() {
-		set_include_path(implode(PATH_SEPARATOR, array(
-			$this->tiqrPath,
-			$this->zendPath,
-			$this->qrcodePath,
-			get_include_path(),
-		)));
-	}
+    protected static $instance;
+
+    protected $tiqrPath;
+    protected $qrcodePath;
+    protected $zendPath;
+
+    protected function __construct($options) {
+        if ($options !== NULL) {
+            $this->setOptions($options);
+        }
+        spl_autoload_register(array(__CLASS__, 'autoload'));
+    }
+
+    public static function getInstance($options = NULL) {
+        if (null === self::$instance) {
+            self::$instance = new self($options);
+        }
+
+        return self::$instance;
+    }
+
+    public static function autoload($className) {
+        if($className === NULL) {
+            return;
+        }
+
+        $self = self::getInstance();
+
+        $substr5 = substr($className, 0, 5);
+
+        if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
+            $file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        } elseif ($className === 'QRcode') {
+            $file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
+        } elseif ($substr5 === 'Zend_') {
+            $file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        } else {
+            return;
+        }
+
+        if (file_exists($file)) {
+            require_once($file);
+        }
+    }
+
+    public function setOptions($options) {
+        if (isset($options["tiqr.path"])) {
+            $tiqr_dir = $options["tiqr.path"];
+            $tiqr_path = realpath($tiqr_dir);
+        } else {
+            $tiqr_dir = dirname(__FILE__);
+            $tiqr_path = $tiqr_dir;
+        }
+        if (is_dir($tiqr_path)) {
+            $this->tiqrPath = $tiqr_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
+        }
+
+        if (isset($options["phpqrcode.path"])) {
+            $qrcode_dir = $options["phpqrcode.path"];
+            $qrcode_path = realpath($qrcode_dir);
+        } else {
+            $qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
+            $qrcode_path = $qrcode_dir;
+        }
+
+        if (is_dir($qrcode_path)) {
+            $this->qrcodePath = $qrcode_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
+        }
+
+        if (isset($options["zend.path"])) {
+            $zend_dir = $options["zend.path"];
+            $zend_path = realpath($zend_dir);
+        } else {
+            $zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
+            $zend_path = $zend_dir;
+        }
+        if (is_dir($zend_path)) {
+            $this->zendPath = $zend_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
+        }
+    }
+
+
+    public function setIncludePath() {
+        set_include_path(implode(PATH_SEPARATOR, array(
+            $this->tiqrPath,
+            $this->zendPath,
+            $this->qrcodePath,
+            get_include_path(),
+        )));
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 	}
 
 	public static function autoload($className) {
-		if($className === NULL) {
+		if ($className === NULL) {
 			return;
 		}
 
@@ -32,11 +32,11 @@ 
 		$substr5 = substr($className, 0, 5);
 
 		if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
-			$file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+			$file = $self->tiqrPath.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 		} elseif ($className === 'QRcode') {
-			$file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
+			$file = $self->qrcodePath.DIRECTORY_SEPARATOR.'qrlib.php';
 		} elseif ($substr5 === 'Zend_') {
-			$file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+			$file = $self->zendPath.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 		} else {
 			return;
 		}
@@ -57,34 +57,34 @@ 
 		if (is_dir($tiqr_path)) {
 			$this->tiqrPath = $tiqr_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($tiqr_dir, TRUE));
 		}
 
 		if (isset($options["phpqrcode.path"])) {
 			$qrcode_dir = $options["phpqrcode.path"];
 			$qrcode_path = realpath($qrcode_dir);
 		} else {
-			$qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
+			$qrcode_dir = dirname(dirname(dirname(__FILE__))).'/phpqrcode';
 			$qrcode_path = $qrcode_dir;
 		}
 
 		if (is_dir($qrcode_path)) {
 			$this->qrcodePath = $qrcode_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($qrcode_dir, TRUE));
 		}
 
 		if (isset($options["zend.path"])) {
 			$zend_dir = $options["zend.path"];
 			$zend_path = realpath($zend_dir);
 		} else {
-			$zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
+			$zend_dir = dirname(dirname(dirname(__FILE__)))."/zend";
 			$zend_path = $zend_dir;
 		}
 		if (is_dir($zend_path)) {
 			$this->zendPath = $zend_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($zend_dir, TRUE));
 		}
 	}
 

TestServer/TestServerController.php

Spacing +21 added lines, -21 removed lines

@@ -40,15 +40,15 @@ 
     private function initTiqrLibrary()
     {
         // Initialise the tiqr-server-library autoloader
-        $tiqr_dir = __DIR__ . '/../library/tiqr';
-        $vendor_dir = __DIR__ . '/../vendor';
+        $tiqr_dir = __DIR__.'/../library/tiqr';
+        $vendor_dir = __DIR__.'/../vendor';
 
-        require_once $tiqr_dir . '/Tiqr/AutoLoader.php';
+        require_once $tiqr_dir.'/Tiqr/AutoLoader.php';
 
         $autoloader = Tiqr_AutoLoader::getInstance([
             'tiqr.path' => $tiqr_dir,
-            'phpqrcode.path' => $vendor_dir . '/kairos/phpqrcode',
-            'zend.path' => $vendor_dir . '/zendframework/zendframework1/library'
+            'phpqrcode.path' => $vendor_dir.'/kairos/phpqrcode',
+            'zend.path' => $vendor_dir.'/zendframework/zendframework1/library'
         ]);
         $autoloader->setIncludePath();
     }
@@ -58,7 +58,7 @@ 
      */
     private function getStorageDir(): string
     {
-        $storage_dir = __DIR__ . '/storage';
+        $storage_dir = __DIR__.'/storage';
         if (!is_dir($storage_dir)) {
             if (false == mkdir($storage_dir)) {
                 TestServerApp::error_exit(500, "Error creating storage directory: $storage_dir");
@@ -184,17 +184,17 @@ 
         // The session ID is used for communicating enrollment status between this tiqr server and
         // the web browser displaying the enrollment interface. It is not used between the tiqr client and
         // this server. We do not use it.
-        $session_id = 'session_id_' . time();
+        $session_id = 'session_id_'.time();
         $app::log_info("Created session $session_id");
 
         // The user_id to create. Get it from the request, if it is not there use a test user ID.
-        $user_id = $app->getGET()['user_id'] ?? 'test-user-' . time();
+        $user_id = $app->getGET()['user_id'] ?? 'test-user-'.time();
 
         if ($this->userStorage->userExists($user_id)) {
             $app::log_warning("$user_id already exists");
         }
 
-        $user_display_name = $user_id . '\'s display name';
+        $user_display_name = $user_id.'\'s display name';
 
         // Create enrollemnt key. The display name we set here is returned in the metadata generated by
         // getEnrollmentMetadata.
@@ -202,10 +202,10 @@ 
         //       App differs from the user's displayname on the server.
         $enrollment_key = $this->tiqrService->startEnrollmentSession($user_id, $user_display_name, $session_id);
         $app::log_info("Started enrollment session $enrollment_key");
-        $metadataUrl = $this->host_url . "/metadata";
-        $enroll_string = $this->tiqrService->generateEnrollString($metadataUrl) . "?enrollment_key=$enrollment_key";
+        $metadataUrl = $this->host_url."/metadata";
+        $enroll_string = $this->tiqrService->generateEnrollString($metadataUrl)."?enrollment_key=$enrollment_key";
         $encoded_enroll_string = htmlentities(urlencode($enroll_string));
-        $image_url = "/qr?code=" . $encoded_enroll_string;
+        $image_url = "/qr?code=".$encoded_enroll_string;
 
         $view->StartEnrollment(htmlentities($enroll_string), $image_url);
     }
@@ -247,8 +247,8 @@ 
         // -----END NOTE-----
 
         // Add enrollment_secret to the $enrollment_url
-        $enrollment_url = $this->host_url . "/finish-enrollment?enrollment_secret=$enrollment_secret";
-        $authentication_url = $this->host_url . '/authentication';
+        $enrollment_url = $this->host_url."/finish-enrollment?enrollment_secret=$enrollment_secret";
+        $authentication_url = $this->host_url.'/authentication';
         // Get the enrollment data
         $enrollment_metadata = $this->tiqrService->getEnrollmentMetadata($enrollment_key, $authentication_url, $enrollment_url);
         if (false == $enrollment_metadata) {
@@ -365,10 +365,10 @@ 
     private function logo(App $app)
     {
         // Source: https://nl.wikipedia.org/wiki/Bestand:Philips_PM5544.svg
-        $name = __DIR__ . '/Philips_PM5544.jpg';
+        $name = __DIR__.'/Philips_PM5544.jpg';
         $fp = fopen($name, 'rb');
         header('Content-Type: image/jpeg');
-        header('Content-Length: ' . filesize($name));
+        header('Content-Length: '.filesize($name));
         fpassthru($fp);
         fclose($fp);
     }
@@ -379,7 +379,7 @@ 
         $users = array();
         foreach (scandir($storageDir) as $filename) {
             if (substr($filename, -5, 5) == '.json') {
-                $user = json_decode(file_get_contents($storageDir . '/' . $filename), true);
+                $user = json_decode(file_get_contents($storageDir.'/'.$filename), true);
                 if (($user != NULL) && ($user['secret'])) {
                     foreach ($user as $k => $v) {
                         $user[$k] = htmlentities($v);
@@ -393,7 +393,7 @@ 
 
     private function start_authenticate(App $app, TestServerView $view)
     {
-        $session_id = 'session_id_' . time();
+        $session_id = 'session_id_'.time();
         $app::log_info("Created session $session_id");
 
         // The user_id to authenticate. Get it from the request, if it is not there use an empty user ID
@@ -422,7 +422,7 @@ 
         $app::log_info('Started authentication URL');
         $app::log_info("authentication_url=$authentication_URL");
 
-        $image_url = "/qr?code=" . htmlentities(urlencode($authentication_URL));
+        $image_url = "/qr?code=".htmlentities(urlencode($authentication_URL));
 
         $response = '';
         if (strlen($user_id) > 0) {
@@ -432,7 +432,7 @@ 
             $app::log_info("secret=$secret");
             $exploded = explode('/', $authentication_URL);
             $session_key = $exploded[3]; // hex encoded session
-            $challenge = $exploded[4];   // 10 digit hex challenge
+            $challenge = $exploded[4]; // 10 digit hex challenge
             $app::log_info("challenge=$challenge");
             $ocra = new Tiqr_OCRAWrapper('OCRA-1:HOTP-SHA1-6:QH10-S');
             $response = $ocra->calculateResponse($secret, $challenge, $session_key);
@@ -518,7 +518,7 @@ 
         }
 
         // Lookup the secret of the user by ID
-        $userSecret = $this->userStorage->getSecret($userId);   // Assume this works
+        $userSecret = $this->userStorage->getSecret($userId); // Assume this works
         $app::log_info("userSercret=$userSecret");
 
         $app::log_info("Authenticating user");

Braces +1 added lines, -2 removed lines

@@ -261,8 +261,7 @@
                 foreach ($value1 as $key2 => $value2) {
                     $app::log_info("Metadata: $key1/$key2=$value2");
                 }
-            }
-            else {
+            } else {
                 $app::log_info("Metadata: $key1=$value1");
             }
         }

TestServer/TestServerApp.php

Spacing +2 added lines, -2 removed lines

@@ -76,14 +76,14 @@
         if ($uri[0] != '/') {
             self::error_exit(500, 'REQUEST_URI must start with "/"');
         }
-        self::log_info('--');   // End of the HTTP dump
+        self::log_info('--'); // End of the HTTP dump
 
         $path = parse_url($uri, PHP_URL_PATH);
 
         try {
             $this->router->Route($this, $path);
         } catch (Exception $e) {
-            self::error_exit(500, 'Exception: ' . $e->getMessage() . "\n\n" . $e->getTraceAsString());
+            self::error_exit(500, 'Exception: '.$e->getMessage()."\n\n".$e->getTraceAsString());
         }
     }
 

TestServer/TestServerView.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
     {
         $refreshurl = '/start-authenticate';
         if (strlen($user_id) > 0) {
-            $refreshurl.= "?user_id=$user_id";
+            $refreshurl .= "?user_id=$user_id";
         }
         $this->begin();
         echo <<<HTML
@@ -107,7 +107,7 @@ 
 <code>$authentication_URL</code>
 <br />
 HTML;
-        if (strlen($response)>0) {
+        if (strlen($response) > 0) {
             echo <<<HTML
 <p>The response (for offline validation) is: <code>$response</code></p>
 HTML;

TestServer/app.php

Spacing +6 added lines, -6 removed lines

@@ -14,18 +14,18 @@
 
 namespace TestServer;
 
-require_once __DIR__ . '/TestServerApp.php';
-require_once __DIR__ . '/TestServerController.php';
-require_once __DIR__ . '/TestServerView.php';
+require_once __DIR__.'/TestServerApp.php';
+require_once __DIR__.'/TestServerController.php';
+require_once __DIR__.'/TestServerView.php';
 
 // TODO: Update / set configuration. See readme
 $config_filename = 'config';
 
-$config_dir = __DIR__ . '/config/';
+$config_dir = __DIR__.'/config/';
 
 $config = array();
-if (file_exists($config_dir . $config_filename)) {
-    $config = json_decode(file_get_contents($config_dir . $config_filename), true);
+if (file_exists($config_dir.$config_filename)) {
+    $config = json_decode(file_get_contents($config_dir.$config_filename), true);
 }
 
 $host_url = $config['host_url'] ?? 'http://localhost:8000';