Remove mfa in wallet (#858)

* Remove MFA in Wallet * cleanup --------- Co-authored-by: Aleksander <[email protected]>
DefGuard · Nov 19, 2024 · c4f6fd4 · c4f6fd4
1 parent 70cbfea
commit c4f6fd4
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 601 deletions.
diff --git a/.sqlx/query-18caaf9ec8c752b1ed530f8fb2991c51a3af0d260bf8e726c1c54966e11a9711.json b/.sqlx/query-18caaf9ec8c752b1ed530f8fb2991c51a3af0d260bf8e726c1c54966e11a9711.json
diff --git a/...818f346d9d25547aedd4dc388347b7620cfd.json → ...95ecb9c0fcb8762c25aa960e7b5a2e49963b.json b/...818f346d9d25547aedd4dc388347b7620cfd.json → ...95ecb9c0fcb8762c25aa960e7b5a2e49963b.json
diff --git a/.sqlx/query-1feeccc3729029c40d9cbecd21919fc184af94f52cb135c4c8bd2830c92a47db.json b/.sqlx/query-1feeccc3729029c40d9cbecd21919fc184af94f52cb135c4c8bd2830c92a47db.json
diff --git a/...76674eef0d3848f3805778291df5d4fa3537.json → ...f8698c283d3158c7b6806a24d777819c7e64.json b/...76674eef0d3848f3805778291df5d4fa3537.json → ...f8698c283d3158c7b6806a24d777819c7e64.json
diff --git a/...88bf5eeef60689d104448989726a5999eb42.json → ...6304eab840ddfce68b9c3950683b3951ba7f.json b/...88bf5eeef60689d104448989726a5999eb42.json → ...6304eab840ddfce68b9c3950683b3951ba7f.json
diff --git a/...5626b1ad29755fef9758f88353e786a1b2ed.json → ...89525bfaedcf7f3e025ec9fc80ae734681e0.json b/...5626b1ad29755fef9758f88353e786a1b2ed.json → ...89525bfaedcf7f3e025ec9fc80ae734681e0.json
diff --git a/.sqlx/query-c4e2279ae22667242ddab424cb35d81d565b02d86af3e2a8eabc08f9ca2cbfbb.json b/.sqlx/query-c4e2279ae22667242ddab424cb35d81d565b02d86af3e2a8eabc08f9ca2cbfbb.json
diff --git a/...295afcdc4daf5f3be7cca0be247e47133794.json → ...2cc2b97916326f416adc5ae0de1e73f0fa60.json b/...295afcdc4daf5f3be7cca0be247e47133794.json → ...2cc2b97916326f416adc5ae0de1e73f0fa60.json
diff --git a/...7e16fc9d6814e41f8d30e3e2a8431181c347.json → ...0a4a495830071f9b2d68f5e0ff14b186a182.json b/...7e16fc9d6814e41f8d30e3e2a8431181c347.json → ...0a4a495830071f9b2d68f5e0ff14b186a182.json
diff --git a/...05c685a6d61c231dcbb4ce92fb3333a41a0d.json → ...85dfde04b4c28fa8901a040d9286c020cc93.json b/...05c685a6d61c231dcbb4ce92fb3333a41a0d.json → ...85dfde04b4c28fa8901a040d9286c020cc93.json
diff --git a/migrations/20241119105926_disable_wallet_mfa.down.sql b/migrations/20241119105926_disable_wallet_mfa.down.sql
@@ -0,0 +1 @@
+ALTER TABLE wallet ADD COLUMN use_for_mfa boolean NOT NULL DEFAULT true;
diff --git a/migrations/20241119105926_disable_wallet_mfa.up.sql b/migrations/20241119105926_disable_wallet_mfa.up.sql
@@ -1 +1 @@
-UPDATE wallet SET use_for_mfa = false;
+ALTER TABLE wallet DROP use_for_mfa;
diff --git a/src/db/models/mod.rs b/src/db/models/mod.rs
@@ -40,12 +40,11 @@ pub struct NewOpenIDClient {
     pub enabled: bool,
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, ToSchema)]
 pub struct WalletInfo {
     pub address: String,
     pub name: String,
     pub chain_id: Id,
-    pub use_for_mfa: bool,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
@@ -217,7 +216,6 @@ impl UserDetails {
 pub struct MFAInfo {
     mfa_method: MFAMethod,
     totp_available: bool,
-    web3_available: bool,
     webauthn_available: bool,
     email_available: bool,
 }
@@ -227,7 +225,6 @@ impl MFAInfo {
         query_as!(
             Self,
             "SELECT mfa_method \"mfa_method: _\", totp_enabled totp_available, email_mfa_enabled email_available, \
-            (SELECT count(*) > 0 FROM wallet WHERE user_id = $1 AND wallet.use_for_mfa) \"web3_available!\", \
             (SELECT count(*) > 0 FROM webauthn WHERE user_id = $1) \"webauthn_available!\" \
             FROM \"user\" WHERE \"user\".id = $1",
             user.id
@@ -236,10 +233,7 @@ impl MFAInfo {
 
     #[must_use]
     pub fn mfa_available(&self) -> bool {
-        self.webauthn_available
-            || self.totp_available
-            || self.web3_available
-            || self.email_available
+        self.webauthn_available || self.totp_available || self.email_available
     }
 
     #[must_use]
@@ -257,9 +251,6 @@ impl MFAInfo {
         if self.webauthn_available {
             methods.push(MFAMethod::Webauthn);
         }
-        if self.web3_available {
-            methods.push(MFAMethod::Web3);
-        }
         if self.totp_available {
             methods.push(MFAMethod::OneTimePassword);
         }

diff --git a/src/db/models/user.rs b/src/db/models/user.rs
@@ -15,7 +15,6 @@ use totp_lite::{totp_custom, Sha1};
 use super::{
     device::{Device, UserDevice},
     group::Group,
-    wallet::Wallet,
     webauthn::WebAuthn,
     MFAInfo, OAuth2AuthorizedAppInfo, SecurityKey, WalletInfo,
 };
@@ -234,7 +233,6 @@ impl User<Id> {
 
     /// Check if any of the multi-factor authentication methods is on.
     /// - TOTP is enabled
-    /// - a [`Wallet`] flagged `use_for_mfa`
     /// - a security key for Webauthn
     async fn check_mfa_enabled<'e, E>(&self, executor: E) -> Result<bool, SqlxError>
     where
@@ -246,9 +244,8 @@ impl User<Id> {
         }
 
         query_scalar!(
-            "SELECT totp_enabled OR email_mfa_enabled OR coalesce(bool_or(wallet.use_for_mfa), FALSE) \
+            "SELECT totp_enabled OR email_mfa_enabled \
             OR count(webauthn.id) > 0 \"bool!\" FROM \"user\" \
-            LEFT JOIN wallet ON wallet.user_id = \"user\".id \
             LEFT JOIN webauthn ON webauthn.user_id = \"user\".id \
             WHERE \"user\".id = $1 GROUP BY totp_enabled, email_mfa_enabled;",
             self.id
@@ -360,7 +357,6 @@ impl User<Id> {
         )
         .execute(pool)
         .await?;
-        Wallet::disable_mfa_for_user(pool, self.id).await?;
         WebAuthn::delete_all_for_user(pool, self.id).await?;
 
         self.totp_secret = None;
@@ -727,7 +723,7 @@ impl User<Id> {
     {
         query_as!(
             WalletInfo,
-            "SELECT address \"address!\", name, chain_id, use_for_mfa \
+            "SELECT address \"address!\", name, chain_id \
             FROM wallet WHERE user_id = $1 AND validation_timestamp IS NOT NULL",
             self.id
         )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE wallet ADD COLUMN use_for_mfa boolean NOT NULL DEFAULT true;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		UPDATE wallet SET use_for_mfa = false;
		ALTER TABLE wallet DROP use_for_mfa;