bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-02-04 02:05:30 -06:00
Code Issues Packages Projects Releases 211 Wiki Activity

feat(emergency-access): [PM-31636] Emergency Access Takeover Salt - Added salt to response of emergency access takeover response.

Browse Source
This commit is contained in:
Patrick Pimentel 2026-02-02 21:00:56 -05:00
parent d3aed59fcb
commit d5aac9bac1
No known key found for this signature in database
GPG Key ID: 4B27FC74C6422186
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Auth/Models/Response/EmergencyAccessResponseModel.cs
View File

@ -112,6 +112,7 @@ public class EmergencyAccessTakeoverResponseModel : ResponseModel
KdfIterations = grantor.KdfIterations;
KdfMemory = grantor.KdfMemory;
KdfParallelism = grantor.KdfParallelism;
Salt = grantor.GetMasterPasswordSalt();
}
public int KdfIterations { get; private set; }
@ -119,6 +120,7 @@ public class EmergencyAccessTakeoverResponseModel : ResponseModel
public int? KdfParallelism { get; private set; }
public KdfType Kdf { get; private set; }
public string KeyEncrypted { get; private set; }
public string Salt { get; private set; }
}
public class EmergencyAccessViewResponseModel : ResponseModel

2
src/Core/Entities/User.cs
View File

@ -51,7 +51,7 @@ public class User : ITableObject<Guid>, IStorableSubscriber, IRevisable, ITwoFac
public string? Key { get; set; }
/// <summary>
/// The raw public key, without a signature from the user's signature key.
/// </summary>
/// </summary>
public string? PublicKey { get; set; }
/// <summary>
/// User key wrapped private key.