nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 02:58:12 -05:00
Code

added nfc flag for yubikey config

Browse Source
This commit is contained in:
Kyle Spearrin 2017-06-29 12:34:10 -04:00
parent 205a6d14a6
commit a1008353fd
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Startup.cs
View File

@ -164,7 +164,7 @@ namespace Bit.Api
app.UseIdentityServerAuthentication( app.UseIdentityServerAuthentication(
GetIdentityOptions(env, IdentityServerAuthority(env, "identity", "33656"), "3")); GetIdentityOptions(env, IdentityServerAuthority(env, "identity", "33656"), "3"));
app.UseIdentityServerAuthentication( app.UseIdentityServerAuthentication(
GetIdentityOptions(env, IdentityServerAuthority(env, "api", "4001"), "2")); GetIdentityOptions(env, IdentityServerAuthority(env, "api", "4000"), "2"));
// Add current context // Add current context
app.UseMiddleware<CurrentContextMiddleware>(); app.UseMiddleware<CurrentContextMiddleware>();
@ -204,8 +204,8 @@ namespace Bit.Api
} }
else else
{ {
return $"http://localhost:{port}"; //return $"http://localhost:{port}";
//return $"http://192.168.1.6:{port}"; // Desktop external return $"http://192.168.1.6:{port}"; // Desktop external
} }
} }
} }

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

@ -40,13 +40,15 @@ namespace Bit.Core.IdentityServer
var twoFactorProvider = context.Request.Raw["TwoFactorProvider"]?.ToString(); var twoFactorProvider = context.Request.Raw["TwoFactorProvider"]?.ToString();
var twoFactorRemember = context.Request.Raw["TwoFactorRemember"]?.ToString() == "1"; var twoFactorRemember = context.Request.Raw["TwoFactorRemember"]?.ToString() == "1";
var twoFactorRequest = !string.IsNullOrWhiteSpace(twoFactorToken) && !string.IsNullOrWhiteSpace(twoFactorProvider); var twoFactorRequest = !string.IsNullOrWhiteSpace(twoFactorToken) && !string.IsNullOrWhiteSpace(twoFactorProvider);
var credentialsCorrect = false;
if(!string.IsNullOrWhiteSpace(context.UserName)) if(!string.IsNullOrWhiteSpace(context.UserName))
{ {
var user = await _userManager.FindByEmailAsync(context.UserName.ToLowerInvariant()); var user = await _userManager.FindByEmailAsync(context.UserName.ToLowerInvariant());
if(user != null) if(user != null)
{ {
if(await _userManager.CheckPasswordAsync(user, context.Password)) credentialsCorrect = await _userManager.CheckPasswordAsync(user, context.Password);
if(credentialsCorrect)
{ {
TwoFactorProviderType twoFactorProviderType = TwoFactorProviderType.Authenticator; // Just defaulting it TwoFactorProviderType twoFactorProviderType = TwoFactorProviderType.Authenticator; // Just defaulting it
if(!twoFactorRequest && await TwoFactorRequiredAsync(user)) if(!twoFactorRequest && await TwoFactorRequiredAsync(user))
@ -80,7 +82,7 @@ namespace Bit.Core.IdentityServer
} }
await Task.Delay(2000); // Delay for brute force. await Task.Delay(2000); // Delay for brute force.
BuildErrorResult(twoFactorRequest, context); BuildErrorResult(credentialsCorrect && twoFactorRequest, context);
} }
private async Task BuildSuccessResultAsync(User user, ResourceOwnerPasswordValidationContext context, Device device, private async Task BuildSuccessResultAsync(User user, ResourceOwnerPasswordValidationContext context, Device device,
@ -154,7 +156,7 @@ namespace Bit.Core.IdentityServer
customResponse: new Dictionary<string, object> customResponse: new Dictionary<string, object>
{{ {{
"ErrorModel", new ErrorResponseModel(twoFactorRequest ? "ErrorModel", new ErrorResponseModel(twoFactorRequest ?
"Code is not correct. Try again." : "Username or password is incorrect. Try again.") "Two-step token is invalid. Try again." : "Username or password is incorrect. Try again.")
}}); }});
} }
@ -213,6 +215,7 @@ namespace Bit.Core.IdentityServer
case TwoFactorProviderType.Duo: case TwoFactorProviderType.Duo:
case TwoFactorProviderType.U2f: case TwoFactorProviderType.U2f:
case TwoFactorProviderType.Email: case TwoFactorProviderType.Email:
case TwoFactorProviderType.YubiKey:
var token = await _userManager.GenerateTwoFactorTokenAsync(user, type.ToString()); var token = await _userManager.GenerateTwoFactorTokenAsync(user, type.ToString());
if(type == TwoFactorProviderType.Duo) if(type == TwoFactorProviderType.Duo)
{ {
@ -236,6 +239,13 @@ namespace Bit.Core.IdentityServer
["Email"] = RedactEmail((string)provider.MetaData["Email"]) ["Email"] = RedactEmail((string)provider.MetaData["Email"])
}; };
} }
else if(type == TwoFactorProviderType.YubiKey)
{
return new Dictionary<string, object>
{
["Nfc"] = (bool)provider.MetaData["Nfc"]
};
}
return null; return null;
default: default:
return null; return null;

5
src/Core/Models/Api/Request/TwoFactorRequestModels.cs
View File

@ -92,6 +92,8 @@ namespace Bit.Core.Models.Api
public string Key3 { get; set; } public string Key3 { get; set; }
public string Key4 { get; set; } public string Key4 { get; set; }
public string Key5 { get; set; } public string Key5 { get; set; }
[Required]
public bool? Nfc { get; set; }
public User ToUser(User extistingUser) public User ToUser(User extistingUser)
{ {
@ -113,7 +115,8 @@ namespace Bit.Core.Models.Api
["Key2"] = FormatKey(Key2), ["Key2"] = FormatKey(Key2),
["Key3"] = FormatKey(Key3), ["Key3"] = FormatKey(Key3),
["Key4"] = FormatKey(Key4), ["Key4"] = FormatKey(Key4),
["Key5"] = FormatKey(Key5) ["Key5"] = FormatKey(Key5),
["Nfc"] = Nfc.Value
}, },
Enabled = true Enabled = true
}); });

5
src/Core/Models/Api/Response/TwoFactor/TwoFactorYubiKeyResponseModel.cs
View File

@ -39,6 +39,10 @@ namespace Bit.Core.Models.Api
{ {
Key5 = (string)provider.MetaData["Key5"]; Key5 = (string)provider.MetaData["Key5"];
} }
if(provider.MetaData.ContainsKey("Nfc"))
{
Nfc = (bool)provider.MetaData["Nfc"];
}
} }
else else
{ {
@ -52,5 +56,6 @@ namespace Bit.Core.Models.Api
public string Key3 { get; set; } public string Key3 { get; set; }
public string Key4 { get; set; } public string Key4 { get; set; }
public string Key5 { get; set; } public string Key5 { get; set; }
public bool Nfc { get; set; }
} }
} }