dan/Walleby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
TheXamlGuy
2024-04-30 20:46:47 +01:00
parent 2a4194ee22
commit 81f266d8c4
22 changed files with 296 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault/CreateVaultStorageHandler.cs
+75 -59
View File
@@ -1,73 +1,89 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Hosting;
using System.Security.Cryptography;
using Toolkit.Foundation;
//using Microsoft.EntityFrameworkCore;
//using Microsoft.Extensions.Hosting;
//using Toolkit.Foundation;
namespace Bitvault;
//namespace Bitvault;
public class CreateVaultStorageHandler(IHostEnvironment environment,
IKeyDeriver deriver,
IEncryptor encryptor,
IDecryptor decryptor,
IDbContextFactory<VaultDbContext> dbContextFactory) : IHandler<Create<VaultStorage>, bool>
{
public async Task<bool> Handle(Create<VaultStorage> args, CancellationToken cancellationToken)
{
if (args.Value is VaultStorage vault)
{
if (vault.Name is { Length: > 0 } name && vault.Password is { Length: > 0 } password)
{
byte[] salt = new byte[16];
RandomNumberGenerator.Fill(salt);
//public class CreateVaultStorageHandler(IHostEnvironment environment,
// IKeyGenerator generator,
// IKeyDeriver deriver,
// IEncryptor encryptor,
// IDecryptor decryptor,
// IDbContextFactory<VaultDbContext> dbContextFactory,
// IWritableConfiguration<VaultConfiguration> writer) : IHandler<Create<VaultStorage>, bool>
//{
// public async Task<bool> Handle(Create<VaultStorage> args, CancellationToken cancellationToken)
// {
// if (args.Value is VaultStorage vault)
// {
// if (vault.Name is { Length: > 0 } name && vault.Password is { Length: > 0 } password)
// {
// byte[] salt = generator.Generate(16);
// byte[] key = generator.Generate(32);
byte[] key = new byte[32];
RandomNumberGenerator.Fill(key);
// byte[] derivedKey = deriver.DeriveKey(password, salt);
byte[] derivedKey = deriver.DeriveKey(password, salt);
string? encryptedKey = encryptor.Encrypt(Convert.ToBase64String(key), derivedKey);
// byte[] encryptedKey = encryptor.Encrypt(key, derivedKey);
// byte[] decryptedKey = decryptor.Decrypt(encryptedKey, derivedKey);
// Array.Clear(encryptedKey, 0, encryptedKey.Length);
// using VaultDbContext context = dbContextFactory.CreateDbContext();
// context.Database.SetConnectionString($"Data Source={Path.Combine(environment.ContentRootPath, name)}.vault;Mode=ReadWriteCreate;Password={Convert.ToBase64String(decryptedKey)}");
// try
// {
// await context.Database.EnsureCreatedAsync(cancellationToken);
// writer.Write(args =>
// {
// var f = args.Name;
// });
// }
// catch
// {
// }
// Array.Clear(decryptedKey, 0, decryptedKey.Length);
// // Derive the key for encryption
// //byte[] encryptionKey = deriver.DeriveKey(password, salt);
// //// Derive the key for decryption
// //byte[] decryptionKey = deriver.DeriveKey(password, salt);
// //// Compare keys to ensure they're the same
// //bool areKeysEqual = encryptionKey.SequenceEqual(decryptionKey);
// ////byte[] derivedKey = deriver.DeriveKey(password, salt);
// //string? encrypted = encryptor.Encrypt(password, derivedKey);
// //var storedSalt = Convert.ToBase64String(salt);
byte[] derivedKey2 = deriver.DeriveKey(password, salt);
var dod = decryptor.Decrypt(encryptedKey, derivedKey2);
// //byte[] derivedKey2 = deriver.DeriveKey(password, salt);
// Derive the key for encryption
// //var d = decryptor.Decrypt(encrypted, derivedKey2);
//byte[] encryptionKey = deriver.DeriveKey(password, salt);
// // Generate a hash
// //string hash = hasher.HashPassword(password);
//// Derive the key for decryption
//byte[] decryptionKey = deriver.DeriveKey(password, salt);
// //string[] parts = hash.Split(':');
//// Compare keys to ensure they're the same
//bool areKeysEqual = encryptionKey.SequenceEqual(decryptionKey);
// //// Store the salt only
// //string storedSalt = parts[0];
////byte[] derivedKey = deriver.DeriveKey(password, salt);
//string? encrypted = encryptor.Encrypt(password, derivedKey);
// //// Use the hash as the password
// //string storedHash = parts[1];
//var storedSalt = Convert.ToBase64String(salt);
// //context.Database.SetConnectionString($"Data Source={Path.Combine(environment.ContentRootPath, name)}.vault;Mode=ReadWriteCreate;Password={storedHash}");
// //await context.Database.EnsureCreatedAsync();
// return true;
// }
// }
//byte[] derivedKey2 = deriver.DeriveKey(password, salt);
//var d = decryptor.Decrypt(encrypted, derivedKey2);
// Generate a hash
//string hash = hasher.HashPassword(password);
//string[] parts = hash.Split(':');
//// Store the salt only
//string storedSalt = parts[0];
//// Use the hash as the password
//string storedHash = parts[1];
//context.Database.SetConnectionString($"Data Source={Path.Combine(environment.ContentRootPath, name)}.vault;Mode=ReadWriteCreate;Password={storedHash}");
//await context.Database.EnsureCreatedAsync();
return true;
}
}
return false;
}
}
// return false;
// }
//}