Inspection of "Feature/php82" - Tiqr/tiqr-server-libphp - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — develop (#53)

by Pieter van der

created 2024-03-04 22:00 UTC

Status

Indentation +201 added lines, -201 removed lines patch added patch discarded remove patch

@@ -2,32 +2,32 @@  discard block
 block discarded – undo
 
 class OATH_OCRAParser {
 
-	private $OCRASuite = NULL;
+    private $OCRASuite = NULL;
 
-	private $OCRAVersion = NULL;
+    private $OCRAVersion = NULL;
 
-	private $CryptoFunctionType = NULL;
-	private $CryptoFunctionHash = NULL;
-	private $CryptoFunctionHashLength = NULL;
-	private $CryptoFunctionTruncation = 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 $C = FALSE;
+    private $Q = FALSE;
+    private $QType = 'N';
+    private $QLength = 8;
 
-	private $P = FALSE;
-	private $PType = 'SHA1';
-	private $PLength = 20;
+    private $P = FALSE;
+    private $PType = 'SHA1';
+    private $PLength = 20;
 
-	private $S = FALSE;
-	private $SLength = 64;
+    private $S = FALSE;
+    private $SLength = 64;
 
-	private $T = FALSE;
-	private $TLength = 60; // 1M
-	private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
+    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);
+    private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
 
 
     /**
@@ -35,149 +35,149 @@  discard block
 block discarded – undo
      * @throws Exception
      */
     public function __construct(String $ocraSuite) {
-		$this->parseOCRASuite($ocraSuite);
-	}
+        $this->parseOCRASuite($ocraSuite);
+    }
 
-	/**
-	 * Inspired by https://github.com/bdauvergne/python-oath
+    /**
+     * Inspired by https://github.com/bdauvergne/python-oath
      *
      * @throws Exception
-	 */
-	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));
-		}
-	}
+     */
+    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));
+        }
+    }
 
     /** Generate an OCRA challenge question according to the ocra suite specified in the constructor
      * @return String: The randomly generated OCRA question
@@ -190,50 +190,50 @@  discard block
 block discarded – undo
      * Note that the question string is the exact question string a specified in the OCRA strandard (RFC 6287)
      * The challenge is not yet hex encoded as expected by OCRA::generateOCRA()
      */
-	public function generateChallenge() : String {
-		$q_length = $this->QLength;
-		$q_type = $this->QType;
+    public function generateChallenge() : String {
+        $q_length = $this->QLength;
+        $q_type = $this->QType;
 
         $bytes = Tiqr_Random::randomBytes($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;
-	}
-
-
-	/**
-	 * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
-	 */
-	public static function constEqual(string $s1, string $s2): bool {
-		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;
-	}
+        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;
+    }
+
+
+    /**
+     * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
+     */
+    public static function constEqual(string $s1, string $s2): bool {
+        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;
+    }
 
 }

Please login to merge, or discard this patch.

		@@ -2,32 +2,32 @@ discard block
		block discarded – undo
2	2
3	3	class OATH_OCRAParser {
4	4
5		- private $OCRASuite = NULL;
	5	+ private $OCRASuite = NULL;
6	6
7		- private $OCRAVersion = NULL;
	7	+ private $OCRAVersion = NULL;
8	8
9		- private $CryptoFunctionType = NULL;
10		- private $CryptoFunctionHash = NULL;
11		- private $CryptoFunctionHashLength = NULL;
12		- private $CryptoFunctionTruncation = NULL;
	9	+ private $CryptoFunctionType = NULL;
	10	+ private $CryptoFunctionHash = NULL;
	11	+ private $CryptoFunctionHashLength = NULL;
	12	+ private $CryptoFunctionTruncation = NULL;
13	13
14		- private $C = FALSE;
15		- private $Q = FALSE;
16		- private $QType = 'N';
17		- private $QLength = 8;
	14	+ private $C = FALSE;
	15	+ private $Q = FALSE;
	16	+ private $QType = 'N';
	17	+ private $QLength = 8;
18	18
19		- private $P = FALSE;
20		- private $PType = 'SHA1';
21		- private $PLength = 20;
	19	+ private $P = FALSE;
	20	+ private $PType = 'SHA1';
	21	+ private $PLength = 20;
22	22
23		- private $S = FALSE;
24		- private $SLength = 64;
	23	+ private $S = FALSE;
	24	+ private $SLength = 64;
25	25
26		- private $T = FALSE;
27		- private $TLength = 60; // 1M
28		- private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
	26	+ private $T = FALSE;
	27	+ private $TLength = 60; // 1M
	28	+ private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
29	29
30		- private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
	30	+ private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
31	31
32	32
33	33	/**
		@@ -35,149 +35,149 @@ discard block
		block discarded – undo
35	35	* @throws Exception
36	36	*/
37	37	public function __construct(String $ocraSuite) {
38		- $this->parseOCRASuite($ocraSuite);
39		- }
	38	+ $this->parseOCRASuite($ocraSuite);
	39	+ }
