mirror of
https://github.com/bitwarden/server.git
synced 2025-04-09 07:08:15 -05:00

* Get limited life attachment download URL This change limits url download to a 1min lifetime. This requires moving to a new container to allow for non-public blob access. Clients will have to call GetAttachmentData api function to receive the download URL. For backwards compatibility, attachment URLs are still present, but will not work for attachments stored in non-public access blobs. * Make GlobalSettings interface for testing * Test LocalAttachmentStorageService equivalence * Remove comment * Add missing globalSettings using * Simplify default attachment container * Default to attachments containe for existing methods A new upload method will be made for uploading to attachments-v2. For compatibility for clients which don't use these new methods, we need to still use the old container. The new container will be used only for new uploads * Remove Default MetaData fixture. * Keep attachments container blob-level security for all instances * Close unclosed FileStream * Favor default value for noop services
78 lines
2.8 KiB
C#
78 lines
2.8 KiB
C#
using System.Threading.Tasks;
|
|
using Bit.Core.Models.Table;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Utilities.Duo;
|
|
using Bit.Core.Models;
|
|
using Bit.Core.Settings;
|
|
|
|
namespace Bit.Core.Identity
|
|
{
|
|
public interface IOrganizationDuoWebTokenProvider : IOrganizationTwoFactorTokenProvider { }
|
|
|
|
public class OrganizationDuoWebTokenProvider : IOrganizationDuoWebTokenProvider
|
|
{
|
|
private readonly GlobalSettings _globalSettings;
|
|
|
|
public OrganizationDuoWebTokenProvider(GlobalSettings globalSettings)
|
|
{
|
|
_globalSettings = globalSettings;
|
|
}
|
|
|
|
public Task<bool> CanGenerateTwoFactorTokenAsync(Organization organization)
|
|
{
|
|
if (organization == null || !organization.Enabled || !organization.Use2fa)
|
|
{
|
|
return Task.FromResult(false);
|
|
}
|
|
|
|
var provider = organization.GetTwoFactorProvider(TwoFactorProviderType.OrganizationDuo);
|
|
var canGenerate = organization.TwoFactorProviderIsEnabled(TwoFactorProviderType.OrganizationDuo)
|
|
&& HasProperMetaData(provider);
|
|
return Task.FromResult(canGenerate);
|
|
}
|
|
|
|
public Task<string> GenerateAsync(Organization organization, User user)
|
|
{
|
|
if (organization == null || !organization.Enabled || !organization.Use2fa)
|
|
{
|
|
return Task.FromResult<string>(null);
|
|
}
|
|
|
|
var provider = organization.GetTwoFactorProvider(TwoFactorProviderType.OrganizationDuo);
|
|
if (!HasProperMetaData(provider))
|
|
{
|
|
return Task.FromResult<string>(null);
|
|
}
|
|
|
|
var signatureRequest = DuoWeb.SignRequest((string)provider.MetaData["IKey"],
|
|
(string)provider.MetaData["SKey"], _globalSettings.Duo.AKey, user.Email);
|
|
return Task.FromResult(signatureRequest);
|
|
}
|
|
|
|
public Task<bool> ValidateAsync(string token, Organization organization, User user)
|
|
{
|
|
if (organization == null || !organization.Enabled || !organization.Use2fa)
|
|
{
|
|
return Task.FromResult(false);
|
|
}
|
|
|
|
var provider = organization.GetTwoFactorProvider(TwoFactorProviderType.OrganizationDuo);
|
|
if (!HasProperMetaData(provider))
|
|
{
|
|
return Task.FromResult(false);
|
|
}
|
|
|
|
var response = DuoWeb.VerifyResponse((string)provider.MetaData["IKey"],
|
|
(string)provider.MetaData["SKey"], _globalSettings.Duo.AKey, token);
|
|
|
|
return Task.FromResult(response == user.Email);
|
|
}
|
|
|
|
private bool HasProperMetaData(TwoFactorProvider provider)
|
|
{
|
|
return provider?.MetaData != null && provider.MetaData.ContainsKey("IKey") &&
|
|
provider.MetaData.ContainsKey("SKey") && provider.MetaData.ContainsKey("Host");
|
|
}
|
|
}
|
|
}
|