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

verify all 2fa methods

Browse Source
This commit is contained in:
Kyle Spearrin 2017-06-20 14:50:12 -04:00
parent 69de88cc32
commit c13ba70ab4
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs
View File

@ -10,6 +10,7 @@ using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;
using Bit.Core.Services;
using System.Linq;
namespace Bit.Core.IdentityServer
{
@ -18,15 +19,18 @@ namespace Bit.Core.IdentityServer
private UserManager<User> _userManager;
private readonly IDeviceRepository _deviceRepository;
private readonly IDeviceService _deviceService;
private readonly IUserService _userService;
public ResourceOwnerPasswordValidator(
UserManager<User> userManager,
IDeviceRepository deviceRepository,
IDeviceService deviceService)
IDeviceService deviceService,
IUserService userService)
{
_userManager = userManager;
_deviceRepository = deviceRepository;
_deviceService = deviceService;
_userService = userService;
}
public async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
@ -55,8 +59,7 @@ namespace Bit.Core.IdentityServer
return;
}
if(!twoFactorRequest ||
await _userManager.VerifyTwoFactorTokenAsync(user, twoFactorProviderType.ToString(), twoFactorToken))
if(!twoFactorRequest || await VerifyTwoFactor(user, twoFactorProviderType, twoFactorToken))
{
var device = await SaveDeviceAsync(user, context);
BuildSuccessResult(user, context, device);
@ -98,17 +101,19 @@ namespace Bit.Core.IdentityServer
private void BuildTwoFactorResult(User user, ResourceOwnerPasswordValidationContext context)
{
var providers = new List<byte>();
if(user.TwoFactorProvider.HasValue)
var providerKeys = new List<byte>();
var providers = new Dictionary<byte, Dictionary<string, object>>();
foreach(var provider in user.GetTwoFactorProviders().Where(p => p.Value.Enabled))
{
providers.Add((byte)user.TwoFactorProvider.Value);
providerKeys.Add((byte)provider.Key);
providers.Add((byte)provider.Key, null);
}
context.Result = new GrantValidationResult(TokenRequestErrors.InvalidGrant, "Two factor required.",
new Dictionary<string, object>
{
{ "TwoFactorProviders", providers },
{ "TwoFactorProvider", (byte)user.TwoFactorProvider.Value }
{ "TwoFactorProviders", providers.Keys },
{ "TwoFactorProviders2", providers }
});
}
@ -152,6 +157,22 @@ namespace Bit.Core.IdentityServer
};
}
private async Task<bool> VerifyTwoFactor(User user, TwoFactorProviderType type, string token)
{
switch(type)
{
case TwoFactorProviderType.Authenticator:
case TwoFactorProviderType.Duo:
case TwoFactorProviderType.YubiKey:
case TwoFactorProviderType.U2F:
return await _userManager.VerifyTwoFactorTokenAsync(user, type.ToString(), token);
case TwoFactorProviderType.Email:
return await _userService.VerifyTwoFactorEmailAsync(user, token);
default:
return false;
}
}
private async Task<Device> SaveDeviceAsync(User user, ResourceOwnerPasswordValidationContext context)
{
var device = GetDeviceFromRequest(context);