paul999 / php-u2flib-server

examples/cli/u2f-server.php

Indentation +14 added lines, -14 removed lines

@@ -1,7 +1,7 @@ 
 #!/usr/bin/php
 <?php
 
- /* Copyright (c) 2015 Yubico AB
+    /* Copyright (c) 2015 Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,38 +44,38 @@ 
 $regs;
 
 if(array_key_exists('r', $options)) {
-  $mode = "register";
+    $mode = "register";
 } elseif(array_key_exists('a', $options)) {
-  if(!array_key_exists('R', $options)) {
+    if(!array_key_exists('R', $options)) {
     print "a registration must be supplied with -R";
     exit(1);
-  }
-  $regs = json_decode('[' . $options['R'] . ']');
-  $mode = "authenticate";
+    }
+    $regs = json_decode('[' . $options['R'] . ']');
+    $mode = "authenticate";
 } else {
-  print "-r or -a must be used\n";
-  exit(1);
+    print "-r or -a must be used\n";
+    exit(1);
 }
 if(!array_key_exists('o', $options)) {
-  print "origin must be supplied with -o\n";
-  exit(1);
+    print "origin must be supplied with -o\n";
+    exit(1);
 }
 
 $u2f = new u2flib_server\U2F($options['o']);
 
 if($mode === "register") {
-  $challenge = $u2f->getRegisterData();
+    $challenge = $u2f->getRegisterData();
 } elseif($mode === "authenticate") {
-  $challenge = $u2f->getAuthenticateData($regs);
+    $challenge = $u2f->getAuthenticateData($regs);
 }
 
 print json_encode($challenge[0]) . "\n";
 $response = fgets(STDIN);
 
 if($mode === "register") {
-  $result = $u2f->doRegister($challenge[0], json_decode($response));
+    $result = $u2f->doRegister($challenge[0], json_decode($response));
 } elseif($mode === "authenticate") {
-  $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response));
+    $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response));
 }
 
 print json_encode($result) . "\n";

Spacing +11 added lines, -11 removed lines

@@ -43,41 +43,41 @@
 $result;
 $regs;
 
-if(array_key_exists('r', $options)) {
+if (array_key_exists('r', $options)) {
   $mode = "register";
-} elseif(array_key_exists('a', $options)) {
-  if(!array_key_exists('R', $options)) {
+} elseif (array_key_exists('a', $options)) {
+  if (!array_key_exists('R', $options)) {
     print "a registration must be supplied with -R";
     exit(1);
   }
-  $regs = json_decode('[' . $options['R'] . ']');
+  $regs = json_decode('['.$options['R'].']');
   $mode = "authenticate";
 } else {
   print "-r or -a must be used\n";
   exit(1);
 }
-if(!array_key_exists('o', $options)) {
+if (!array_key_exists('o', $options)) {
   print "origin must be supplied with -o\n";
   exit(1);
 }
 
 $u2f = new u2flib_server\U2F($options['o']);
 
-if($mode === "register") {
+if ($mode === "register") {
   $challenge = $u2f->getRegisterData();
-} elseif($mode === "authenticate") {
+} elseif ($mode === "authenticate") {
   $challenge = $u2f->getAuthenticateData($regs);
 }
 
-print json_encode($challenge[0]) . "\n";
+print json_encode($challenge[0])."\n";
 $response = fgets(STDIN);
 
-if($mode === "register") {
+if ($mode === "register") {
   $result = $u2f->doRegister($challenge[0], json_decode($response));
-} elseif($mode === "authenticate") {
+} elseif ($mode === "authenticate") {
   $result = $u2f->doAuthenticate($challenge, $regs, json_decode($response));
 }
 
-print json_encode($result) . "\n";
+print json_encode($result)."\n";
 
 ?>

U2F.php

Spacing +4 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
     public function __construct($appId, $attestDir = null)
     {
         if (OPENSSL_VERSION_NUMBER < 0x10000000) {
-            throw new U2fError('OpenSSL has to be at least version 1.0.0, this is ' . OPENSSL_VERSION_TEXT, U2fError::ERR_OLD_OPENSSL);
+            throw new U2fError('OpenSSL has to be at least version 1.0.0, this is '.OPENSSL_VERSION_TEXT, U2fError::ERR_OLD_OPENSSL);
         }
         $this->appId = $appId;
         $this->attestDir = $attestDir;
@@ -84,7 +84,7 @@ 
     public function doRegister(RegisterRequestInterface $request, RegisterResponseInterface $response, $includeCert = true)
     {
         if ($response->getErrorCode() !== null && $response->getErrorCode() !== 0) {
-            throw new U2fError('User-agent returned error. Error code: ' . $response->getErrorCode(), U2fError::ERR_BAD_UA_RETURNING);
+            throw new U2fError('User-agent returned error. Error code: '.$response->getErrorCode(), U2fError::ERR_BAD_UA_RETURNING);
         }
 
         if (!is_bool($includeCert)) {
@@ -167,7 +167,7 @@ 
     public function doAuthenticate(array $requests, array $registrations, AuthenticationResponseInterface $response)
     {
         if ($response->getErrorCode() != null) {
-            throw new U2fError('User-agent returned error. Error code: ' . $response->getErrorCode(), U2fError::ERR_BAD_UA_RETURNING);
+            throw new U2fError('User-agent returned error. Error code: '.$response->getErrorCode(), U2fError::ERR_BAD_UA_RETURNING);
         }
 
         $clientData = $this->base64u_decode($response->getClientData());
@@ -287,7 +287,7 @@ 
          */
         $der = "\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01";
         $der .= "\x06\x08\x2a\x86\x48\xce\x3d\x03\x01\x07\x03\x42";
