@@ -43,10 +43,10 @@ discard block |
||
43 | 43 | $result; |
44 | 44 | $regs; |
45 | 45 | |
46 | -if(array_key_exists('r', $options)) { |
|
46 | +if (array_key_exists('r', $options)) { |
|
47 | 47 | $mode = "register"; |
48 | -} elseif(array_key_exists('a', $options)) { |
|
49 | - if(!array_key_exists('R', $options)) { |
|
48 | +} elseif (array_key_exists('a', $options)) { |
|
49 | + if (!array_key_exists('R', $options)) { |
|
50 | 50 | print "a registration must be supplied with -R"; |
51 | 51 | exit(1); |
52 | 52 | } |
@@ -56,25 +56,25 @@ discard block |
||
56 | 56 | print "-r or -a must be used\n"; |
57 | 57 | exit(1); |
58 | 58 | } |
59 | -if(!array_key_exists('o', $options)) { |
|
59 | +if (!array_key_exists('o', $options)) { |
|
60 | 60 | print "origin must be supplied with -o\n"; |
61 | 61 | exit(1); |
62 | 62 | } |
63 | 63 | |
64 | 64 | $u2f = new u2flib_server\U2F($options['o']); |
65 | 65 | |
66 | -if($mode === "register") { |
|
66 | +if ($mode === "register") { |
|
67 | 67 | $challenge = $u2f->getRegisterData(); |
68 | -} elseif($mode === "authenticate") { |
|
68 | +} elseif ($mode === "authenticate") { |
|
69 | 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 | -if($mode === "register") { |
|
75 | +if ($mode === "register") { |
|
76 | 76 | $result = $u2f->doRegister($challenge[0], json_decode($response)); |
77 | -} elseif($mode === "authenticate") { |
|
77 | +} elseif ($mode === "authenticate") { |
|
78 | 78 | $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response)); |
79 | 79 | } |
80 | 80 |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | } |
78 | 78 | return $ret; |
79 | 79 | } |
80 | - if($_SERVER['REQUEST_METHOD'] === 'POST') { |
|
81 | - if(isset($_POST['startRegister'])) { |
|
82 | - $regs = json_decode($_POST['registrations']) ? : array(); |
|
80 | + if ($_SERVER['REQUEST_METHOD'] === 'POST') { |
|
81 | + if (isset($_POST['startRegister'])) { |
|
82 | + $regs = json_decode($_POST['registrations']) ?: array(); |
|
83 | 83 | list($data, $reqs) = $u2f->getRegisterData($regs); |
84 | 84 | echo "var request = " . json_encode($data) . ";\n"; |
85 | 85 | echo "var signs = " . json_encode($reqs) . ";\n"; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | }); |
102 | 102 | }, 1000); |
103 | 103 | <?php |
104 | - } else if($_POST['doRegister']) { |
|
104 | + } else if ($_POST['doRegister']) { |
|
105 | 105 | try { |
106 | 106 | $data = $u2f->doRegister(json_decode($_POST['request']), json_decode($_POST['doRegister'])); |
107 | 107 | echo "var registration = '" . json_encode($data) . "';\n"; |
@@ -109,10 +109,10 @@ discard block |
||
109 | 109 | addRegistration(registration); |
110 | 110 | alert("registration successful!"); |
111 | 111 | <?php |
112 | - } catch(u2flib_server\Error $e) { |
|
112 | + } catch (u2flib_server\Error $e) { |
|
113 | 113 | echo "alert('error:" . $e->getMessage() . "');\n"; |
114 | 114 | } |
115 | - } else if(isset($_POST['startAuthenticate'])) { |
|
115 | + } else if (isset($_POST['startAuthenticate'])) { |
|
116 | 116 | $regs = json_decode($_POST['registrations']); |
117 | 117 | $data = $u2f->getAuthenticateData($regs); |
118 | 118 | echo "var registrations = " . $_POST['registrations'] . ";\n"; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | }); |
134 | 134 | }, 1000); |
135 | 135 | <?php |
136 | - } else if($_POST['doAuthenticate']) { |
|
136 | + } else if ($_POST['doAuthenticate']) { |
|
137 | 137 | $reqs = json_decode($_POST['request']); |
138 | 138 | $regs = json_decode($_POST['registrations']); |
139 | 139 | try { |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | echo "var registration = '" . json_encode($data) . "';\n"; |
142 | 142 | echo "addRegistration(registration);\n"; |
143 | 143 | echo "alert('Authentication successful, counter:" . $data->counter . "');\n"; |
144 | - } catch(u2flib_server\Error $e) { |
|
144 | + } catch (u2flib_server\Error $e) { |
|
145 | 145 | echo "alert('error:" . $e->getMessage() . "');\n"; |
146 | 146 | } |
147 | 147 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $sel = $pdo->prepare("select * from users where name = ?"); |
55 | 55 | $sel->execute(array($name)); |
56 | 56 | $user = $sel->fetch(); |
57 | - if(!$user) { |
|
57 | + if (!$user) { |
|
58 | 58 | $ins = $pdo->prepare("insert into users (name) values(?)"); |
59 | 59 | $ins->execute(array($name)); |
60 | 60 | $sel->execute(array($name)); |
@@ -93,21 +93,21 @@ discard block |
||
93 | 93 | <script> |
94 | 94 | <?php |
95 | 95 | |
96 | - if($_SERVER['REQUEST_METHOD'] === 'POST') { |
|
97 | - if(!$_POST['username']) { |
|
96 | + if ($_SERVER['REQUEST_METHOD'] === 'POST') { |
|
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 | 101 | } else { |
102 | 102 | $user = createAndGetUser($_POST['username']); |
103 | 103 | |
104 | - if(isset($_POST['action'])) { |
|
105 | - switch($_POST['action']): |
|
104 | + if (isset($_POST['action'])) { |
|
105 | + switch ($_POST['action']): |
|
106 | 106 | case 'register': |
107 | 107 | try { |
108 | 108 | $data = $u2f->getRegisterData(getRegs($user->id)); |
109 | 109 | |
110 | - list($req,$sigs) = $data; |
|
110 | + list($req, $sigs) = $data; |
|
111 | 111 | $_SESSION['regReq'] = json_encode($req); |
112 | 112 | echo "var req = " . json_encode($req) . ";"; |
113 | 113 | echo "var sigs = " . json_encode($sigs) . ";"; |
@@ -130,7 +130,7 @@ 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 | |
@@ -157,28 +157,28 @@ 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 | 164 | break; |
165 | 165 | |
166 | 166 | endswitch; |
167 | - } else if($_POST['register2']) { |
|
167 | + } else if ($_POST['register2']) { |
|
168 | 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 | 173 | } finally { |
174 | 174 | $_SESSION['regReq'] = null; |
175 | 175 | } |
176 | - } else if($_POST['authenticate2']) { |
|
176 | + } else if ($_POST['authenticate2']) { |
|
177 | 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 | 183 | } finally { |
184 | 184 | $_SESSION['authReq'] = null; |