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

[Innovation/OPAQUE] Add entity framework impl (#5523)

Browse Source 
* Add prelogin response

* Fix test

* Fix more tests

* Fix tests

* Fix SQL warnings

* Fix difference between migration and sql SP

* Attempt to fix tests

* Attempt to fix tests

* Attempt to fix

* Fix namespace

* Attempt to fix error

* Fix different SP / migration

* Attempt to fix migration

* Fix

* Fix

* Add ef impl
This commit is contained in:
Bernd Schoolmann 2025-03-21 10:24:37 +01:00 committed by GitHub
parent c1614bf3a6
commit 5016ece4ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Infrastructure.EntityFramework/Auth/Repositories/OpaqueKeyExchangeCredentialRepository.cs
View File

@ -3,19 +3,25 @@ using Bit.Core.Auth.Entities;
using Bit.Core.Auth.Models.Data; using Bit.Core.Auth.Models.Data;
using Bit.Core.Auth.Repositories; using Bit.Core.Auth.Repositories;
using Bit.Core.KeyManagement.UserKey; using Bit.Core.KeyManagement.UserKey;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace Bit.Infrastructure.EntityFramework.Repositories; namespace Bit.Infrastructure.EntityFramework.Repositories;
public class OpaqueKeyExchangeCredentialRepository : Repository<OpaqueKeyExchangeCredential, OpaqueKeyExchangeCredential, Guid>, IOpaqueKeyExchangeCredentialRepository public class OpaqueKeyExchangeCredentialRepository : Repository<OpaqueKeyExchangeCredential, OpaqueKeyExchangeCredential, Guid>, IOpaqueKeyExchangeCredentialRepository
{ {
public OpaqueKeyExchangeCredentialRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => null) public OpaqueKeyExchangeCredentialRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper) : base(serviceScopeFactory, mapper, (DatabaseContext context) => context.OpaqueKeyExchangeCredentials)
{ {
} }
public Task<OpaqueKeyExchangeCredential> GetByUserIdAsync(Guid userId) public async Task<OpaqueKeyExchangeCredential> GetByUserIdAsync(Guid userId)
{ {
return null; using (var scope = ServiceScopeFactory.CreateScope())
{
var dbContext = GetDatabaseContext(scope);
var opaqueConfig = await GetDbSet(dbContext).SingleOrDefaultAsync(sc => sc.UserId == userId);
return Mapper.Map<OpaqueKeyExchangeCredential>(opaqueConfig);
}
} }
public UpdateEncryptedDataForKeyRotation UpdateKeysForRotationAsync(Guid userId, IEnumerable<OpaqueKeyExchangeRotateKeyData> credentials) public UpdateEncryptedDataForKeyRotation UpdateKeysForRotationAsync(Guid userId, IEnumerable<OpaqueKeyExchangeRotateKeyData> credentials)
{ {

4
src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
View File

@ -51,6 +51,7 @@ public class DatabaseContext : DbContext
public DbSet<Group> Groups { get; set; } public DbSet<Group> Groups { get; set; }
public DbSet<GroupUser> GroupUsers { get; set; } public DbSet<GroupUser> GroupUsers { get; set; }
public DbSet<Installation> Installations { get; set; } public DbSet<Installation> Installations { get; set; }
public DbSet<Core.Auth.Entities.OpaqueKeyExchangeCredential> OpaqueKeyExchangeCredentials { get; set; }
public DbSet<Organization> Organizations { get; set; } public DbSet<Organization> Organizations { get; set; }
public DbSet<OrganizationApiKey> OrganizationApiKeys { get; set; } public DbSet<OrganizationApiKey> OrganizationApiKeys { get; set; }
public DbSet<OrganizationSponsorship> OrganizationSponsorships { get; set; } public DbSet<OrganizationSponsorship> OrganizationSponsorships { get; set; }
@ -106,6 +107,7 @@ public class DatabaseContext : DbContext
var eSsoConfig = builder.Entity<SsoConfig>(); var eSsoConfig = builder.Entity<SsoConfig>();
var eTaxRate = builder.Entity<TaxRate>(); var eTaxRate = builder.Entity<TaxRate>();
var eUser = builder.Entity<User>(); var eUser = builder.Entity<User>();
var eOpaqueCredential = builder.Entity<Core.Auth.Entities.OpaqueKeyExchangeCredential>();
var eOrganizationApiKey = builder.Entity<OrganizationApiKey>(); var eOrganizationApiKey = builder.Entity<OrganizationApiKey>();
var eOrganizationConnection = builder.Entity<OrganizationConnection>(); var eOrganizationConnection = builder.Entity<OrganizationConnection>();
var eOrganizationDomain = builder.Entity<OrganizationDomain>(); var eOrganizationDomain = builder.Entity<OrganizationDomain>();
@ -122,6 +124,7 @@ public class DatabaseContext : DbContext
eProvider.Property(c => c.Id).ValueGeneratedNever(); eProvider.Property(c => c.Id).ValueGeneratedNever();
eProviderUser.Property(c => c.Id).ValueGeneratedNever(); eProviderUser.Property(c => c.Id).ValueGeneratedNever();
eProviderOrganization.Property(c => c.Id).ValueGeneratedNever(); eProviderOrganization.Property(c => c.Id).ValueGeneratedNever();
eOpaqueCredential.Property(c => c.Id).ValueGeneratedNever();
eOrganizationApiKey.Property(c => c.Id).ValueGeneratedNever(); eOrganizationApiKey.Property(c => c.Id).ValueGeneratedNever();
eOrganizationConnection.Property(c => c.Id).ValueGeneratedNever(); eOrganizationConnection.Property(c => c.Id).ValueGeneratedNever();
eOrganizationDomain.Property(ar => ar.Id).ValueGeneratedNever(); eOrganizationDomain.Property(ar => ar.Id).ValueGeneratedNever();
@ -162,6 +165,7 @@ public class DatabaseContext : DbContext
eProviderOrganization.ToTable(nameof(ProviderOrganization)); eProviderOrganization.ToTable(nameof(ProviderOrganization));
eSsoConfig.ToTable(nameof(SsoConfig)); eSsoConfig.ToTable(nameof(SsoConfig));
eTaxRate.ToTable(nameof(TaxRate)); eTaxRate.ToTable(nameof(TaxRate));
eOpaqueCredential.ToTable(nameof(Core.Auth.Entities.OpaqueKeyExchangeCredential));
eOrganizationApiKey.ToTable(nameof(OrganizationApiKey)); eOrganizationApiKey.ToTable(nameof(OrganizationApiKey));
eOrganizationConnection.ToTable(nameof(OrganizationConnection)); eOrganizationConnection.ToTable(nameof(OrganizationConnection));
eOrganizationDomain.ToTable(nameof(OrganizationDomain)); eOrganizationDomain.ToTable(nameof(OrganizationDomain));