Added tests to cover convert functionality

[bookstack] / app / Http / Controllers / Auth / MfaController.php

diff --git a/app/Http/Controllers/Auth/MfaController.php b/app/Http/Controllers/Auth/MfaController.php
index 1d0dbd1a415a291b33bca000de1467e712419dff..6f6beb873e4911c6a509450694550edbe98cc953 100644 (file)
--- a/app/Http/Controllers/Auth/MfaController.php
+++ b/app/Http/Controllers/Auth/MfaController.php
@@ -2,28 +2,72 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

+use BookStack\Actions\ActivityType;
+use BookStack\Auth\Access\Mfa\MfaValue;

 use BookStack\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class MfaController extends Controller
 {
 use BookStack\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class MfaController extends Controller
 {

+    use HandlesPartialLogins;
+

     /**
      * Show the view to setup MFA for the current user.
      */
     public function setup()
     {
     /**
      * Show the view to setup MFA for the current user.
      */
     public function setup()
     {

-        // TODO - Redirect back to profile/edit if already setup?
-        // Show MFA setup route
-        return view('mfa.setup');
+        $userMethods = $this->currentOrLastAttemptedUser()
+            ->mfaValues()
+            ->get(['id', 'method'])
+            ->groupBy('method');
+
+        $this->setPageTitle(trans('auth.mfa_setup'));
+
+        return view('mfa.setup', [
+            'userMethods' => $userMethods,
+        ]);
+    }
+
+    /**
+     * Remove an MFA method for the current user.
+     *
+     * @throws \Exception
+     */
+    public function remove(string $method)
+    {
+        if (in_array($method, MfaValue::allMethods())) {
+            $value = user()->mfaValues()->where('method', '=', $method)->first();
+            if ($value) {
+                $value->delete();
+                $this->logActivity(ActivityType::MFA_REMOVE_METHOD, $method);
+            }
+        }
+
+        return redirect('/mfa/setup');

     }
 
     }
 

-    public function generateQr()
+    /**
+     * Show the page to start an MFA verification.
+     */
+    public function verify(Request $request)

     {
     {

-        // https://github.com/antonioribeiro/google2fa#how-to-generate-and-use-two-factor-authentication
+        $desiredMethod = $request->get('method');
+        $userMethods = $this->currentOrLastAttemptedUser()
+            ->mfaValues()
+            ->get(['id', 'method'])
+            ->groupBy('method');
+
+        // Basic search for the default option for a user.
+        // (Prioritises totp over backup codes)
+        $method = $userMethods->has($desiredMethod) ? $desiredMethod : $userMethods->keys()->sort()->reverse()->first();
+        $otherMethods = $userMethods->keys()->filter(function ($userMethod) use ($method) {
+            return $method !== $userMethod;
+        })->all();

 
 

-        // Generate secret key
-        // Store key in session?
-        // Get user to verify setup via responding once.
-        // If correct response, Save key against user
+        return view('mfa.verify', [
+            'userMethods'  => $userMethods,
+            'method'       => $method,
+            'otherMethods' => $otherMethods,
+        ]);

     }
 }
     }
 }