Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OATH/OCRA_v1.php

Indentation +8 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
             $keyBytes,
             $text)
     {
-         $hash = hash_hmac ($crypto, $text, $keyBytes);
-         return $hash;
+            $hash = hash_hmac ($crypto, $text, $keyBytes);
+            return $hash;
     }
 
     /**
@@ -83,12 +83,12 @@ 
      * {@link truncationDigits} digits
      */
     static function generateOCRA($ocraSuite,
-                                 $key,
-                                 $counter,
-                                 $question,
-                                 $password,
-                                 $sessionInformation,
-                                 $timeStamp)
+                                    $key,
+                                    $counter,
+                                    $question,
+                                    $password,
+                                    $sessionInformation,
+                                    $timeStamp)
     {
         $codeDigits = 0;
         $crypto = "";

library/tiqr/Tiqr/Message/Exception.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
      * @param string    $message    exception message
      * @param Exception $parent     parent exception
      */
-     public function __construct($message, $parent=null)
-     {
-         parent::__construct($message, 0, $parent);
-     }
+        public function __construct($message, $parent=null)
+        {
+            parent::__construct($message, 0, $parent);
+        }
 }
\ No newline at end of file

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;
+    }
 
 }

library/tiqr/Tiqr/OATH/OCRA.php

Indentation +8 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
             $keyBytes,
             $text)
     {
-         $hash = hash_hmac ($crypto, $text, $keyBytes);
-         return $hash;
+            $hash = hash_hmac ($crypto, $text, $keyBytes);
+            return $hash;
     }
 
     /**
@@ -83,12 +83,12 @@ 
      * {@link truncationDigits} digits
      */
     static function generateOCRA($ocraSuite,
-                                 $key,
-                                 $counter,
-                                 $question,
-                                 $password,
-                                 $sessionInformation,
-                                 $timeStamp)
+                                    $key,
+                                    $counter,
+                                    $question,
+                                    $password,
+                                    $sessionInformation,
+                                    $timeStamp)
     {
         $codeDigits = 0;
         $crypto = "";

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/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) {

library/tiqr/Tiqr/Service.php

Indentation +39 added lines, -39 removed lines

@@ -538,17 +538,17 @@ 
         }
 
         $metadata = array("service"=>
-                               array("displayName"       => $this->_name,
-                                     "identifier"        => $this->_identifier,
-                                     "logoUrl"           => $this->_logoUrl,
-                                     "infoUrl"           => $this->_infoUrl,
-                                     "authenticationUrl" => $authenticationUrl,
-                                     "ocraSuite"         => $this->_ocraSuite,
-                                     "enrollmentUrl"     => $enrollmentUrl
-                               ),
-                          "identity"=>
-                               array("identifier" =>$data["userId"],
-                                     "displayName"=>$data["displayName"]));
+                                array("displayName"       => $this->_name,
+                                        "identifier"        => $this->_identifier,
+                                        "logoUrl"           => $this->_logoUrl,
+                                        "infoUrl"           => $this->_infoUrl,
+                                        "authenticationUrl" => $authenticationUrl,
+                                        "ocraSuite"         => $this->_ocraSuite,
+                                        "enrollmentUrl"     => $enrollmentUrl
+                                ),
+                            "identity"=>
+                                array("identifier" =>$data["userId"],
+                                        "displayName"=>$data["displayName"]));
 
         $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
 
@@ -571,18 +571,18 @@ 
      */
     public function getEnrollmentSecret($enrollmentKey)
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
-         $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET);
-         $enrollmentData = [
-             "userId" => $data["userId"],
-             "sessionId" => $data["sessionId"]
-         ];
-         $this->_stateStorage->setValue(
-             self::PREFIX_ENROLLMENT_SECRET . $secret,
-             $enrollmentData,
-             self::ENROLLMENT_EXPIRE
-         );
-         return $secret;
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+            $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET);
+            $enrollmentData = [
+                "userId" => $data["userId"],
+                "sessionId" => $data["sessionId"]
+            ];
+            $this->_stateStorage->setValue(
+                self::PREFIX_ENROLLMENT_SECRET . $secret,
+                $enrollmentData,
+                self::ENROLLMENT_EXPIRE
+            );
+            return $secret;
     } 
 
     /**
@@ -597,13 +597,13 @@ 
      */
     public function validateEnrollmentSecret($enrollmentSecret)
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
-         if (is_array($data)) { 
-             // Secret is valid, application may accept the user secret. 
-             $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_PROCESSED);
-             return $data["userId"];
-         }
-         return false;
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
+            if (is_array($data)) { 
+                // Secret is valid, application may accept the user secret. 
+                $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_PROCESSED);
+                return $data["userId"];
+            }
+            return false;
     }
     
     /**
@@ -620,13 +620,13 @@ 
      */
     public function finalizeEnrollment($enrollmentSecret) 
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
-         if (is_array($data)) {
-             // Enrollment is finalized, destroy our session data.
-             $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
-             $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
-         }
-         return true;
+            $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
+            if (is_array($data)) {
+                // Enrollment is finalized, destroy our session data.
+                $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
+                $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
+            }
+            return true;
     }
 
     /**
@@ -662,7 +662,7 @@ 
 
         $challengeUserId = NULL;
         if (isset($state["userId"])) {
-          $challengeUserId = $state["userId"];
+            $challengeUserId = $state["userId"];
         }
         // Check if we're dealing with a second factor
         if ($challengeUserId!=NULL && ($userId != $challengeUserId)) {
@@ -801,6 +801,6 @@ 
      */
     protected function _setEnrollmentStatus($sessionId, $status)
     {
-       $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE);
+        $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE);
     }
 }

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(),
+        )));
+    }
 }