From 8dc8b681bb946954ae023d61fac4b9dab73d1a38 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Wed, 24 Jan 2024 12:23:09 -0500 Subject: [PATCH] Vault/pm 4185/checksum uris (#3418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add checksum to Login Uri models * Revert "Revert "Add checksum to Login Uri models (#3318)" (#3417)" This reverts commit b44887d125f8100410a987447a7dc342d22eaf83. * PM-4810 Bumped up minimum version --------- Co-authored-by: Carlos Gonçalves Co-authored-by: bnagawiecki <107435978+bnagawiecki@users.noreply.github.com> Co-authored-by: Carlos Gonçalves --- src/Api/Vault/Models/CipherLoginModel.cs | 6 +++++- src/Core/Constants.cs | 2 +- src/Core/Vault/Models/Data/CipherLoginData.cs | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Api/Vault/Models/CipherLoginModel.cs b/src/Api/Vault/Models/CipherLoginModel.cs index d1ea167513..9580ebfed4 100644 --- a/src/Api/Vault/Models/CipherLoginModel.cs +++ b/src/Api/Vault/Models/CipherLoginModel.cs @@ -74,17 +74,21 @@ public class CipherLoginModel public CipherLoginUriModel(CipherLoginData.CipherLoginUriData uri) { Uri = uri.Uri; + UriChecksum = uri.UriChecksum; Match = uri.Match; } [EncryptedString] [EncryptedStringLength(10000)] public string Uri { get; set; } + [EncryptedString] + [EncryptedStringLength(10000)] + public string UriChecksum { get; set; } public UriMatchType? Match { get; set; } = null; public CipherLoginData.CipherLoginUriData ToCipherLoginUriData() { - return new CipherLoginData.CipherLoginUriData { Uri = Uri, Match = Match, }; + return new CipherLoginData.CipherLoginUriData { Uri = Uri, UriChecksum = UriChecksum, Match = Match, }; } } } diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs index 3f5d618e6c..7b1524aa5b 100644 --- a/src/Core/Constants.cs +++ b/src/Core/Constants.cs @@ -23,7 +23,7 @@ public static class Constants public const string Fido2KeyCipherMinimumVersion = "2023.10.0"; - public const string CipherKeyEncryptionMinimumVersion = "2023.9.2"; + public const string CipherKeyEncryptionMinimumVersion = "2023.12.0"; /// /// Used by IdentityServer to identify our own provider. diff --git a/src/Core/Vault/Models/Data/CipherLoginData.cs b/src/Core/Vault/Models/Data/CipherLoginData.cs index e952b39cf2..e2d1776abd 100644 --- a/src/Core/Vault/Models/Data/CipherLoginData.cs +++ b/src/Core/Vault/Models/Data/CipherLoginData.cs @@ -26,6 +26,7 @@ public class CipherLoginData : CipherData public CipherLoginUriData() { } public string Uri { get; set; } + public string UriChecksum { get; set; } public UriMatchType? Match { get; set; } = null; } }