-        $der .= "\0" . $key;
+        $der .= "\0".$key;
 
         $pem = "-----BEGIN PUBLIC KEY-----\r\n";
         $pem .= chunk_split(base64_encode($der), 64);

examples/pdo/index.php

Indentation +20 added lines, -20 removed lines

@@ -94,15 +94,15 @@ 
         <?php
 
         if($_SERVER['REQUEST_METHOD'] === 'POST') {
-          if(!$_POST['username']) {
+            if(!$_POST['username']) {
             echo "alert('no username provided!');";
-          } else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
+            } else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
             echo "alert('no action provided!');";
-          } else {
+            } else {
             $user = createAndGetUser($_POST['username']);
 
             if(isset($_POST['action'])) {
-              switch($_POST['action']):
+                switch($_POST['action']):
                 case 'register':
                   try {
                     $data = $u2f->getRegisterData(getRegs($user->id));
@@ -130,11 +130,11 @@ 
             });
         }, 1000);
         <?php
-                  } catch( Exception $e ) {
+                    } catch( Exception $e ) {
                     echo "alert('error: " . $e->getMessage() . "');";
-                  }
+                    }
 
-                  break;
+                    break;
 
                 case 'authenticate':
                   try {
@@ -157,34 +157,34 @@ 
             });
         }, 1000);
         <?php
-                  } catch( Exception $e ) {
+                    } catch( Exception $e ) {
                     echo "alert('error: " . $e->getMessage() . "');";
-                  }
+                    }
 
-                  break;
+                    break;
 
-              endswitch;
+                endswitch;
             } else if($_POST['register2']) {
-              try {
+                try {
                 $reg = $u2f->doRegister(json_decode($_SESSION['regReq']), json_decode($_POST['register2']));
                 addReg($user->id, $reg);
-              } catch( Exception $e ) {
+                } catch( Exception $e ) {
                 echo "alert('error: " . $e->getMessage() . "');";
-              } finally {
+                } finally {
                 $_SESSION['regReq'] = null;
-              }
+                }
             } else if($_POST['authenticate2']) {
-              try {
+                try {
                 $reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), getRegs($user->id), json_decode($_POST['authenticate2']));
                 updateReg($reg);
                 echo "alert('success: " . $reg->counter . "');";
-              } catch( Exception $e ) {
+                } catch( Exception $e ) {
                 echo "alert('error: " . $e->getMessage() . "');";
-              } finally {
+                } finally {
                 $_SESSION['authReq'] = null;
-              }
+                }
+            }
             }
