nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

Vault/pm 4185/checksum uris (#3418)

Browse Source 
* Add checksum to Login Uri models

* Revert "Revert "Add checksum to Login Uri models (#3318)" (#3417)"

This reverts commit b44887d125.

* PM-4810 Bumped up minimum version

---------

Co-authored-by: Carlos Gonçalves <cgoncalves@bitwarden.com>
Co-authored-by: bnagawiecki <107435978+bnagawiecki@users.noreply.github.com>
Co-authored-by: Carlos Gonçalves <carlosmaccam@gmail.com>
This commit is contained in:
Matt Gibson
2024-01-24 12:23:09 -05:00
committed by GitHub
parent 99762667e9
commit 8dc8b681bb
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Vault/Models/CipherLoginModel.cs
View File

@ -74,17 +74,21 @@ public class CipherLoginModel
public CipherLoginUriModel(CipherLoginData.CipherLoginUriData uri) public CipherLoginUriModel(CipherLoginData.CipherLoginUriData uri)
{ {
Uri = uri.Uri; Uri = uri.Uri;
UriChecksum = uri.UriChecksum;
Match = uri.Match; Match = uri.Match;
} }
[EncryptedString] [EncryptedString]
[EncryptedStringLength(10000)] [EncryptedStringLength(10000)]
public string Uri { get; set; } public string Uri { get; set; }
[EncryptedString]
[EncryptedStringLength(10000)]
public string UriChecksum { get; set; }
public UriMatchType? Match { get; set; } = null; public UriMatchType? Match { get; set; } = null;
public CipherLoginData.CipherLoginUriData ToCipherLoginUriData() public CipherLoginData.CipherLoginUriData ToCipherLoginUriData()
{ {
return new CipherLoginData.CipherLoginUriData { Uri = Uri, Match = Match, }; return new CipherLoginData.CipherLoginUriData { Uri = Uri, UriChecksum = UriChecksum, Match = Match, };
} }
} }
} }

2
src/Core/Constants.cs
View File

@ -23,7 +23,7 @@ public static class Constants
public const string Fido2KeyCipherMinimumVersion = "2023.10.0"; public const string Fido2KeyCipherMinimumVersion = "2023.10.0";
public const string CipherKeyEncryptionMinimumVersion = "2023.9.2"; public const string CipherKeyEncryptionMinimumVersion = "2023.12.0";
/// <summary> /// <summary>
/// Used by IdentityServer to identify our own provider. /// Used by IdentityServer to identify our own provider.

1
src/Core/Vault/Models/Data/CipherLoginData.cs
View File

@ -26,6 +26,7 @@ public class CipherLoginData : CipherData
public CipherLoginUriData() { } public CipherLoginUriData() { }
public string Uri { get; set; } public string Uri { get; set; }
public string UriChecksum { get; set; }
public UriMatchType? Match { get; set; } = null; public UriMatchType? Match { get; set; } = null;
} }
} }