40	40
41		- /**
42		- * Inspired by https://github.com/bdauvergne/python-oath
	41	+ /**
	42	+ * Inspired by https://github.com/bdauvergne/python-oath
43	43	*
44	44	* @throws Exception
45		- */
46		- private function parseOCRASuite($ocraSuite) {
47		- if (!is_string($ocraSuite)) {
48		- throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
49		- }
50		-
51		- $ocraSuite = strtoupper($ocraSuite);
52		- $this->OCRASuite = $ocraSuite;
53		-
54		- $s = explode(':', $ocraSuite);
55		- if (count($s) != 3) {
56		- throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
57		- }
58		-
59		- $algo = explode('-', $s[0]);
60		- if (count($algo) != 2) {
61		- throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
62		- }
63		-
64		- if ($algo[0] !== 'OCRA') {
65		- throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
66		- }
67		-
68		- if ($algo[1] !== '1') {
69		- throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
70		- }
71		- $this->OCRAVersion = $algo[1];
72		-
73		- $cf = explode('-', $s[1]);
74		- if (count($cf) != 3) {
75		- throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
76		- }
77		-
78		- if ($cf[0] !== 'HOTP') {
79		- throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
80		- }
81		- $this->CryptoFunctionType = $cf[0];
82		-
83		- if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
84		- throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
85		- }
86		- $this->CryptoFunctionHash = $cf[1];
87		- $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
88		-
89		- if (!preg_match('/^\d+$/', $cf[2]) \|\| (($cf[2] < 4 \|\| $cf[2] > 10) && $cf[2] != 0)) {
90		- throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
91		- }
92		- $this->CryptoFunctionTruncation = intval($cf[2]);
93		-
94		- $di = explode('-', $s[2]);
95		- if (count($cf) == 0) {
96		- throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
97		- }
98		-
99		- $data_input = array();
100		- foreach($di as $elem) {
101		- $letter = $elem[0];
102		- if (array_key_exists($letter, $data_input)) {
103		- throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
104		- }
105		- $data_input[$letter] = 1;
106		-
107		- if ($letter === 'C' && strlen($elem) == 1) {
108		- $this->C = TRUE;
109		- } elseif ($letter === 'Q') {
110		- if (strlen($elem) == 1) {
111		- $this->Q = TRUE;
112		- } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
113		- $q_len = intval($match[2]);
114		- if ($q_len < 4 \|\| $q_len > 64) {
115		- throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
116		- }
117		- $this->Q = TRUE;
118		- $this->QType = $match[1];
119		- $this->QLength = $q_len;
120		- } else {
121		- throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
122		- }
123		- } elseif ($letter === 'P') {
124		- if (strlen($elem) == 1) {
125		- $this->P = TRUE;
126		- } else {
127		- $p_algo = substr($elem, 1);
128		- if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
129		- throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
130		- }
131		- $this->P = TRUE;
132		- $this->PType = $p_algo;
133		- $this->PLength = $this->supportedHashFunctions[$p_algo];
134		- }
135		- } elseif ($letter === 'S') {
136		- if (strlen($elem) == 1) {
137		- $this->S = TRUE;
138		- } elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
139		- $s_len = intval($match[1]);
140		- if ($s_len <= 0 \|\| $s_len > 512) {
141		- throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
142		- }
143		-
144		- $this->S = TRUE;
145		- $this->SLength = $s_len;
146		- } else {
147		- throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
148		- }
149		- } elseif ($letter === 'T') {
150		- if (strlen($elem) == 1) {
151		- $this->T = TRUE;
152		- } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
153		- preg_match_all('/(\d+)([HMS])/', $elem, $match);
154		-
155		- if (count($match[1]) !== count(array_unique($match[2]))) {
156		- throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
157		- }
158		-
159		- $length = 0;
160		- for ($i = 0; $i < count($match[1]); $i++) {
161		- $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
162		- }
163		- if ($length <= 0) {
164		- throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
165		- }
166		-
167		- $this->T = TRUE;
168		- $this->TLength = $length;
169		- } else {
170		- throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
171		- }
172		- } else {
173		- throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
174		- }
175		- }
176		-
177		- if (!$this->Q) {
178		- throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
179		- }
180		- }
	45	+ */
	46	+ private function parseOCRASuite($ocraSuite) {
	47	+ if (!is_string($ocraSuite)) {
	48	+ throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
	49	+ }
	50	+
	51	+ $ocraSuite = strtoupper($ocraSuite);
	52	+ $this->OCRASuite = $ocraSuite;
	53	+
	54	+ $s = explode(':', $ocraSuite);
	55	+ if (count($s) != 3) {
	56	+ throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
	57	+ }
	58	+
	59	+ $algo = explode('-', $s[0]);
	60	+ if (count($algo) != 2) {
	61	+ throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
	62	+ }
	63	+
	64	+ if ($algo[0] !== 'OCRA') {
	65	+ throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
	66	+ }
	67	+
	68	+ if ($algo[1] !== '1') {
	69	+ throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
	70	+ }
	71	+ $this->OCRAVersion = $algo[1];
	72	+
	73	+ $cf = explode('-', $s[1]);
	74	+ if (count($cf) != 3) {
	75	+ throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
	76	+ }
	77	+
	78	+ if ($cf[0] !== 'HOTP') {
	79	+ throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
	80	+ }
	81	+ $this->CryptoFunctionType = $cf[0];
	82	+
	83	+ if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
	84	+ throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
	85	+ }
	86	+ $this->CryptoFunctionHash = $cf[1];
	87	+ $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
	88	+
	89	+ if (!preg_match('/^\d+$/', $cf[2]) \|\| (($cf[2] < 4 \|\| $cf[2] > 10) && $cf[2] != 0)) {
	90	+ throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
	91	+ }
	92	+ $this->CryptoFunctionTruncation = intval($cf[2]);
	93	+
	94	+ $di = explode('-', $s[2]);
	95	+ if (count($cf) == 0) {
	96	+ throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
	97	+ }
	98	+
	99	+ $data_input = array();
	100	+ foreach($di as $elem) {
	101	+ $letter = $elem[0];
	102	+ if (array_key_exists($letter, $data_input)) {
	103	+ throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
	104	+ }
	105	+ $data_input[$letter] = 1;
	106	+
	107	+ if ($letter === 'C' && strlen($elem) == 1) {
	108	+ $this->C = TRUE;
	109	+ } elseif ($letter === 'Q') {
	110	+ if (strlen($elem) == 1) {
	111	+ $this->Q = TRUE;
	112	+ } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
	113	+ $q_len = intval($match[2]);
	114	+ if ($q_len < 4 \|\| $q_len > 64) {
	115	+ throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
	116	+ }
	117	+ $this->Q = TRUE;
	118	+ $this->QType = $match[1];
	119	+ $this->QLength = $q_len;
	120	+ } else {
	121	+ throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
	122	+ }
	123	+ } elseif ($letter === 'P') {
	124	+ if (strlen($elem) == 1) {
	125	+ $this->P = TRUE;
	126	+ } else {
	127	+ $p_algo = substr($elem, 1);
	128	+ if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
	129	+ throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
	130	+ }
	131	+ $this->P = TRUE;
	132	+ $this->PType = $p_algo;
	133	+ $this->PLength = $this->supportedHashFunctions[$p_algo];
	134	+ }
	135	+ } elseif ($letter === 'S') {
	136	+ if (strlen($elem) == 1) {
	137	+ $this->S = TRUE;
	138	+ } elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
	139	+ $s_len = intval($match[1]);
	140	+ if ($s_len <= 0 \|\| $s_len > 512) {
	141	+ throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
	142	+ }
	143	+
	144	+ $this->S = TRUE;
	145	+ $this->SLength = $s_len;
	146	+ } else {
	147	+ throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
	148	+ }
	149	+ } elseif ($letter === 'T') {
	150	+ if (strlen($elem) == 1) {
	151	+ $this->T = TRUE;
	152	+ } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
	153	+ preg_match_all('/(\d+)([HMS])/', $elem, $match);
	154	+
	155	+ if (count($match[1]) !== count(array_unique($match[2]))) {
	156	+ throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
	157	+ }
	158	+
	159	+ $length = 0;
	160	+ for ($i = 0; $i < count($match[1]); $i++) {
	161	+ $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
	162	+ }
	163	+ if ($length <= 0) {
	164	+ throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
	165	+ }
	166	+
	167	+ $this->T = TRUE;
	168	+ $this->TLength = $length;
	169	+ } else {
	170	+ throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
	171	+ }
	172	+ } else {
	173	+ throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
	174	+ }
	175	+ }
	176	+
	177	+ if (!$this->Q) {
	178	+ throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
	179	+ }
	180	+ }