-          }
         }
         ?>
     </script>

Spacing +23 added lines, -23 removed lines

@@ -45,7 +45,7 @@ 
 $pdo->exec("create table if not exists registrations (id integer primary key, user_id integer, keyHandle varchar(255), publicKey varchar(255), certificate text, counter integer)");
 
 $scheme = isset($_SERVER['HTTPS']) ? "https://" : "http://";
-$u2f = new u2flib_server\U2F($scheme . $_SERVER['HTTP_HOST']);
+$u2f = new u2flib_server\U2F($scheme.$_SERVER['HTTP_HOST']);
 
 session_start();
 
@@ -54,7 +54,7 @@ 
     $sel = $pdo->prepare("select * from users where name = ?");
     $sel->execute(array($name));
     $user = $sel->fetch();
-    if(!$user) {
+    if (!$user) {
         $ins = $pdo->prepare("insert into users (name) values(?)");
         $ins->execute(array($name));
         $sel->execute(array($name));
@@ -93,25 +93,25 @@ 
     <script>
         <?php
 
-        if($_SERVER['REQUEST_METHOD'] === 'POST') {
-          if(!$_POST['username']) {
+        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+          if (!$_POST['username']) {
             echo "alert('no username provided!');";
-          } else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
+          } else if (!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
             echo "alert('no action provided!');";
           } else {
             $user = createAndGetUser($_POST['username']);
 
-            if(isset($_POST['action'])) {
-              switch($_POST['action']):
+            if (isset($_POST['action'])) {
+              switch ($_POST['action']):
                 case 'register':
                   try {
                     $data = $u2f->getRegisterData(getRegs($user->id));
 
-                    list($req,$sigs) = $data;
+                    list($req, $sigs) = $data;
                     $_SESSION['regReq'] = json_encode($req);
-                    echo "var req = " . json_encode($req) . ";";
-                    echo "var sigs = " . json_encode($sigs) . ";";
-                    echo "var username = '" . $user->name . "';";
+                    echo "var req = ".json_encode($req).";";
+                    echo "var sigs = ".json_encode($sigs).";";
+                    echo "var username = '".$user->name."';";
         ?>
         setTimeout(function() {
             console.log("Register: ", req);
@@ -130,8 +130,8 @@ 
             });
         }, 1000);
         <?php
-                  } catch( Exception $e ) {
-                    echo "alert('error: " . $e->getMessage() . "');";
+                  } catch (Exception $e) {
+                    echo "alert('error: ".$e->getMessage()."');";
                   }
 
                   break;
@@ -142,7 +142,7 @@ 
 
                     $_SESSION['authReq'] = $reqs;
                     echo "var req = $reqs;";
-                    echo "var username = '" . $user->name . "';";
+                    echo "var username = '".$user->name."';";
         ?>
         setTimeout(function() {
             console.log("sign: ", req);
@@ -157,29 +157,29 @@ 
             });
         }, 1000);
         <?php
-                  } catch( Exception $e ) {
-                    echo "alert('error: " . $e->getMessage() . "');";
+                  } catch (Exception $e) {
+                    echo "alert('error: ".$e->getMessage()."');";
                   }
 
                   break;
 
               endswitch;
-            } else if($_POST['register2']) {
+            } else if ($_POST['register2']) {
               try {
                 $reg = $u2f->doRegister(json_decode($_SESSION['regReq']), json_decode($_POST['register2']));
                 addReg($user->id, $reg);
-              } catch( Exception $e ) {
-                echo "alert('error: " . $e->getMessage() . "');";
+              } catch (Exception $e) {
+                echo "alert('error: ".$e->getMessage()."');";
               } finally {
                 $_SESSION['regReq'] = null;
               }
-            } else if($_POST['authenticate2']) {
+            } else if ($_POST['authenticate2']) {
               try {
                 $reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), getRegs($user->id), json_decode($_POST['authenticate2']));
                 updateReg($reg);
-                echo "alert('success: " . $reg->counter . "');";
-              } catch( Exception $e ) {
-                echo "alert('error: " . $e->getMessage() . "');";
+                echo "alert('success: ".$reg->counter."');";
+              } catch (Exception $e) {
+                echo "alert('error: ".$e->getMessage()."');";
               } finally {
                 $_SESSION['authReq'] = null;
               }

