nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-20 10:58:07 -05:00
Code

Merge branch 'km/db-signing-keys' into km/signing-api-changes

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-06 18:05:10 +02:00 committed by GitHub
commit 2e666cf556
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/KeyManagement/Entities/UserSignatureKeyPair.cs
View File

@ -1,5 +1,4 @@
using System.ComponentModel.DataAnnotations; using Bit.Core.Entities;
using Bit.Core.Entities;
using Bit.Core.KeyManagement.Enums; using Bit.Core.KeyManagement.Enums;
using Bit.Core.KeyManagement.Models.Data; using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.Utilities; using Bit.Core.Utilities;
@ -14,9 +13,7 @@ public class UserSignatureKeyPair : ITableObject<Guid>, IRevisable
public Guid UserId { get; set; } public Guid UserId { get; set; }
public SignatureAlgorithm SignatureAlgorithm { get; set; } public SignatureAlgorithm SignatureAlgorithm { get; set; }
[MaxLength(500)]
required public string VerifyingKey { get; set; } required public string VerifyingKey { get; set; }
[MaxLength(500)]
required public string SigningKey { get; set; } required public string SigningKey { get; set; }
public DateTime CreationDate { get; set; } = DateTime.UtcNow; public DateTime CreationDate { get; set; } = DateTime.UtcNow;

6
util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -1752,16 +1752,14 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<string>("SigningKey") b.Property<string>("SigningKey")
.IsRequired() .IsRequired()
.HasMaxLength(500) .HasColumnType("longtext");
.HasColumnType("varchar(500)");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
.HasColumnType("char(36)"); .HasColumnType("char(36)");
b.Property<string>("VerifyingKey") b.Property<string>("VerifyingKey")
.IsRequired() .IsRequired()
.HasMaxLength(500) .HasColumnType("longtext");
.HasColumnType("varchar(500)");
b.HasKey("Id"); b.HasKey("Id");

6
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -1758,16 +1758,14 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<string>("SigningKey") b.Property<string>("SigningKey")
.IsRequired() .IsRequired()
.HasMaxLength(500) .HasColumnType("text");
.HasColumnType("character varying(500)");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("VerifyingKey") b.Property<string>("VerifyingKey")
.IsRequired() .IsRequired()
.HasMaxLength(500) .HasColumnType("text");
.HasColumnType("character varying(500)");
b.HasKey("Id"); b.HasKey("Id");

2
util/SqliteMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -1741,7 +1741,6 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<string>("SigningKey") b.Property<string>("SigningKey")
.IsRequired() .IsRequired()
.HasMaxLength(500)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
@ -1749,7 +1748,6 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<string>("VerifyingKey") b.Property<string>("VerifyingKey")
.IsRequired() .IsRequired()
.HasMaxLength(500)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.HasKey("Id"); b.HasKey("Id");