bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-19 01:33:22 +00:00
Code Issues Releases Wiki Activity

[PM-2713] refresh pin key when setting user key

Browse Source
This commit is contained in:
Jacob Fink
2023-07-18 13:03:30 -04:00
parent 5ba3fac0c0
commit d58f0b281b
4 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Core/Services/CryptoService.cs
View File

@@ -36,9 +36,15 @@ namespace Bit.Core.Services
_cryptoFunctionService = cryptoFunctionService;
}
public async Task SetUserKeyAsync(UserKey userKey)
public async Task SetUserKeyAsync(UserKey userKey, string userId = null)
{
await _stateService.SetUserKeyAsync(userKey);
await _stateService.SetUserKeyAsync(userKey, userId);
// Refresh the Pin Key if the user has a Pin set
if (await _stateService.GetProtectedPinAsync(userId) != null)
{
await StorePinKey(userKey, userId);
}
}
public async Task<UserKey> GetUserKeyAsync(string userId = null)
@@ -610,6 +616,25 @@ namespace Bit.Core.Services
// Helpers
private async Task StorePinKey(UserKey userKey, string userId = null)
{
var pin = await DecryptToUtf8Async(new EncString(await _stateService.GetProtectedPinAsync(userId)));
var pinKey = await MakePinKeyAsync(
pin,
await _stateService.GetEmailAsync(userId),
await _stateService.GetActiveUserCustomDataAsync(a => new KdfConfig(a?.Profile))
);
var encPin = await EncryptAsync(userKey.Key, pinKey);
// TODO(Jake): Does this logic make sense? Should we save something in state to indicate the preference?
if (await _stateService.GetUserKeyPinAsync(userId) != null)
{
await _stateService.SetUserKeyPinAsync(encPin, userId);
return;
}
await _stateService.SetUserKeyPinEphemeralAsync(encPin, userId);
}
private async Task<EncryptedObject> AesEncryptAsync(byte[] data, SymmetricCryptoKey key)
{
var obj = new EncryptedObject