examples/localstorage/index.php

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
  */
 require_once('../../src/u2flib_server/U2F.php');
 $scheme = isset($_SERVER['HTTPS']) ? "https://" : "http://";
-$u2f = new u2flib_server\U2F($scheme . $_SERVER['HTTP_HOST']);
+$u2f = new u2flib_server\U2F($scheme.$_SERVER['HTTP_HOST']);
 ?>
 <html>
 <head>
@@ -77,12 +77,12 @@ 
             }
             return $ret;
         }
-        if($_SERVER['REQUEST_METHOD'] === 'POST') {
-            if(isset($_POST['startRegister'])) {
-                $regs = json_decode($_POST['registrations']) ? : array();
+        if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+            if (isset($_POST['startRegister'])) {
+                $regs = json_decode($_POST['registrations']) ?: array();
                 list($data, $reqs) = $u2f->getRegisterData($regs);
-                echo "var request = " . json_encode($data) . ";\n";
-                echo "var signs = " . json_encode($reqs) . ";\n";
+                echo "var request = ".json_encode($data).";\n";
+                echo "var signs = ".json_encode($reqs).";\n";
         ?>
         setTimeout(function() {
             console.log("Register: ", request);
@@ -101,22 +101,22 @@ 
             });
         }, 1000);
         <?php
-            } else if($_POST['doRegister']) {
+            } else if ($_POST['doRegister']) {
                 try {
                     $data = $u2f->doRegister(json_decode($_POST['request']), json_decode($_POST['doRegister']));
-                    echo "var registration = '" . json_encode($data) . "';\n";
+                    echo "var registration = '".json_encode($data)."';\n";
         ?>
         addRegistration(registration);
         alert("registration successful!");
         <?php
-                } catch(u2flib_server\Error $e) {
-                    echo "alert('error:" . $e->getMessage() . "');\n";
+                } catch (u2flib_server\Error $e) {
+                    echo "alert('error:".$e->getMessage()."');\n";
                 }
-            } else if(isset($_POST['startAuthenticate'])) {
+            } else if (isset($_POST['startAuthenticate'])) {
                 $regs = json_decode($_POST['registrations']);
                 $data = $u2f->getAuthenticateData($regs);
-                echo "var registrations = " . $_POST['registrations'] . ";\n";
-                echo "var request = " . json_encode($data) . ";\n";
+                echo "var registrations = ".$_POST['registrations'].";\n";
+                echo "var request = ".json_encode($data).";\n";
         ?>
         setTimeout(function() {
             console.log("sign: ", request);
@@ -133,16 +133,16 @@ 
             });
         }, 1000);
         <?php
-            } else if($_POST['doAuthenticate']) {
+            } else if ($_POST['doAuthenticate']) {
                 $reqs = json_decode($_POST['request']);
                 $regs = json_decode($_POST['registrations']);
                 try {
                     $data = $u2f->doAuthenticate($reqs, $regs, json_decode($_POST['doAuthenticate']));
-                    echo "var registration = '" . json_encode($data) . "';\n";
+                    echo "var registration = '".json_encode($data)."';\n";
                     echo "addRegistration(registration);\n";
-                    echo "alert('Authentication successful, counter:" . $data->counter . "');\n";
-                } catch(u2flib_server\Error $e) {
-                    echo "alert('error:" . $e->getMessage() . "');\n";
+                    echo "alert('Authentication successful, counter:".$data->counter."');\n";
+                } catch (u2flib_server\Error $e) {
+                    echo "alert('error:".$e->getMessage()."');\n";
                 }
             }
         }

RegisterRequest.php

Doc Comments +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
     }
 
     /**
-     * @param mixed $challenge
+     * @param string $challenge
      * @return RegisterRequestInterface
      */
     public function setChallenge($challenge)
@@ -110,7 +110,7 @@ 
     }
 
     /**
-     * @param mixed $appId
+     * @param string $appId
      * @return RegisterRequestInterface
      */
     public function setAppId($appId)