bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-26 05:03:18 +00:00
Code Issues Releases Wiki Activity

Transactionally safe user password and email change updates.

Browse Source
This commit is contained in:
Kyle Spearrin
2016-02-21 00:15:17 -05:00
parent 1da53f0ecc
commit 1b3acec905
5 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Core/Repositories/SqlServer/CipherRepository.cs
View File

@@ -16,12 +16,7 @@ namespace Bit.Core.Repositories.SqlServer
: base(connectionString)
{ }
public Task DirtyCiphersAsync(string userId)
{
return Task.FromResult(0);
}
public Task UpdateDirtyCiphersAsync(IEnumerable<dynamic> ciphers)
public Task UpdateUserEmailPasswordAndCiphersAsync(User user, IEnumerable<dynamic> ciphers)
{
var cleanedCiphers = ciphers.Where(c => c is Cipher);
if(cleanedCiphers.Count() == 0)
@@ -29,9 +24,6 @@ namespace Bit.Core.Repositories.SqlServer
return Task.FromResult(0);
}
// Get the id of the expected user
var userId = ((Cipher)ciphers.First()).UserId;
using(var connection = new SqlConnection(ConnectionString))
{
connection.Open();
@@ -40,7 +32,19 @@ namespace Bit.Core.Repositories.SqlServer
{
try
{
// 1. Create temp tables to bulk copy into.
// 1. Update user.
using(var cmd = new SqlCommand("[dbo].[User_UpdateEmailPassword]", connection, transaction))
{
cmd.CommandType = CommandType.StoredProcedure;
cmd.Parameters.Add("@Id", SqlDbType.UniqueIdentifier).Value = new Guid(user.Id);
cmd.Parameters.Add("@Email", SqlDbType.NVarChar).Value = user.Email;
cmd.Parameters.Add("@MasterPassword", SqlDbType.NVarChar).Value = user.MasterPassword;
cmd.Parameters.Add("@SecurityStamp", SqlDbType.NVarChar).Value = user.SecurityStamp;
cmd.ExecuteNonQuery();
}
// 2. Create temp tables to bulk copy into.
var sqlCreateTemp = @"
SELECT TOP 0 *
@@ -56,7 +60,7 @@ namespace Bit.Core.Repositories.SqlServer
cmd.ExecuteNonQuery();
}
// 2. Bulk bopy into temp tables.
// 3. Bulk bopy into temp tables.
using(var bulkCopy = new SqlBulkCopy(connection, SqlBulkCopyOptions.KeepIdentity, transaction))
{
@@ -82,7 +86,7 @@ namespace Bit.Core.Repositories.SqlServer
bulkCopy.WriteToServer(dataTable);
}
// 3. Insert into real tables from temp tables and clean up.
// 4. Insert into real tables from temp tables and clean up.
var sqlUpdate = @"
UPDATE
@@ -123,7 +127,7 @@ namespace Bit.Core.Repositories.SqlServer
using(var cmd = new SqlCommand(sqlUpdate, connection, transaction))
{
cmd.Parameters.Add("@UserId", SqlDbType.UniqueIdentifier).Value = new Guid(userId);
cmd.Parameters.Add("@UserId", SqlDbType.UniqueIdentifier).Value = new Guid(user.Id);
cmd.ExecuteNonQuery();
}