@@ -90,9 +90,9 @@ |
||
90 | 90 | */ |
91 | 91 | public function verifyResponse($response, $secret, $challenge, $sessionKey) |
92 | 92 | { |
93 | - $expected = $this->calculateResponse($secret, $challenge, $sessionKey); |
|
93 | + $expected = $this->calculateResponse($secret, $challenge, $sessionKey); |
|
94 | 94 | |
95 | - return ($expected == $response); |
|
95 | + return ($expected == $response); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | $keyBytes, |
47 | 47 | $text) |
48 | 48 | { |
49 | - $hash = hash_hmac ($crypto, $text, $keyBytes); |
|
50 | - return $hash; |
|
49 | + $hash = hash_hmac ($crypto, $text, $keyBytes); |
|
50 | + return $hash; |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | * {@link truncationDigits} digits |
84 | 84 | */ |
85 | 85 | static function generateOCRA($ocraSuite, |
86 | - $key, |
|
87 | - $counter, |
|
88 | - $question, |
|
89 | - $password, |
|
90 | - $sessionInformation, |
|
91 | - $timeStamp) |
|
86 | + $key, |
|
87 | + $counter, |
|
88 | + $question, |
|
89 | + $password, |
|
90 | + $sessionInformation, |
|
91 | + $timeStamp) |
|
92 | 92 | { |
93 | 93 | $codeDigits = 0; |
94 | 94 | $crypto = ""; |
@@ -29,8 +29,8 @@ |
||
29 | 29 | * @param string $message exception message |
30 | 30 | * @param Exception $parent parent exception |
31 | 31 | */ |
32 | - public function __construct($message, $parent=null) |
|
33 | - { |
|
34 | - parent::__construct($message, 0, $parent); |
|
35 | - } |
|
32 | + public function __construct($message, $parent=null) |
|
33 | + { |
|
34 | + parent::__construct($message, 0, $parent); |
|
35 | + } |
|
36 | 36 | } |
37 | 37 | \ No newline at end of file |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | $keyBytes, |
47 | 47 | $text) |
48 | 48 | { |
49 | - $hash = hash_hmac ($crypto, $text, $keyBytes); |
|
50 | - return $hash; |
|
49 | + $hash = hash_hmac ($crypto, $text, $keyBytes); |
|
50 | + return $hash; |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | * {@link truncationDigits} digits |
84 | 84 | */ |
85 | 85 | static function generateOCRA($ocraSuite, |
86 | - $key, |
|
87 | - $counter, |
|
88 | - $question, |
|
89 | - $password, |
|
90 | - $sessionInformation, |
|
91 | - $timeStamp) |
|
86 | + $key, |
|
87 | + $counter, |
|
88 | + $question, |
|
89 | + $password, |
|
90 | + $sessionInformation, |
|
91 | + $timeStamp) |
|
92 | 92 | { |
93 | 93 | $codeDigits = 0; |
94 | 94 | $crypto = ""; |
@@ -97,9 +97,9 @@ |
||
97 | 97 | |
98 | 98 | // Wait and retry once in case of a 502 Bad Gateway error |
99 | 99 | if ($statusCode === 502 && !($retry)) { |
100 | - sleep(2); |
|
101 | - $this->_sendFirebase($deviceToken, $alert, $challenge, $apiKey, true); |
|
102 | - return; |
|
100 | + sleep(2); |
|
101 | + $this->_sendFirebase($deviceToken, $alert, $challenge, $apiKey, true); |
|
102 | + return; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | if ($statusCode !== 200) { |
@@ -4,241 +4,241 @@ |
||
4 | 4 | |
5 | 5 | class OATH_OCRAParser { |
6 | 6 | |
7 | - private $key = NULL; |
|
8 | - |
|
9 | - private $OCRASuite = NULL; |
|
10 | - |
|
11 | - private $OCRAVersion = NULL; |
|
12 | - |
|
13 | - private $CryptoFunctionType = NULL; |
|
14 | - private $CryptoFunctionHash = NULL; |
|
15 | - private $CryptoFunctionHashLength = NULL; |
|
16 | - private $CryptoFunctionTruncation = NULL; |
|
17 | - |
|
18 | - private $C = FALSE; |
|
19 | - private $Q = FALSE; |
|
20 | - private $QType = 'N'; |
|
21 | - private $QLength = 8; |
|
22 | - |
|
23 | - private $P = FALSE; |
|
24 | - private $PType = 'SHA1'; |
|
25 | - private $PLength = 20; |
|
26 | - |
|
27 | - private $S = FALSE; |
|
28 | - private $SLength = 64; |
|
29 | - |
|
30 | - private $T = FALSE; |
|
31 | - private $TLength = 60; // 1M |
|
32 | - private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1); |
|
33 | - |
|
34 | - private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64); |
|
35 | - |
|
36 | - |
|
37 | - public function __construct($ocraSuite) { |
|
38 | - $this->parseOCRASuite($ocraSuite); |
|
39 | - } |
|
40 | - |
|
41 | - /** |
|
42 | - * Inspired by https://github.com/bdauvergne/python-oath |
|
43 | - */ |
|
44 | - private function parseOCRASuite($ocraSuite) { |
|
45 | - if (!is_string($ocraSuite)) { |
|
46 | - throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE)); |
|
47 | - } |
|
48 | - |
|
49 | - $ocraSuite = strtoupper($ocraSuite); |
|
50 | - $this->OCRASuite = $ocraSuite; |
|
51 | - |
|
52 | - $s = explode(':', $ocraSuite); |
|
53 | - if (count($s) != 3) { |
|
54 | - throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE)); |
|
55 | - } |
|
56 | - |
|
57 | - $algo = explode('-', $s[0]); |
|
58 | - if (count($algo) != 2) { |
|
59 | - throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE)); |
|
60 | - } |
|
61 | - |
|
62 | - if ($algo[0] !== 'OCRA') { |
|
63 | - throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE)); |
|
64 | - } |
|
65 | - |
|
66 | - if ($algo[1] !== '1') { |
|
67 | - throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE)); |
|
68 | - } |
|
69 | - $this->OCRAVersion = $algo[1]; |
|
70 | - |
|
71 | - $cf = explode('-', $s[1]); |
|
72 | - if (count($cf) != 3) { |
|
73 | - throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE)); |
|
74 | - } |
|
75 | - |
|
76 | - if ($cf[0] !== 'HOTP') { |
|
77 | - throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE)); |
|
78 | - } |
|
79 | - $this->CryptoFunctionType = $cf[0]; |
|
80 | - |
|
81 | - if (!array_key_exists($cf[1], $this->supportedHashFunctions)) { |
|
82 | - throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE)); |
|
83 | - } |
|
84 | - $this->CryptoFunctionHash = $cf[1]; |
|
85 | - $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]]; |
|
86 | - |
|
87 | - if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) { |
|
88 | - throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE)); |
|
89 | - } |
|
90 | - $this->CryptoFunctionTruncation = intval($cf[2]); |
|
91 | - |
|
92 | - $di = explode('-', $s[2]); |
|
93 | - if (count($cf) == 0) { |
|
94 | - throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE)); |
|
95 | - } |
|
96 | - |
|
97 | - $data_input = array(); |
|
98 | - foreach($di as $elem) { |
|
99 | - $letter = $elem[0]; |
|
100 | - if (array_key_exists($letter, $data_input)) { |
|
101 | - throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE)); |
|
102 | - } |
|
103 | - $data_input[$letter] = 1; |
|
104 | - |
|
105 | - if ($letter === 'C' && strlen($elem) == 1) { |
|
106 | - $this->C = TRUE; |
|
107 | - } elseif ($letter === 'Q') { |
|
108 | - if (strlen($elem) == 1) { |
|
109 | - $this->Q = TRUE; |
|
110 | - } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) { |
|
111 | - $q_len = intval($match[2]); |
|
112 | - if ($q_len < 4 || $q_len > 64) { |
|
113 | - throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE)); |
|
114 | - } |
|
115 | - $this->Q = TRUE; |
|
116 | - $this->QType = $match[1]; |
|
117 | - $this->QLength = $q_len; |
|
118 | - } else { |
|
119 | - throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE)); |
|
120 | - } |
|
121 | - } elseif ($letter === 'P') { |
|
122 | - if (strlen($elem) == 1) { |
|
123 | - $this->P = TRUE; |
|
124 | - } else { |
|
125 | - $p_algo = substr($elem, 1); |
|
126 | - if (!array_key_exists($p_algo, $this->supportedHashFunctions)) { |
|
127 | - throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE)); |
|
128 | - } |
|
129 | - $this->P = TRUE; |
|
130 | - $this->PType = $p_algo; |
|
131 | - $this->PLength = $this->supportedHashFunctions[$p_algo]; |
|
132 | - } |
|
133 | - } elseif ($letter === 'S') { |
|
134 | - if (strlen($elem) == 1) { |
|
135 | - $this->S = TRUE; |
|
136 | - } elseif (preg_match('/^S(\d+)$/', $elem, $match)) { |
|
137 | - $s_len = intval($match[1]); |
|
138 | - if ($s_len <= 0 || $s_len > 512) { |
|
139 | - throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE)); |
|
140 | - } |
|
141 | - |
|
142 | - $this->S = TRUE; |
|
143 | - $this->SLength = $s_len; |
|
144 | - } else { |
|
145 | - throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE)); |
|
146 | - } |
|
147 | - } elseif ($letter === 'T') { |
|
148 | - if (strlen($elem) == 1) { |
|
149 | - $this->T = TRUE; |
|
150 | - } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) { |
|
151 | - preg_match_all('/(\d+)([HMS])/', $elem, $match); |
|
152 | - |
|
153 | - if (count($match[1]) !== count(array_unique($match[2]))) { |
|
154 | - throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE)); |
|
155 | - } |
|
156 | - |
|
157 | - $length = 0; |
|
158 | - for ($i = 0; $i < count($match[1]); $i++) { |
|
159 | - $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]]; |
|
160 | - } |
|
161 | - if ($length <= 0) { |
|
162 | - throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE)); |
|
163 | - } |
|
164 | - |
|
165 | - $this->T = TRUE; |
|
166 | - $this->TLength = $length; |
|
167 | - } else { |
|
168 | - throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE)); |
|
169 | - } |
|
170 | - } else { |
|
171 | - throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE)); |
|
172 | - } |
|
173 | - } |
|
174 | - |
|
175 | - if (!$this->Q) { |
|
176 | - throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE)); |
|
177 | - } |
|
178 | - } |
|
179 | - |
|
180 | - public function generateChallenge() { |
|
181 | - $q_length = $this->QLength; |
|
182 | - $q_type = $this->QType; |
|
7 | + private $key = NULL; |
|
8 | + |
|
9 | + private $OCRASuite = NULL; |
|
10 | + |
|
11 | + private $OCRAVersion = NULL; |
|
12 | + |
|
13 | + private $CryptoFunctionType = NULL; |
|
14 | + private $CryptoFunctionHash = NULL; |
|
15 | + private $CryptoFunctionHashLength = NULL; |
|
16 | + private $CryptoFunctionTruncation = NULL; |
|
17 | + |
|
18 | + private $C = FALSE; |
|
19 | + private $Q = FALSE; |
|
20 | + private $QType = 'N'; |
|
21 | + private $QLength = 8; |
|
22 | + |
|
23 | + private $P = FALSE; |
|
24 | + private $PType = 'SHA1'; |
|
25 | + private $PLength = 20; |
|
26 | + |
|
27 | + private $S = FALSE; |
|
28 | + private $SLength = 64; |
|
29 | + |
|
30 | + private $T = FALSE; |
|
31 | + private $TLength = 60; // 1M |
|
32 | + private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1); |
|
33 | + |
|
34 | + private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64); |
|
35 | + |
|
36 | + |
|
37 | + public function __construct($ocraSuite) { |
|
38 | + $this->parseOCRASuite($ocraSuite); |
|
39 | + } |
|
40 | + |
|
41 | + /** |
|
42 | + * Inspired by https://github.com/bdauvergne/python-oath |
|
43 | + */ |
|
44 | + private function parseOCRASuite($ocraSuite) { |
|
45 | + if (!is_string($ocraSuite)) { |
|
46 | + throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE)); |
|
47 | + } |
|
48 | + |
|
49 | + $ocraSuite = strtoupper($ocraSuite); |
|
50 | + $this->OCRASuite = $ocraSuite; |
|
51 | + |
|
52 | + $s = explode(':', $ocraSuite); |
|
53 | + if (count($s) != 3) { |
|
54 | + throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE)); |
|
55 | + } |
|
56 | + |
|
57 | + $algo = explode('-', $s[0]); |
|
58 | + if (count($algo) != 2) { |
|
59 | + throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE)); |
|
60 | + } |
|
61 | + |
|
62 | + if ($algo[0] !== 'OCRA') { |
|
63 | + throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE)); |
|
64 | + } |
|
65 | + |
|
66 | + if ($algo[1] !== '1') { |
|
67 | + throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE)); |
|
68 | + } |
|
69 | + $this->OCRAVersion = $algo[1]; |
|
70 | + |
|
71 | + $cf = explode('-', $s[1]); |
|
72 | + if (count($cf) != 3) { |
|
73 | + throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE)); |
|
74 | + } |
|
75 | + |
|
76 | + if ($cf[0] !== 'HOTP') { |
|
77 | + throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE)); |
|
78 | + } |
|
79 | + $this->CryptoFunctionType = $cf[0]; |
|
80 | + |
|
81 | + if (!array_key_exists($cf[1], $this->supportedHashFunctions)) { |
|
82 | + throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE)); |
|
83 | + } |
|
84 | + $this->CryptoFunctionHash = $cf[1]; |
|
85 | + $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]]; |
|
86 | + |
|
87 | + if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) { |
|
88 | + throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE)); |
|
89 | + } |
|
90 | + $this->CryptoFunctionTruncation = intval($cf[2]); |
|
91 | + |
|
92 | + $di = explode('-', $s[2]); |
|
93 | + if (count($cf) == 0) { |
|
94 | + throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE)); |
|
95 | + } |
|
96 | + |
|
97 | + $data_input = array(); |
|
98 | + foreach($di as $elem) { |
|
99 | + $letter = $elem[0]; |
|
100 | + if (array_key_exists($letter, $data_input)) { |
|
101 | + throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE)); |
|
102 | + } |
|
103 | + $data_input[$letter] = 1; |
|
104 | + |
|
105 | + if ($letter === 'C' && strlen($elem) == 1) { |
|
106 | + $this->C = TRUE; |
|
107 | + } elseif ($letter === 'Q') { |
|
108 | + if (strlen($elem) == 1) { |
|
109 | + $this->Q = TRUE; |
|
110 | + } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) { |
|
111 | + $q_len = intval($match[2]); |
|
112 | + if ($q_len < 4 || $q_len > 64) { |
|
113 | + throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE)); |
|
114 | + } |
|
115 | + $this->Q = TRUE; |
|
116 | + $this->QType = $match[1]; |
|
117 | + $this->QLength = $q_len; |
|
118 | + } else { |
|
119 | + throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE)); |
|
120 | + } |
|
121 | + } elseif ($letter === 'P') { |
|
122 | + if (strlen($elem) == 1) { |
|
123 | + $this->P = TRUE; |
|
124 | + } else { |
|
125 | + $p_algo = substr($elem, 1); |
|
126 | + if (!array_key_exists($p_algo, $this->supportedHashFunctions)) { |
|
127 | + throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE)); |
|
128 | + } |
|
129 | + $this->P = TRUE; |
|
130 | + $this->PType = $p_algo; |
|
131 | + $this->PLength = $this->supportedHashFunctions[$p_algo]; |
|
132 | + } |
|
133 | + } elseif ($letter === 'S') { |
|
134 | + if (strlen($elem) == 1) { |
|
135 | + $this->S = TRUE; |
|
136 | + } elseif (preg_match('/^S(\d+)$/', $elem, $match)) { |
|
137 | + $s_len = intval($match[1]); |
|
138 | + if ($s_len <= 0 || $s_len > 512) { |
|
139 | + throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE)); |
|
140 | + } |
|
141 | + |
|
142 | + $this->S = TRUE; |
|
143 | + $this->SLength = $s_len; |
|
144 | + } else { |
|
145 | + throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE)); |
|
146 | + } |
|
147 | + } elseif ($letter === 'T') { |
|
148 | + if (strlen($elem) == 1) { |
|
149 | + $this->T = TRUE; |
|
150 | + } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) { |
|
151 | + preg_match_all('/(\d+)([HMS])/', $elem, $match); |
|
152 | + |
|
153 | + if (count($match[1]) !== count(array_unique($match[2]))) { |
|
154 | + throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE)); |
|
155 | + } |
|
156 | + |
|
157 | + $length = 0; |
|
158 | + for ($i = 0; $i < count($match[1]); $i++) { |
|
159 | + $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]]; |
|
160 | + } |
|
161 | + if ($length <= 0) { |
|
162 | + throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE)); |
|
163 | + } |
|
164 | + |
|
165 | + $this->T = TRUE; |
|
166 | + $this->TLength = $length; |
|
167 | + } else { |
|
168 | + throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE)); |
|
169 | + } |
|
170 | + } else { |
|
171 | + throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE)); |
|
172 | + } |
|
173 | + } |
|
174 | + |
|
175 | + if (!$this->Q) { |
|
176 | + throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE)); |
|
177 | + } |
|
178 | + } |
|
179 | + |
|
180 | + public function generateChallenge() { |
|
181 | + $q_length = $this->QLength; |
|
182 | + $q_type = $this->QType; |
|
183 | 183 | |
184 | 184 | $bytes = Tiqr_Random::randomBytes($q_length); |
185 | 185 | |
186 | - switch($q_type) { |
|
187 | - case 'A': |
|
188 | - $challenge = base64_encode($bytes); |
|
189 | - $tr = implode("", unpack('H*', $bytes)); |
|
190 | - $challenge = rtrim(strtr($challenge, '+/', $tr), '='); |
|
191 | - break; |
|
192 | - case 'H': |
|
193 | - $challenge = implode("", unpack('H*', $bytes)); |
|
194 | - break; |
|
195 | - case 'N': |
|
196 | - $challenge = implode("", unpack('N*', $bytes)); |
|
197 | - break; |
|
198 | - default: |
|
199 | - throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE)); |
|
200 | - break; |
|
201 | - } |
|
202 | - |
|
203 | - $challenge = substr($challenge, 0, $q_length); |
|
204 | - |
|
205 | - return $challenge; |
|
206 | - } |
|
207 | - |
|
208 | - |
|
209 | - public function generateSessionInformation() { |
|
210 | - if (!$this->S) { |
|
211 | - throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE)); |
|
212 | - } |
|
213 | - |
|
214 | - $s_length = $this->SLength; |
|
186 | + switch($q_type) { |
|
187 | + case 'A': |
|
188 | + $challenge = base64_encode($bytes); |
|
189 | + $tr = implode("", unpack('H*', $bytes)); |
|
190 | + $challenge = rtrim(strtr($challenge, '+/', $tr), '='); |
|
191 | + break; |
|
192 | + case 'H': |
|
193 | + $challenge = implode("", unpack('H*', $bytes)); |
|
194 | + break; |
|
195 | + case 'N': |
|
196 | + $challenge = implode("", unpack('N*', $bytes)); |
|
197 | + break; |
|
198 | + default: |
|
199 | + throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE)); |
|
200 | + break; |
|
201 | + } |
|
202 | + |
|
203 | + $challenge = substr($challenge, 0, $q_length); |
|
204 | + |
|
205 | + return $challenge; |
|
206 | + } |
|
207 | + |
|
208 | + |
|
209 | + public function generateSessionInformation() { |
|
210 | + if (!$this->S) { |
|
211 | + throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE)); |
|
212 | + } |
|
213 | + |
|
214 | + $s_length = $this->SLength; |
|
215 | 215 | $bytes = Tiqr_Random::randomBytes($s_length); |
216 | 216 | |
217 | - // The OCRA spec doesn't specify that the session data should be hexadecimal. |
|
218 | - // However the reference implementation in the RFC does treat it as hex. |
|
219 | - $session = bin2hex($bytes); |
|
217 | + // The OCRA spec doesn't specify that the session data should be hexadecimal. |
|
218 | + // However the reference implementation in the RFC does treat it as hex. |
|
219 | + $session = bin2hex($bytes); |
|
220 | 220 | |
221 | - $session = substr($session, 0, $s_length); |
|
221 | + $session = substr($session, 0, $s_length); |
|
222 | 222 | |
223 | - return $session; |
|
224 | - } |
|
225 | - |
|
226 | - |
|
227 | - /** |
|
228 | - * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/ |
|
229 | - */ |
|
230 | - public static function constEqual($s1, $s2) { |
|
231 | - if (strlen($s1) != strlen($s2)) { |
|
232 | - return FALSE; |
|
233 | - } |
|
234 | - |
|
235 | - $result = TRUE; |
|
236 | - $length = strlen($s1); |
|
237 | - for ($i = 0; $i < $length; $i++) { |
|
238 | - $result &= ($s1[$i] == $s2[$i]); |
|
239 | - } |
|
240 | - |
|
241 | - return (boolean)$result; |
|
242 | - } |
|
223 | + return $session; |
|
224 | + } |
|
225 | + |
|
226 | + |
|
227 | + /** |
|
228 | + * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/ |
|
229 | + */ |
|
230 | + public static function constEqual($s1, $s2) { |
|
231 | + if (strlen($s1) != strlen($s2)) { |
|
232 | + return FALSE; |
|
233 | + } |
|
234 | + |
|
235 | + $result = TRUE; |
|
236 | + $length = strlen($s1); |
|
237 | + for ($i = 0; $i < $length; $i++) { |
|
238 | + $result &= ($s1[$i] == $s2[$i]); |
|
239 | + } |
|
240 | + |
|
241 | + return (boolean)$result; |
|
242 | + } |
|
243 | 243 | |
244 | 244 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | public function createUser($userId, $displayName) |
44 | 44 | { |
45 | 45 | $user = array("userId"=>$userId, |
46 | - "displayName"=>$displayName); |
|
46 | + "displayName"=>$displayName); |
|
47 | 47 | return $this->_saveUser($userId, $user); |
48 | 48 | } |
49 | 49 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | { |
78 | 78 | if ($data = $this->_loadUser($userId)) { |
79 | 79 | if (isset($data["notificationType"])) { |
80 | - return $data["notificationType"]; |
|
80 | + return $data["notificationType"]; |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | return NULL; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | { |
103 | 103 | if ($data = $this->_loadUser($userId)) { |
104 | 104 | if (isset($data["notificationAddress"])) { |
105 | - return $data["notificationAddress"]; |
|
105 | + return $data["notificationAddress"]; |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | $this->logger->info('Unable to find notification address for user'); |
@@ -552,17 +552,17 @@ discard block |
||
552 | 552 | } |
553 | 553 | |
554 | 554 | $metadata = array("service"=> |
555 | - array("displayName" => $this->_name, |
|
556 | - "identifier" => $this->_identifier, |
|
557 | - "logoUrl" => $this->_logoUrl, |
|
558 | - "infoUrl" => $this->_infoUrl, |
|
559 | - "authenticationUrl" => $authenticationUrl, |
|
560 | - "ocraSuite" => $this->_ocraSuite, |
|
561 | - "enrollmentUrl" => $enrollmentUrl |
|
562 | - ), |
|
563 | - "identity"=> |
|
564 | - array("identifier" =>$data["userId"], |
|
565 | - "displayName"=>$data["displayName"])); |
|
555 | + array("displayName" => $this->_name, |
|
556 | + "identifier" => $this->_identifier, |
|
557 | + "logoUrl" => $this->_logoUrl, |
|
558 | + "infoUrl" => $this->_infoUrl, |
|
559 | + "authenticationUrl" => $authenticationUrl, |
|
560 | + "ocraSuite" => $this->_ocraSuite, |
|
561 | + "enrollmentUrl" => $enrollmentUrl |
|
562 | + ), |
|
563 | + "identity"=> |
|
564 | + array("identifier" =>$data["userId"], |
|
565 | + "displayName"=>$data["displayName"])); |
|
566 | 566 | |
567 | 567 | $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT . $enrollmentKey); |
568 | 568 | |
@@ -585,18 +585,18 @@ discard block |
||
585 | 585 | */ |
586 | 586 | public function getEnrollmentSecret($enrollmentKey) |
587 | 587 | { |
588 | - $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey); |
|
589 | - $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET); |
|
590 | - $enrollmentData = [ |
|
591 | - "userId" => $data["userId"], |
|
592 | - "sessionId" => $data["sessionId"] |
|
593 | - ]; |
|
594 | - $this->_stateStorage->setValue( |
|
595 | - self::PREFIX_ENROLLMENT_SECRET . $secret, |
|
596 | - $enrollmentData, |
|
597 | - self::ENROLLMENT_EXPIRE |
|
598 | - ); |
|
599 | - return $secret; |
|
588 | + $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey); |
|
589 | + $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET); |
|
590 | + $enrollmentData = [ |
|
591 | + "userId" => $data["userId"], |
|
592 | + "sessionId" => $data["sessionId"] |
|
593 | + ]; |
|
594 | + $this->_stateStorage->setValue( |
|
595 | + self::PREFIX_ENROLLMENT_SECRET . $secret, |
|
596 | + $enrollmentData, |
|
597 | + self::ENROLLMENT_EXPIRE |
|
598 | + ); |
|
599 | + return $secret; |
|
600 | 600 | } |
601 | 601 | |
602 | 602 | /** |
@@ -635,18 +635,18 @@ discard block |
||
635 | 635 | */ |
636 | 636 | public function finalizeEnrollment($enrollmentSecret) |
637 | 637 | { |
638 | - $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret); |
|
639 | - if (is_array($data)) { |
|
640 | - // Enrollment is finalized, destroy our session data. |
|
641 | - $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED); |
|
642 | - $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret); |
|
643 | - } else { |
|
644 | - $this->logger->error( |
|
645 | - 'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' . |
|
646 | - 'Warning! the method will still return "true" as a result.' |
|
647 | - ); |
|
648 | - } |
|
649 | - return true; |
|
638 | + $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret); |
|
639 | + if (is_array($data)) { |
|
640 | + // Enrollment is finalized, destroy our session data. |
|
641 | + $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED); |
|
642 | + $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret); |
|
643 | + } else { |
|
644 | + $this->logger->error( |
|
645 | + 'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' . |
|
646 | + 'Warning! the method will still return "true" as a result.' |
|
647 | + ); |
|
648 | + } |
|
649 | + return true; |
|
650 | 650 | } |
651 | 651 | |
652 | 652 | /** |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | |
684 | 684 | $challengeUserId = NULL; |
685 | 685 | if (isset($state["userId"])) { |
686 | - $challengeUserId = $state["userId"]; |
|
686 | + $challengeUserId = $state["userId"]; |
|
687 | 687 | } |
688 | 688 | // Check if we're dealing with a second factor |
689 | 689 | if ($challengeUserId!=NULL && ($userId != $challengeUserId)) { |
@@ -830,6 +830,6 @@ discard block |
||
830 | 830 | */ |
831 | 831 | protected function _setEnrollmentStatus($sessionId, $status) |
832 | 832 | { |
833 | - $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE); |
|
833 | + $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE); |
|
834 | 834 | } |
835 | 835 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | public function encrypt($data); |
42 | 42 | |
43 | 43 | /** |
44 | - * Decrypts the given data. |
|
44 | + * Decrypts the given data. |
|
45 | 45 | * |
46 | 46 | * @param String $data Data to decrypt. |
47 | 47 | * |