181	181
182	182	/** Generate an OCRA challenge question according to the ocra suite specified in the constructor
183	183	* @return String: The randomly generated OCRA question
		@@ -190,50 +190,50 @@ discard block
		block discarded – undo
190	190	* Note that the question string is the exact question string a specified in the OCRA strandard (RFC 6287)
191	191	* The challenge is not yet hex encoded as expected by OCRA::generateOCRA()
192	192	*/
193		- public function generateChallenge() : String {
194		- $q_length = $this->QLength;
195		- $q_type = $this->QType;
	193	+ public function generateChallenge() : String {
	194	+ $q_length = $this->QLength;
	195	+ $q_type = $this->QType;
196	196
197	197	$bytes = Tiqr_Random::randomBytes($q_length);
198	198
199		- switch($q_type) {
200		- case 'A':
201		- $challenge = base64_encode($bytes);
202		- $tr = implode("", unpack('H*', $bytes));
203		- $challenge = rtrim(strtr($challenge, '+/', $tr), '=');
204		- break;
205		- case 'H':
206		- $challenge = implode("", unpack('H*', $bytes));
207		- break;
208		- case 'N':
209		- $challenge = implode("", unpack('N*', $bytes));
210		- break;
211		- default:
212		- throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
213		- break;
214		- }
215		-
216		- $challenge = substr($challenge, 0, $q_length);
217		-
218		- return $challenge;
219		- }
220		-
221		-
222		- /**
223		- * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
224		- */
225		- public static function constEqual(string $s1, string $s2): bool {
226		- if (strlen($s1) != strlen($s2)) {
227		- return FALSE;
228		- }
229		-
230		- $result = TRUE;
231		- $length = strlen($s1);
232		- for ($i = 0; $i < $length; $i++) {
233		- $result &= ($s1[$i] == $s2[$i]);
234		- }
235		-
236		- return (boolean)$result;
237		- }
	199	+ switch($q_type) {
	200	+ case 'A':
	201	+ $challenge = base64_encode($bytes);
	202	+ $tr = implode("", unpack('H*', $bytes));
	203	+ $challenge = rtrim(strtr($challenge, '+/', $tr), '=');
	204	+ break;
	205	+ case 'H':
	206	+ $challenge = implode("", unpack('H*', $bytes));
	207	+ break;
	208	+ case 'N':
	209	+ $challenge = implode("", unpack('N*', $bytes));
	210	+ break;
	211	+ default:
	212	+ throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
	213	+ break;
	214	+ }
	215	+
	216	+ $challenge = substr($challenge, 0, $q_length);
	217	+
	218	+ return $challenge;
	219	+ }
	220	+
	221	+
	222	+ /**
	223	+ * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
	224	+ */
	225	+ public static function constEqual(string $s1, string $s2): bool {
	226	+ if (strlen($s1) != strlen($s2)) {
	227	+ return FALSE;
	228	+ }
	229	+
	230	+ $result = TRUE;
	231	+ $length = strlen($s1);
	232	+ for ($i = 0; $i < $length; $i++) {
	233	+ $result &= ($s1[$i] == $s2[$i]);
	234	+ }
	235	+
	236	+ return (boolean)$result;
	237	+ }
238	238
239	239	}

Tiqr / tiqr-server-libphp

Pull Request — develop (#53)

Status

Category

Indentation +201 added lines, -201 removed lines patch added patch discarded remove patch