Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-28 13:15:12 +01:00
Code Issues Projects Releases Wiki Activity

Parse enum as to accept 0 values or full string values

Browse Source
This commit is contained in:
Kyle Spearrin 2017-01-28 17:28:28 -05:00
parent 4354006a27
commit 8514d1f16d
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Controllers/AccountsController.cs
View File

@ -210,7 +210,7 @@ namespace Bit.Api.Controllers
throw new BadRequestException("MasterPasswordHash", "Invalid password."); throw new BadRequestException("MasterPasswordHash", "Invalid password.");
} }
if(!await _userManager.VerifyTwoFactorTokenAsync(user, "Authenticator", model.Token)) if(!await _userManager.VerifyTwoFactorTokenAsync(user, TwoFactorProviderType.Authenticator.ToString(), model.Token))
{ {
await Task.Delay(2000); await Task.Delay(2000);
throw new BadRequestException("Token", "Invalid token."); throw new BadRequestException("Token", "Invalid token.");
@ -247,7 +247,7 @@ namespace Bit.Api.Controllers
throw new BadRequestException("MasterPasswordHash", "Invalid password."); throw new BadRequestException("MasterPasswordHash", "Invalid password.");
} }
if(!await _userManager.VerifyTwoFactorTokenAsync(user, "Authenticator", model.Token)) if(!await _userManager.VerifyTwoFactorTokenAsync(user, TwoFactorProviderType.Authenticator.ToString(), model.Token))
{ {
await Task.Delay(2000); await Task.Delay(2000);
throw new BadRequestException("Token", "Invalid token."); throw new BadRequestException("Token", "Invalid token.");

9
src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs
View File

@ -76,14 +76,21 @@ namespace Bit.Api.IdentityServer
{ {
if(await _userManager.CheckPasswordAsync(user, context.Password)) if(await _userManager.CheckPasswordAsync(user, context.Password))
{ {
TwoFactorProviderType twoFactorProviderType = TwoFactorProviderType.Authenticator; // Just defaulting it
if(!twoFactorRequest && await TwoFactorRequiredAsync(user)) if(!twoFactorRequest && await TwoFactorRequiredAsync(user))
{ {
BuildTwoFactorResult(user, context); BuildTwoFactorResult(user, context);
return; return;
} }
if(twoFactorRequest && !Enum.TryParse(twoFactorProvider, out twoFactorProviderType))
{
BuildTwoFactorResult(user, context);
return;
}
if(!twoFactorRequest || if(!twoFactorRequest ||
await _userManager.VerifyTwoFactorTokenAsync(user, twoFactorProvider, twoFactorToken)) await _userManager.VerifyTwoFactorTokenAsync(user, twoFactorProviderType.ToString(), twoFactorToken))
{ {
var device = await SaveDeviceAsync(user, context); var device = await SaveDeviceAsync(user, context);
BuildSuccessResult(user, context, device); BuildSuccessResult(user, context, device);

3
src/Api/Startup.cs
View File

@ -30,6 +30,7 @@ using Bit.Core.Utilities;
using Serilog; using Serilog;
using Serilog.Events; using Serilog.Events;
using Bit.Api.IdentityServer; using Bit.Api.IdentityServer;
using Bit.Core.Enums;
namespace Bit.Api namespace Bit.Api
{ {
@ -150,7 +151,7 @@ namespace Bit.Api
}) })
.AddUserStore<UserStore>() .AddUserStore<UserStore>()
.AddRoleStore<RoleStore>() .AddRoleStore<RoleStore>()
.AddTokenProvider<AuthenticatorTokenProvider>("Authenticator") .AddTokenProvider<AuthenticatorTokenProvider>(TwoFactorProviderType.Authenticator.ToString())
.AddTokenProvider<EmailTokenProvider<User>>(TokenOptions.DefaultEmailProvider); .AddTokenProvider<EmailTokenProvider<User>>(TokenOptions.DefaultEmailProvider);
var jwtIdentityOptions = provider.GetRequiredService<IOptions<JwtBearerIdentityOptions>>().Value; var jwtIdentityOptions = provider.GetRequiredService<IOptions<JwtBearerIdentityOptions>>().Value;

6
src/Core/Services/Implementations/UserService.cs
View File

@ -273,13 +273,13 @@ namespace Bit.Core.Services
return IdentityResult.Failed(_identityErrorDescriber.PasswordMismatch()); return IdentityResult.Failed(_identityErrorDescriber.PasswordMismatch());
} }
public async Task GetTwoFactorAsync(User user, Enums.TwoFactorProviderType provider) public async Task GetTwoFactorAsync(User user, TwoFactorProviderType provider)
{ {
if(user.TwoFactorEnabled && user.TwoFactorProvider.HasValue && user.TwoFactorProvider.Value == provider) if(user.TwoFactorEnabled && user.TwoFactorProvider.HasValue && user.TwoFactorProvider.Value == provider)
{ {
switch(provider) switch(provider)
{ {
case Enums.TwoFactorProviderType.Authenticator: case TwoFactorProviderType.Authenticator:
if(!string.IsNullOrWhiteSpace(user.AuthenticatorKey)) if(!string.IsNullOrWhiteSpace(user.AuthenticatorKey))
{ {
return; return;
@ -296,7 +296,7 @@ namespace Bit.Core.Services
switch(provider) switch(provider)
{ {
case Enums.TwoFactorProviderType.Authenticator: case TwoFactorProviderType.Authenticator:
var key = KeyGeneration.GenerateRandomKey(20); var key = KeyGeneration.GenerateRandomKey(20);
user.AuthenticatorKey = Base32Encoding.ToString(key); user.AuthenticatorKey = Base32Encoding.ToString(key);
break; break;