diff --git a/src/AliasVault.Admin/AliasVault.Admin.csproj b/src/AliasVault.Admin/AliasVault.Admin.csproj index 72bd686ee..fee0f8510 100644 --- a/src/AliasVault.Admin/AliasVault.Admin.csproj +++ b/src/AliasVault.Admin/AliasVault.Admin.csproj @@ -11,12 +11,12 @@ - bin\Debug\net8.0\AliasVault.Admin.xml + bin\Debug\net9.0\AliasVault.Admin.xml true - bin\Release\net8.0\AliasVault.Admin.xml + bin\Release\net9.0\AliasVault.Admin.xml true diff --git a/src/AliasVault.Admin/Program.cs b/src/AliasVault.Admin/Program.cs index 23e8ef30d..7e1892f88 100644 --- a/src/AliasVault.Admin/Program.cs +++ b/src/AliasVault.Admin/Program.cs @@ -84,7 +84,7 @@ builder.Services.AddIdentityCore(options => .AddSignInManager() .AddDefaultTokenProviders(); -builder.Services.AddAliasVaultDataProtection("AliasVault.Admin"); +/*builder.Services.AddAliasVaultDataProtection("AliasVault.Admin");*/ builder.Services.Configure(options => { diff --git a/src/AliasVault.Api/Program.cs b/src/AliasVault.Api/Program.cs index 0369019d6..bad7be908 100644 --- a/src/AliasVault.Api/Program.cs +++ b/src/AliasVault.Api/Program.cs @@ -40,7 +40,7 @@ builder.Services.AddLogging(logging => }); builder.Services.AddAliasVaultSqliteConfiguration(); -builder.Services.AddAliasVaultDataProtection("AliasVault.Api"); +/*builder.Services.AddAliasVaultDataProtection("AliasVault.Api"); */ builder.Services.AddIdentity(options => { diff --git a/src/AliasVault.Client/AliasVault.Client.csproj b/src/AliasVault.Client/AliasVault.Client.csproj index 89ea72d17..2387cf4f4 100644 --- a/src/AliasVault.Client/AliasVault.Client.csproj +++ b/src/AliasVault.Client/AliasVault.Client.csproj @@ -11,14 +11,14 @@ - bin\Debug\net8.0\AliasVault.Client.xml + bin\Debug\net9.0\AliasVault.Client.xml true dev true - bin\Release\net8.0\AliasVault.Client.xml + bin\Release\net9.0\AliasVault.Client.xml true True $([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss")) diff --git a/src/Databases/AliasClientDb/AliasClientDb.csproj b/src/Databases/AliasClientDb/AliasClientDb.csproj index a3cc87379..71c2191a8 100644 --- a/src/Databases/AliasClientDb/AliasClientDb.csproj +++ b/src/Databases/AliasClientDb/AliasClientDb.csproj @@ -8,13 +8,13 @@ - bin\Debug\net8.0\AliasClientDb.xml + bin\Debug\net9.0\AliasClientDb.xml true true - bin\Release\net8.0\AliasClientDb.xml + bin\Release\net9.0\AliasClientDb.xml diff --git a/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj b/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj index 862293c40..cb882c5df 100644 --- a/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj +++ b/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.Generators.Identity.xml + bin\Debug\net9.0\AliasVault.Generators.Identity.xml true - bin\Release\net8.0\AliasVault.Generators.Identity.xml + bin\Release\net9.0\AliasVault.Generators.Identity.xml true diff --git a/src/Generators/AliasVault.Generators.Password/AliasVault.Generators.Password.csproj b/src/Generators/AliasVault.Generators.Password/AliasVault.Generators.Password.csproj index 86019becc..ab03af5e9 100644 --- a/src/Generators/AliasVault.Generators.Password/AliasVault.Generators.Password.csproj +++ b/src/Generators/AliasVault.Generators.Password/AliasVault.Generators.Password.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.Generators.Password.xml + bin\Debug\net9.0\AliasVault.Generators.Password.xml true - bin\Release\net8.0\AliasVault.Generators.Password.xml + bin\Release\net9.0\AliasVault.Generators.Password.xml true diff --git a/src/Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj b/src/Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj index 7db2abc79..af8e4167b 100644 --- a/src/Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj +++ b/src/Services/AliasVault.SmtpService/AliasVault.SmtpService.csproj @@ -12,12 +12,12 @@ true - bin\Debug\net8.0\AliasVault.SmtpService.xml + bin\Debug\net9.0\AliasVault.SmtpService.xml true - bin\Release\net8.0\AliasVault.SmtpService.xml + bin\Release\net9.0\AliasVault.SmtpService.xml diff --git a/src/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csproj b/src/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csproj index d44f2214f..89c6fe626 100644 --- a/src/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csproj +++ b/src/Shared/AliasVault.RazorComponents/AliasVault.RazorComponents.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.RazorComponents.xml + bin\Debug\net9.0\AliasVault.RazorComponents.xml true - bin\Release\net8.0\AliasVault.RazorComponents.xml + bin\Release\net9.0\AliasVault.RazorComponents.xml true diff --git a/src/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csproj b/src/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csproj index 5df750825..3847acece 100644 --- a/src/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csproj +++ b/src/Shared/AliasVault.Shared.Core/AliasVault.Shared.Core.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.Shared.Core.xml + bin\Debug\net9.0\AliasVault.Shared.Core.xml true - bin\Release\net8.0\AliasVault.Shared.Core.xml + bin\Release\net9.0\AliasVault.Shared.Core.xml true diff --git a/src/Shared/AliasVault.Shared/AliasVault.Shared.csproj b/src/Shared/AliasVault.Shared/AliasVault.Shared.csproj index a74ac1915..72b3c251b 100644 --- a/src/Shared/AliasVault.Shared/AliasVault.Shared.csproj +++ b/src/Shared/AliasVault.Shared/AliasVault.Shared.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.Shared.xml + bin\Debug\net9.0\AliasVault.Shared.xml true - bin\Release\net8.0\AliasVault.Shared.xml + bin\Release\net9.0\AliasVault.Shared.xml true diff --git a/src/Tests/AliasVault.E2ETests/AliasVault.E2ETests.csproj b/src/Tests/AliasVault.E2ETests/AliasVault.E2ETests.csproj index 8cc1cbaea..cdef84db0 100644 --- a/src/Tests/AliasVault.E2ETests/AliasVault.E2ETests.csproj +++ b/src/Tests/AliasVault.E2ETests/AliasVault.E2ETests.csproj @@ -11,13 +11,13 @@ true - bin\Debug\net8.0\AliasVault.E2ETests.xml + bin\Debug\net9.0\AliasVault.E2ETests.xml TRACE true - bin\Release\net8.0\AliasVault.E2ETests.xml + bin\Release\net9.0\AliasVault.E2ETests.xml TRACE diff --git a/src/Tests/AliasVault.E2ETests/Common/AdminPlaywrightTest.cs b/src/Tests/AliasVault.E2ETests/Common/AdminPlaywrightTest.cs index ebd74393d..7941d0a87 100644 --- a/src/Tests/AliasVault.E2ETests/Common/AdminPlaywrightTest.cs +++ b/src/Tests/AliasVault.E2ETests/Common/AdminPlaywrightTest.cs @@ -14,8 +14,8 @@ using AliasServerDb; /// public class AdminPlaywrightTest : PlaywrightTest { - private static readonly int _basePort = 5700; - private static int _currentPort = _basePort; + private const int BasePort = 5700; + private static int _currentPort = BasePort; /// /// For starting the Admin project in-memory. diff --git a/src/Tests/AliasVault.E2ETests/Common/ClientPlaywrightTest.cs b/src/Tests/AliasVault.E2ETests/Common/ClientPlaywrightTest.cs index bc14c32f7..073f1e1b3 100644 --- a/src/Tests/AliasVault.E2ETests/Common/ClientPlaywrightTest.cs +++ b/src/Tests/AliasVault.E2ETests/Common/ClientPlaywrightTest.cs @@ -16,8 +16,8 @@ using Microsoft.Playwright; /// public class ClientPlaywrightTest : PlaywrightTest { - private static readonly int _basePort = 5600; - private static int _currentPort = _basePort; + private const int BasePort = 5600; + private static int _currentPort = BasePort; /// /// For starting the WebAPI project in-memory. diff --git a/src/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj b/src/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj index 2e575856f..d794ecf53 100644 --- a/src/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj +++ b/src/Tests/AliasVault.IntegrationTests/AliasVault.IntegrationTests.csproj @@ -10,12 +10,12 @@ - bin\Debug\net8.0\AliasVault.IntegrationTests.xml + bin\Debug\net9.0\AliasVault.IntegrationTests.xml true - bin\Release\net8.0\AliasVault.IntegrationTests.xml + bin\Release\net9.0\AliasVault.IntegrationTests.xml true diff --git a/src/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj b/src/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj index 9d9492416..d21cd19d3 100644 --- a/src/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj +++ b/src/Tests/AliasVault.UnitTests/AliasVault.UnitTests.csproj @@ -12,12 +12,12 @@ true - bin\Debug\net8.0\AliasVault.UnitTests.xml + bin\Debug\net9.0\AliasVault.UnitTests.xml true - bin\Release\net8.0\AliasVault.UnitTests.xml + bin\Release\net9.0\AliasVault.UnitTests.xml diff --git a/src/Tests/AliasVault.UnitTests/Utilities/SrpArgonEncryptionTests.cs b/src/Tests/AliasVault.UnitTests/Utilities/SrpArgonEncryptionTests.cs index 46e44b881..4d1fc27ef 100644 --- a/src/Tests/AliasVault.UnitTests/Utilities/SrpArgonEncryptionTests.cs +++ b/src/Tests/AliasVault.UnitTests/Utilities/SrpArgonEncryptionTests.cs @@ -7,6 +7,7 @@ namespace AliasVault.Tests.Utilities; +using System.Security.Cryptography; using AliasVault.Cryptography.Client; using SecureRemotePassword; @@ -89,7 +90,7 @@ public class SrpArgonEncryptionTests // SymmetricDecrypt the ciphertext using a different key byte[] key2 = await Cryptography.Client.Encryption.DeriveKeyFromPasswordAsync("your-password2", salt); - Assert.Throws(() => Cryptography.Server.Encryption.SymmetricDecrypt(encrypted, key2)); + Assert.Throws(() => Cryptography.Server.Encryption.SymmetricDecrypt(encrypted, key2)); } /// diff --git a/src/Utilities/AliasVault.Auth/AliasVault.Auth.csproj b/src/Utilities/AliasVault.Auth/AliasVault.Auth.csproj index 85e8d0d88..a97f6b16d 100644 --- a/src/Utilities/AliasVault.Auth/AliasVault.Auth.csproj +++ b/src/Utilities/AliasVault.Auth/AliasVault.Auth.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.AuthLogging.xml + bin\Debug\net9.0\AliasVault.AuthLogging.xml true - bin\Release\net8.0\AliasVault.AuthLogging.xml + bin\Release\net9.0\AliasVault.AuthLogging.xml true diff --git a/src/Utilities/AliasVault.FaviconExtractor/AliasVault.FaviconExtractor.csproj b/src/Utilities/AliasVault.FaviconExtractor/AliasVault.FaviconExtractor.csproj index 18a376e7e..4437b5d03 100644 --- a/src/Utilities/AliasVault.FaviconExtractor/AliasVault.FaviconExtractor.csproj +++ b/src/Utilities/AliasVault.FaviconExtractor/AliasVault.FaviconExtractor.csproj @@ -9,12 +9,12 @@ true - bin\Debug\net8.0\FaviconExtractor.xml + bin\Debug\net9.0\FaviconExtractor.xml true - bin\Release\net8.0\FaviconExtractor.xml + bin\Release\net9.0\FaviconExtractor.xml diff --git a/src/Utilities/AliasVault.InstallCli/AliasVault.InstallCli.csproj b/src/Utilities/AliasVault.InstallCli/AliasVault.InstallCli.csproj index 8d53992c6..23968baf9 100644 --- a/src/Utilities/AliasVault.InstallCli/AliasVault.InstallCli.csproj +++ b/src/Utilities/AliasVault.InstallCli/AliasVault.InstallCli.csproj @@ -9,12 +9,12 @@ - bin\Debug\net8.0\InitializationCLI.xml + bin\Debug\net9.0\InitializationCLI.xml true - bin\Release\net8.0\InitializationCLI.xml + bin\Release\net9.0\InitializationCLI.xml true diff --git a/src/Utilities/AliasVault.Logging/AliasVault.Logging.csproj b/src/Utilities/AliasVault.Logging/AliasVault.Logging.csproj index 4cef529e1..7c3b658dd 100644 --- a/src/Utilities/AliasVault.Logging/AliasVault.Logging.csproj +++ b/src/Utilities/AliasVault.Logging/AliasVault.Logging.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\AliasVault.Logging.xml + bin\Debug\net9.0\AliasVault.Logging.xml true - bin\Release\net8.0\AliasVault.Logging.xml + bin\Release\net9.0\AliasVault.Logging.xml true diff --git a/src/Utilities/AliasVault.TotpGenerator/AliasVault.TotpGenerator.csproj b/src/Utilities/AliasVault.TotpGenerator/AliasVault.TotpGenerator.csproj index df47ccbc6..5939d06b2 100644 --- a/src/Utilities/AliasVault.TotpGenerator/AliasVault.TotpGenerator.csproj +++ b/src/Utilities/AliasVault.TotpGenerator/AliasVault.TotpGenerator.csproj @@ -9,12 +9,12 @@ true - bin\Debug\net8.0\TotpGenerator.xml + bin\Debug\net9.0\TotpGenerator.xml true - bin\Release\net8.0\TotpGenerator.xml + bin\Release\net9.0\TotpGenerator.xml diff --git a/src/Utilities/AliasVault.WorkerStatus/AliasVault.WorkerStatus.csproj b/src/Utilities/AliasVault.WorkerStatus/AliasVault.WorkerStatus.csproj index 083f9ef0d..314e886fb 100644 --- a/src/Utilities/AliasVault.WorkerStatus/AliasVault.WorkerStatus.csproj +++ b/src/Utilities/AliasVault.WorkerStatus/AliasVault.WorkerStatus.csproj @@ -8,11 +8,11 @@ - bin\Debug\net8.0\AliasVault.WorkerStatus.xml + bin\Debug\net9.0\AliasVault.WorkerStatus.xml - bin\Release\net8.0\AliasVault.WorkerStatus.xml + bin\Release\net9.0\AliasVault.WorkerStatus.xml diff --git a/src/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csproj b/src/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csproj index a17044313..a7558bc73 100644 --- a/src/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csproj +++ b/src/Utilities/Cryptography/AliasVault.Cryptography.Client/AliasVault.Cryptography.Client.csproj @@ -8,12 +8,12 @@ - bin\Debug\net8.0\CryptographyClient.xml + bin\Debug\net9.0\CryptographyClient.xml true - bin\Release\net8.0\CryptographyClient.xml + bin\Release\net9.0\CryptographyClient.xml true diff --git a/src/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csproj b/src/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csproj index 4ef9d7ba7..2f9ac9fa4 100644 --- a/src/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csproj +++ b/src/Utilities/Cryptography/AliasVault.Cryptography.Server/AliasVault.Cryptography.Server.csproj @@ -9,12 +9,12 @@ true - bin\Debug\net8.0\Cryptography.xml + bin\Debug\net9.0\Cryptography.xml true - bin\Release\net8.0\Cryptography.xml + bin\Release\net9.0\Cryptography.xml diff --git a/src/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.cs b/src/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.cs index 7c9f3404d..b14034b05 100644 --- a/src/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.cs +++ b/src/Utilities/Cryptography/AliasVault.Cryptography.Server/CertificateGenerator.cs @@ -47,8 +47,7 @@ public static class CertificateGenerator DateTimeOffset.UtcNow.AddDays(-1), DateTimeOffset.UtcNow.AddYears(validityYears)); - var certBytes = certificate.Export(X509ContentType.Pfx, password); - return X509CertificateLoader.LoadPkcs12(certBytes, password, X509KeyStorageFlags.EphemeralKeySet); + return X509CertificateLoader.LoadPkcs12(certificate.Export(X509ContentType.Pfx, password), password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable); } }