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";

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>

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)