nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

[PM-5566] Remove U2F keys from TwoFactorProviders (#3645)

Browse Source 
* Remove U2F keys from TwoFactorProviders

* Remove U2f from Premium check.
This commit is contained in:
Oscar Hinton 2024-01-18 17:54:57 +01:00 committed by GitHub
parent 974d23efdd
commit ef359c3cf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Auth/Models/TwoFactorProvider.cs
View File

@ -56,7 +56,6 @@ public class TwoFactorProvider
{ {
case TwoFactorProviderType.Duo: case TwoFactorProviderType.Duo:
case TwoFactorProviderType.YubiKey: case TwoFactorProviderType.YubiKey:
case TwoFactorProviderType.U2f: // Keep to ensure old U2f keys are considered premium
return true; return true;
default: default:
return false; return false;

7
src/Core/Entities/User.cs
View File

@ -137,6 +137,13 @@ public class User : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscri
TwoFactorProviders); TwoFactorProviders);
} }
// U2F is no longer supported, and all users keys should have been migrated to WebAuthn.
// To prevent issues with accounts being prompted for unsupported U2F we remove them
if (_twoFactorProviders.ContainsKey(TwoFactorProviderType.U2f))
{
_twoFactorProviders.Remove(TwoFactorProviderType.U2f);
}
return _twoFactorProviders; return _twoFactorProviders;
} }
catch (JsonException) catch (JsonException)