@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | #!/usr/bin/php |
2 | 2 | <?php |
3 | 3 | |
4 | - /* Copyright (c) 2015 Yubico AB |
|
4 | + /* Copyright (c) 2015 Yubico AB |
|
5 | 5 | * All rights reserved. |
6 | 6 | * |
7 | 7 | * Redistribution and use in source and binary forms, with or without |
@@ -44,38 +44,38 @@ discard block |
||
44 | 44 | $regs; |
45 | 45 | |
46 | 46 | if(array_key_exists('r', $options)) { |
47 | - $mode = "register"; |
|
47 | + $mode = "register"; |
|
48 | 48 | } elseif(array_key_exists('a', $options)) { |
49 | - if(!array_key_exists('R', $options)) { |
|
49 | + if(!array_key_exists('R', $options)) { |
|
50 | 50 | print "a registration must be supplied with -R"; |
51 | 51 | exit(1); |
52 | - } |
|
53 | - $regs = json_decode('[' . $options['R'] . ']'); |
|
54 | - $mode = "authenticate"; |
|
52 | + } |
|
53 | + $regs = json_decode('[' . $options['R'] . ']'); |
|
54 | + $mode = "authenticate"; |
|
55 | 55 | } else { |
56 | - print "-r or -a must be used\n"; |
|
57 | - exit(1); |
|
56 | + print "-r or -a must be used\n"; |
|
57 | + exit(1); |
|
58 | 58 | } |
59 | 59 | if(!array_key_exists('o', $options)) { |
60 | - print "origin must be supplied with -o\n"; |
|
61 | - exit(1); |
|
60 | + print "origin must be supplied with -o\n"; |
|
61 | + exit(1); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | $u2f = new u2flib_server\U2F($options['o']); |
65 | 65 | |
66 | 66 | if($mode === "register") { |
67 | - $challenge = $u2f->getRegisterData(); |
|
67 | + $challenge = $u2f->getRegisterData(); |
|
68 | 68 | } elseif($mode === "authenticate") { |
69 | - $challenge = $u2f->getAuthenticateData($regs); |
|
69 | + $challenge = $u2f->getAuthenticateData($regs); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | print json_encode($challenge[0]) . "\n"; |
73 | 73 | $response = fgets(STDIN); |
74 | 74 | |
75 | 75 | if($mode === "register") { |
76 | - $result = $u2f->doRegister($challenge[0], json_decode($response)); |
|
76 | + $result = $u2f->doRegister($challenge[0], json_decode($response)); |
|
77 | 77 | } elseif($mode === "authenticate") { |
78 | - $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response)); |
|
78 | + $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | print json_encode($result) . "\n"; |
@@ -1,32 +1,32 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Copyright (c) 2014 Yubico AB |
|
4 | - * All rights reserved. |
|
5 | - * |
|
6 | - * Redistribution and use in source and binary forms, with or without |
|
7 | - * modification, are permitted provided that the following conditions are |
|
8 | - * met: |
|
9 | - * |
|
10 | - * * Redistributions of source code must retain the above copyright |
|
11 | - * notice, this list of conditions and the following disclaimer. |
|
12 | - * |
|
13 | - * * Redistributions in binary form must reproduce the above |
|
14 | - * copyright notice, this list of conditions and the following |
|
15 | - * disclaimer in the documentation and/or other materials provided |
|
16 | - * with the distribution. |
|
17 | - * |
|
18 | - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
|
19 | - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
|
20 | - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
|
21 | - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
|
22 | - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
|
23 | - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
|
24 | - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
|
25 | - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
|
26 | - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
|
27 | - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
|
28 | - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
29 | - */ |
|
3 | + * Copyright (c) 2014 Yubico AB |
|
4 | + * All rights reserved. |
|
5 | + * |
|
6 | + * Redistribution and use in source and binary forms, with or without |
|
7 | + * modification, are permitted provided that the following conditions are |
|
8 | + * met: |
|
9 | + * |
|
10 | + * * Redistributions of source code must retain the above copyright |
|
11 | + * notice, this list of conditions and the following disclaimer. |
|
12 | + * |
|
13 | + * * Redistributions in binary form must reproduce the above |
|
14 | + * copyright notice, this list of conditions and the following |
|
15 | + * disclaimer in the documentation and/or other materials provided |
|
16 | + * with the distribution. |
|
17 | + * |
|
18 | + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
|
19 | + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
|
20 | + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
|
21 | + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
|
22 | + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
|
23 | + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
|
24 | + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
|
25 | + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
|
26 | + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
|
27 | + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
|
28 | + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
29 | + */ |
|
30 | 30 | |
31 | 31 | /** |
32 | 32 | * This is a simple example using PDO and a sqlite database for storing |
@@ -94,15 +94,15 @@ discard block |
||
94 | 94 | <?php |
95 | 95 | |
96 | 96 | if($_SERVER['REQUEST_METHOD'] === 'POST') { |
97 | - if(!$_POST['username']) { |
|
97 | + if(!$_POST['username']) { |
|
98 | 98 | echo "alert('no username provided!');"; |
99 | - } else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) { |
|
99 | + } else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) { |
|
100 | 100 | echo "alert('no action provided!');"; |
101 | - } else { |
|
101 | + } else { |
|
102 | 102 | $user = createAndGetUser($_POST['username']); |
103 | 103 | |
104 | 104 | if(isset($_POST['action'])) { |
105 | - switch($_POST['action']): |
|
105 | + switch($_POST['action']): |
|
106 | 106 | case 'register': |
107 | 107 | try { |
108 | 108 | $data = $u2f->getRegisterData(getRegs($user->id)); |
@@ -130,11 +130,11 @@ discard block |
||
130 | 130 | }); |
131 | 131 | }, 1000); |
132 | 132 | <?php |
133 | - } catch( Exception $e ) { |
|
133 | + } catch( Exception $e ) { |
|
134 | 134 | echo "alert('error: " . $e->getMessage() . "');"; |
135 | - } |
|
135 | + } |
|
136 | 136 | |
137 | - break; |
|
137 | + break; |
|
138 | 138 | |
139 | 139 | case 'authenticate': |
140 | 140 | try { |
@@ -157,34 +157,34 @@ discard block |
||
157 | 157 | }); |
158 | 158 | }, 1000); |
159 | 159 | <?php |
160 | - } catch( Exception $e ) { |
|
160 | + } catch( Exception $e ) { |
|
161 | 161 | echo "alert('error: " . $e->getMessage() . "');"; |
162 | - } |
|
162 | + } |
|
163 | 163 | |
164 | - break; |
|
164 | + break; |
|
165 | 165 | |
166 | - endswitch; |
|
166 | + endswitch; |
|
167 | 167 | } else if($_POST['register2']) { |
168 | - try { |
|
168 | + try { |
|
169 | 169 | $reg = $u2f->doRegister(json_decode($_SESSION['regReq']), json_decode($_POST['register2'])); |
170 | 170 | addReg($user->id, $reg); |
171 | - } catch( Exception $e ) { |
|
171 | + } catch( Exception $e ) { |
|
172 | 172 | echo "alert('error: " . $e->getMessage() . "');"; |
173 | - } finally { |
|
173 | + } finally { |
|
174 | 174 | $_SESSION['regReq'] = null; |
175 | - } |
|
175 | + } |
|
176 | 176 | } else if($_POST['authenticate2']) { |
177 | - try { |
|
177 | + try { |
|
178 | 178 | $reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), getRegs($user->id), json_decode($_POST['authenticate2'])); |
179 | 179 | updateReg($reg); |
180 | 180 | echo "alert('success: " . $reg->counter . "');"; |
181 | - } catch( Exception $e ) { |
|
181 | + } catch( Exception $e ) { |
|
182 | 182 | echo "alert('error: " . $e->getMessage() . "');"; |
183 | - } finally { |
|
183 | + } finally { |
|
184 | 184 | $_SESSION['authReq'] = null; |
185 | - } |
|
185 | + } |
|
186 | + } |
|
186 | 187 | } |
187 | - } |
|
188 | 188 | } |
189 | 189 | ?> |
190 | 190 | </script> |