diff --git a/src/Api/Jobs/UpdatePhishingDomainsJob.cs b/src/Api/Jobs/UpdatePhishingDomainsJob.cs index 3837013898..b108a4183c 100644 --- a/src/Api/Jobs/UpdatePhishingDomainsJob.cs +++ b/src/Api/Jobs/UpdatePhishingDomainsJob.cs @@ -39,7 +39,6 @@ public class UpdatePhishingDomainsJob : BaseJob return; } - // Get the remote checksum var remoteChecksum = await _cloudPhishingDomainQuery.GetRemoteChecksumAsync(); if (string.IsNullOrWhiteSpace(remoteChecksum)) { @@ -47,10 +46,8 @@ public class UpdatePhishingDomainsJob : BaseJob return; } - // Get the current checksum from the database var currentChecksum = await _phishingDomainRepository.GetCurrentChecksumAsync(); - // Compare checksums to determine if update is needed if (string.Equals(currentChecksum, remoteChecksum, StringComparison.OrdinalIgnoreCase)) { _logger.LogInformation(Constants.BypassFiltersEventId, diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs index d16259b9e6..099f1f2fde 100644 --- a/src/Api/Startup.cs +++ b/src/Api/Startup.cs @@ -146,8 +146,8 @@ public class Startup config.AddPolicy("PhishingDomains", policy => { policy.RequireAuthenticatedUser(); - policy.RequireAssertion(ctx => - ctx.User.HasClaim(c => c.Type == JwtClaimTypes.Scope && + policy.RequireAssertion(ctx => + ctx.User.HasClaim(c => c.Type == JwtClaimTypes.Scope && (c.Value == ApiScopes.ApiLicensing || c.Value == ApiScopes.Api)) ); }); diff --git a/src/Api/Utilities/ServiceCollectionExtensions.cs b/src/Api/Utilities/ServiceCollectionExtensions.cs index 2280b576cb..41d8990304 100644 --- a/src/Api/Utilities/ServiceCollectionExtensions.cs +++ b/src/Api/Utilities/ServiceCollectionExtensions.cs @@ -4,6 +4,8 @@ using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Authorization; using Bit.Core.IdentityServer; using Bit.Core.PhishingDomainFeatures; using Bit.Core.PhishingDomainFeatures.Interfaces; +using Bit.Core.Repositories; +using Bit.Core.Repositories.Implementations; using Bit.Core.Settings; using Bit.Core.Utilities; using Bit.Core.Vault.Authorization.SecurityTasks; @@ -117,6 +119,9 @@ public static class ServiceCollectionExtensions client.Timeout = TimeSpan.FromSeconds(30); }); + services.AddSingleton(); + services.AddSingleton(); + if (globalSettings.SelfHosted) { services.AddScoped(); diff --git a/src/Core/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs b/src/Core/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs new file mode 100644 index 0000000000..9af9c94e1d --- /dev/null +++ b/src/Core/PhishingDomainFeatures/AzurePhishingDomainStorageService.cs @@ -0,0 +1,92 @@ +using System.Text; +using Azure.Storage.Blobs; +using Azure.Storage.Blobs.Models; +using Bit.Core.Settings; +using Microsoft.Extensions.Logging; + +namespace Bit.Core.PhishingDomainFeatures; + +public class AzurePhishingDomainStorageService +{ + private const string _containerName = "phishingdomains"; + private const string _domainsFileName = "domains.txt"; + private const string _checksumFileName = "checksum.txt"; + + private readonly BlobServiceClient _blobServiceClient; + private readonly ILogger _logger; + private BlobContainerClient _containerClient; + + public AzurePhishingDomainStorageService( + GlobalSettings globalSettings, + ILogger logger) + { + _blobServiceClient = new BlobServiceClient(globalSettings.Storage.ConnectionString); + _logger = logger; + } + + public async Task> GetDomainsAsync() + { + await InitAsync(); + + var blobClient = _containerClient.GetBlobClient(_domainsFileName); + if (!await blobClient.ExistsAsync()) + { + return []; + } + + var response = await blobClient.DownloadAsync(); + using var streamReader = new StreamReader(response.Value.Content); + var content = await streamReader.ReadToEndAsync(); + + return [.. content + .Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries) + .Select(line => line.Trim()) + .Where(line => !string.IsNullOrWhiteSpace(line) && !line.StartsWith('#'))]; + } + + public async Task GetChecksumAsync() + { + await InitAsync(); + + var blobClient = _containerClient.GetBlobClient(_checksumFileName); + if (!await blobClient.ExistsAsync()) + { + return string.Empty; + } + + var response = await blobClient.DownloadAsync(); + using var streamReader = new StreamReader(response.Value.Content); + return (await streamReader.ReadToEndAsync()).Trim(); + } + + public async Task UpdateDomainsAsync(IEnumerable domains, string checksum) + { + await InitAsync(); + + var domainsContent = string.Join(Environment.NewLine, domains); + var domainsStream = new MemoryStream(Encoding.UTF8.GetBytes(domainsContent)); + var domainsBlobClient = _containerClient.GetBlobClient(_domainsFileName); + + await domainsBlobClient.UploadAsync(domainsStream, new BlobUploadOptions + { + HttpHeaders = new BlobHttpHeaders { ContentType = "text/plain" } + }, CancellationToken.None); + + var checksumStream = new MemoryStream(Encoding.UTF8.GetBytes(checksum)); + var checksumBlobClient = _containerClient.GetBlobClient(_checksumFileName); + + await checksumBlobClient.UploadAsync(checksumStream, new BlobUploadOptions + { + HttpHeaders = new BlobHttpHeaders { ContentType = "text/plain" } + }, CancellationToken.None); + } + + private async Task InitAsync() + { + if (_containerClient is null) + { + _containerClient = _blobServiceClient.GetBlobContainerClient(_containerName); + await _containerClient.CreateIfNotExistsAsync(); + } + } +} diff --git a/src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs b/src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs index cee741b23b..b059eac0e8 100644 --- a/src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs +++ b/src/Core/PhishingDomainFeatures/CloudPhishingDomainDirectQuery.cs @@ -80,12 +80,8 @@ public class CloudPhishingDomainDirectQuery : ICloudPhishingDomainQuery // Format is typically "hash *filename" var parts = checksumContent.Split(' ', 2); - if (parts.Length > 0) - { - return parts[0].Trim(); - } - return string.Empty; + return parts.Length > 0 ? parts[0].Trim() : string.Empty; } private static List ParseDomains(string content) diff --git a/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs b/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs new file mode 100644 index 0000000000..2d4ea15b7e --- /dev/null +++ b/src/Core/Repositories/Implementations/AzurePhishingDomainRepository.cs @@ -0,0 +1,126 @@ +using System.Text.Json; +using Bit.Core.PhishingDomainFeatures; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Logging; + +namespace Bit.Core.Repositories.Implementations; + +public class AzurePhishingDomainRepository : IPhishingDomainRepository +{ + private readonly AzurePhishingDomainStorageService _storageService; + private readonly IDistributedCache _cache; + private readonly ILogger _logger; + private const string _domainsCacheKey = "PhishingDomains_v1"; + private const string _checksumCacheKey = "PhishingDomains_Checksum_v1"; + private static readonly DistributedCacheEntryOptions _cacheOptions = new() + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(24), + SlidingExpiration = TimeSpan.FromHours(1) + }; + + public AzurePhishingDomainRepository( + AzurePhishingDomainStorageService storageService, + IDistributedCache cache, + ILogger logger) + { + _storageService = storageService; + _cache = cache; + _logger = logger; + } + + public async Task> GetActivePhishingDomainsAsync() + { + try + { + var cachedDomains = await _cache.GetStringAsync(_domainsCacheKey); + if (!string.IsNullOrEmpty(cachedDomains)) + { + _logger.LogDebug("Retrieved phishing domains from cache"); + return JsonSerializer.Deserialize>(cachedDomains) ?? []; + } + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Failed to retrieve phishing domains from cache"); + } + + var domains = await _storageService.GetDomainsAsync(); + + try + { + await _cache.SetStringAsync( + _domainsCacheKey, + JsonSerializer.Serialize(domains), + _cacheOptions); + _logger.LogDebug("Stored {Count} phishing domains in cache", domains.Count); + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Failed to store phishing domains in cache"); + } + + return domains; + } + + public async Task GetCurrentChecksumAsync() + { + try + { + var cachedChecksum = await _cache.GetStringAsync(_checksumCacheKey); + if (!string.IsNullOrEmpty(cachedChecksum)) + { + _logger.LogDebug("Retrieved phishing domain checksum from cache"); + return cachedChecksum; + } + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Failed to retrieve phishing domain checksum from cache"); + } + + var checksum = await _storageService.GetChecksumAsync(); + + try + { + if (!string.IsNullOrEmpty(checksum)) + { + await _cache.SetStringAsync( + _checksumCacheKey, + checksum, + _cacheOptions); + _logger.LogDebug("Stored phishing domain checksum in cache"); + } + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Failed to store phishing domain checksum in cache"); + } + + return checksum; + } + + public async Task UpdatePhishingDomainsAsync(IEnumerable domains, string checksum) + { + var domainsList = domains.ToList(); + await _storageService.UpdateDomainsAsync(domainsList, checksum); + + try + { + await _cache.SetStringAsync( + _domainsCacheKey, + JsonSerializer.Serialize(domainsList), + _cacheOptions); + + await _cache.SetStringAsync( + _checksumCacheKey, + checksum, + _cacheOptions); + + _logger.LogDebug("Updated phishing domains cache after update operation"); + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Failed to update phishing domains in cache"); + } + } +} diff --git a/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs b/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs index d8a0b52c47..26abf5632c 100644 --- a/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs +++ b/src/Infrastructure.Dapper/DapperServiceCollectionExtensions.cs @@ -44,7 +44,6 @@ public static class DapperServiceCollectionExtensions services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/src/Infrastructure.Dapper/Repositories/PhishingDomainRepository.cs b/src/Infrastructure.Dapper/Repositories/PhishingDomainRepository.cs deleted file mode 100644 index 9a732d4987..0000000000 --- a/src/Infrastructure.Dapper/Repositories/PhishingDomainRepository.cs +++ /dev/null @@ -1,164 +0,0 @@ -using System.Data; -using System.Text.Json; -using Bit.Core.Repositories; -using Bit.Core.Settings; -using Dapper; -using Microsoft.Data.SqlClient; -using Microsoft.Extensions.Caching.Distributed; -using Microsoft.Extensions.Logging; - -namespace Bit.Infrastructure.Dapper.Repositories; - -public class PhishingDomainRepository : IPhishingDomainRepository -{ - private readonly string _connectionString; - private readonly IDistributedCache _cache; - private readonly ILogger _logger; - private const string _cacheKey = "PhishingDomains_v1"; - private static readonly DistributedCacheEntryOptions _cacheOptions = new() - { - AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(24), - SlidingExpiration = TimeSpan.FromHours(1) - }; - - public PhishingDomainRepository( - GlobalSettings globalSettings, - IDistributedCache cache, - ILogger logger) - : this(globalSettings.SqlServer.ConnectionString, cache, logger) - { } - - public PhishingDomainRepository( - string connectionString, - IDistributedCache cache, - ILogger logger) - { - _connectionString = connectionString; - _cache = cache; - _logger = logger; - } - - public async Task> GetActivePhishingDomainsAsync() - { - try - { - var cachedDomains = await _cache.GetStringAsync(_cacheKey); - if (!string.IsNullOrEmpty(cachedDomains)) - { - _logger.LogDebug("Retrieved phishing domains from cache"); - return JsonSerializer.Deserialize>(cachedDomains) ?? []; - } - } - catch (Exception ex) - { - _logger.LogWarning(ex, "Failed to retrieve phishing domains from cache"); - } - - await using var connection = new SqlConnection(_connectionString); - - var results = await connection.QueryAsync( - "[dbo].[PhishingDomain_ReadAll]", - commandType: CommandType.StoredProcedure); - - var domains = results.AsList(); - - try - { - await _cache.SetStringAsync( - _cacheKey, - JsonSerializer.Serialize(domains), - _cacheOptions); - - _logger.LogDebug("Stored {Count} phishing domains in cache", domains.Count); - } - catch (Exception ex) - { - _logger.LogWarning(ex, "Failed to store phishing domains in cache"); - } - - return domains; - } - - public async Task GetCurrentChecksumAsync() - { - try - { - await using var connection = new SqlConnection(_connectionString); - - var checksum = await connection.QueryFirstOrDefaultAsync( - "[dbo].[PhishingDomain_ReadChecksum]", - commandType: CommandType.StoredProcedure); - - return checksum ?? string.Empty; - } - catch (Exception ex) - { - _logger.LogError(ex, "Error retrieving phishing domain checksum from database"); - return string.Empty; - } - } - - public async Task UpdatePhishingDomainsAsync(IEnumerable domains, string checksum) - { - var domainsList = domains.ToList(); - _logger.LogInformation("Beginning bulk update of {Count} phishing domains with checksum {Checksum}", - domainsList.Count, checksum); - - await using var connection = new SqlConnection(_connectionString); - await connection.OpenAsync(); - - await using var transaction = connection.BeginTransaction(); - try - { - await connection.ExecuteAsync( - "[dbo].[PhishingDomain_DeleteAll]", - transaction: transaction, - commandType: CommandType.StoredProcedure); - - var dataTable = new DataTable(); - dataTable.Columns.Add("Id", typeof(Guid)); - dataTable.Columns.Add("Domain", typeof(string)); - dataTable.Columns.Add("Checksum", typeof(string)); - - dataTable.PrimaryKey = [dataTable.Columns["Id"]]; - - foreach (var domain in domainsList) - { - dataTable.Rows.Add(Guid.NewGuid(), domain, checksum); - } - - using var bulkCopy = new SqlBulkCopy(connection, SqlBulkCopyOptions.Default, transaction); - - bulkCopy.DestinationTableName = "[dbo].[PhishingDomain]"; - bulkCopy.BatchSize = 10000; - - bulkCopy.ColumnMappings.Add("Id", "Id"); - bulkCopy.ColumnMappings.Add("Domain", "Domain"); - bulkCopy.ColumnMappings.Add("Checksum", "Checksum"); - - await bulkCopy.WriteToServerAsync(dataTable); - await transaction.CommitAsync(); - - _logger.LogInformation("Successfully bulk updated {Count} phishing domains", domainsList.Count); - } - catch (Exception ex) - { - await transaction.RollbackAsync(); - _logger.LogError(ex, "Failed to bulk update phishing domains"); - throw; - } - - try - { - await _cache.SetStringAsync( - _cacheKey, - JsonSerializer.Serialize(domainsList), - _cacheOptions); - _logger.LogDebug("Updated phishing domains cache after update operation"); - } - catch (Exception ex) - { - _logger.LogWarning(ex, "Failed to update phishing domains in cache"); - } - } -} diff --git a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs index 1a5791ab95..3f805bbe2c 100644 --- a/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs +++ b/src/Infrastructure.EntityFramework/EntityFrameworkServiceCollectionExtensions.cs @@ -101,7 +101,6 @@ public static class EntityFrameworkServiceCollectionExtensions services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); if (selfHosted) { diff --git a/src/Infrastructure.EntityFramework/Models/PhishingDomain.cs b/src/Infrastructure.EntityFramework/Models/PhishingDomain.cs deleted file mode 100644 index e11897ec38..0000000000 --- a/src/Infrastructure.EntityFramework/Models/PhishingDomain.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace Bit.Infrastructure.EntityFramework.Models; - -public class PhishingDomain -{ - [Key] - public Guid Id { get; set; } - - [Required] - [MaxLength(255)] - public string Domain { get; set; } - - [MaxLength(64)] - public string Checksum { get; set; } -} diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs index c2f95e72f9..dd1b97b4f2 100644 --- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs +++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs @@ -80,7 +80,6 @@ public class DatabaseContext : DbContext public DbSet PasswordHealthReportApplications { get; set; } public DbSet SecurityTasks { get; set; } public DbSet OrganizationInstallations { get; set; } - public DbSet PhishingDomains { get; set; } protected override void OnModelCreating(ModelBuilder builder) { @@ -111,7 +110,6 @@ public class DatabaseContext : DbContext var eOrganizationConnection = builder.Entity(); var eOrganizationDomain = builder.Entity(); var aWebAuthnCredential = builder.Entity(); - var ePhishingDomain = builder.Entity(); // Shadow property configurations go here @@ -128,7 +126,6 @@ public class DatabaseContext : DbContext eOrganizationConnection.Property(c => c.Id).ValueGeneratedNever(); eOrganizationDomain.Property(ar => ar.Id).ValueGeneratedNever(); aWebAuthnCredential.Property(ar => ar.Id).ValueGeneratedNever(); - ePhishingDomain.Property(ar => ar.Id).ValueGeneratedNever(); eCollectionCipher.HasKey(cc => new { cc.CollectionId, cc.CipherId }); eCollectionUser.HasKey(cu => new { cu.CollectionId, cu.OrganizationUserId }); @@ -169,7 +166,6 @@ public class DatabaseContext : DbContext eOrganizationConnection.ToTable(nameof(OrganizationConnection)); eOrganizationDomain.ToTable(nameof(OrganizationDomain)); aWebAuthnCredential.ToTable(nameof(WebAuthnCredential)); - ePhishingDomain.ToTable(nameof(PhishingDomain)); ConfigureDateTimeUtcQueries(builder); } diff --git a/src/Infrastructure.EntityFramework/Repositories/PhishingDomainRepository.cs b/src/Infrastructure.EntityFramework/Repositories/PhishingDomainRepository.cs deleted file mode 100644 index d0368ad809..0000000000 --- a/src/Infrastructure.EntityFramework/Repositories/PhishingDomainRepository.cs +++ /dev/null @@ -1,167 +0,0 @@ -using System.Data; -using System.Text.Json; -using Bit.Core.Repositories; -using Microsoft.Data.SqlClient; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Distributed; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace Bit.Infrastructure.EntityFramework.Repositories; - -public class PhishingDomainRepository : IPhishingDomainRepository -{ - private readonly IServiceScopeFactory _serviceScopeFactory; - private readonly IDistributedCache _cache; - private readonly ILogger _logger; - private const string _cacheKey = "PhishingDomains_v1"; - private static readonly DistributedCacheEntryOptions _cacheOptions = new() - { - AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(24), - SlidingExpiration = TimeSpan.FromHours(1) - }; - - public PhishingDomainRepository( - IServiceScopeFactory serviceScopeFactory, - IDistributedCache cache, - ILogger logger) - { - _serviceScopeFactory = serviceScopeFactory; - _cache = cache; - _logger = logger; - } - - public async Task> GetActivePhishingDomainsAsync() - { - try - { - var cachedDomains = await _cache.GetStringAsync(_cacheKey); - - if (!string.IsNullOrEmpty(cachedDomains)) - { - _logger.LogDebug("Retrieved phishing domains from cache"); - return JsonSerializer.Deserialize>(cachedDomains) ?? []; - } - } - catch (Exception ex) - { - _logger.LogWarning(ex, "Failed to retrieve phishing domains from cache"); - } - - using var scope = _serviceScopeFactory.CreateScope(); - - var dbContext = scope.ServiceProvider.GetRequiredService(); - var domains = await dbContext.PhishingDomains - .Select(d => d.Domain) - .ToListAsync(); - - try - { - await _cache.SetStringAsync( - _cacheKey, - JsonSerializer.Serialize(domains), - _cacheOptions); - - _logger.LogDebug("Stored {Count} phishing domains in cache", domains.Count); - } - catch (Exception ex) - { - _logger.LogWarning(ex, "Failed to store phishing domains in cache"); - } - - return domains; - } - - public async Task GetCurrentChecksumAsync() - { - try - { - using var scope = _serviceScopeFactory.CreateScope(); - var dbContext = scope.ServiceProvider.GetRequiredService(); - - // Get the first checksum in the database (there should only be one set of domains with the same checksum) - var checksum = await dbContext.PhishingDomains - .Select(d => d.Checksum) - .FirstOrDefaultAsync(); - - return checksum ?? string.Empty; - } - catch (Exception ex) - { - _logger.LogError(ex, "Error retrieving phishing domain checksum from database"); - return string.Empty; - } - } - - public async Task UpdatePhishingDomainsAsync(IEnumerable domains, string checksum) - { - var domainsList = domains.ToList(); - _logger.LogInformation("Beginning bulk update of {Count} phishing domains with checksum {Checksum}", - domainsList.Count, checksum); - - using var scope = _serviceScopeFactory.CreateScope(); - var dbContext = scope.ServiceProvider.GetRequiredService(); - - var connection = dbContext.Database.GetDbConnection(); - var connectionString = connection.ConnectionString; - - await using var sqlConnection = new SqlConnection(connectionString); - await sqlConnection.OpenAsync(); - - await using var transaction = sqlConnection.BeginTransaction(); - try - { - await using var command = sqlConnection.CreateCommand(); - command.Transaction = transaction; - command.CommandText = "[dbo].[PhishingDomain_DeleteAll]"; - command.CommandType = CommandType.StoredProcedure; - await command.ExecuteNonQueryAsync(); - - var dataTable = new DataTable(); - dataTable.Columns.Add("Id", typeof(Guid)); - dataTable.Columns.Add("Domain", typeof(string)); - dataTable.Columns.Add("Checksum", typeof(string)); - - dataTable.PrimaryKey = [dataTable.Columns["Id"]]; - - foreach (var domain in domainsList) - { - dataTable.Rows.Add(Guid.NewGuid(), domain, checksum); - } - - using var bulkCopy = new SqlBulkCopy(sqlConnection, SqlBulkCopyOptions.Default, transaction); - - bulkCopy.DestinationTableName = "[dbo].[PhishingDomain]"; - bulkCopy.BatchSize = 10000; - - bulkCopy.ColumnMappings.Add("Id", "Id"); - bulkCopy.ColumnMappings.Add("Domain", "Domain"); - bulkCopy.ColumnMappings.Add("Checksum", "Checksum"); - - await bulkCopy.WriteToServerAsync(dataTable); - await transaction.CommitAsync(); - - _logger.LogInformation("Successfully bulk updated {Count} phishing domains", domainsList.Count); - } - catch (Exception ex) - { - await transaction.RollbackAsync(); - _logger.LogError(ex, "Failed to bulk update phishing domains"); - throw; - } - - try - { - await _cache.SetStringAsync( - _cacheKey, - JsonSerializer.Serialize(domainsList), - _cacheOptions); - - _logger.LogDebug("Updated phishing domains cache after update operation"); - } - catch (Exception ex) - { - _logger.LogWarning(ex, "Failed to update phishing domains in cache"); - } - } -} diff --git a/src/Sql/dbo/Stored Procedures/PhishingDomain_Create.sql b/src/Sql/dbo/Stored Procedures/PhishingDomain_Create.sql deleted file mode 100644 index fe29dffcd9..0000000000 --- a/src/Sql/dbo/Stored Procedures/PhishingDomain_Create.sql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE PROCEDURE [dbo].[PhishingDomain_Create] - @Id UNIQUEIDENTIFIER, - @Domain NVARCHAR(255), - @Checksum NVARCHAR(64) -AS -BEGIN - SET NOCOUNT ON - - INSERT INTO [dbo].[PhishingDomain] - ( - [Id], - [Domain], - [Checksum] - ) - VALUES - ( - @Id, - @Domain, - @Checksum - ) -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/PhishingDomain_DeleteAll.sql b/src/Sql/dbo/Stored Procedures/PhishingDomain_DeleteAll.sql deleted file mode 100644 index 94302074e3..0000000000 --- a/src/Sql/dbo/Stored Procedures/PhishingDomain_DeleteAll.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE PROCEDURE [dbo].[PhishingDomain_DeleteAll] -AS -BEGIN - SET NOCOUNT ON - - DELETE FROM - [dbo].[PhishingDomain] -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/PhishingDomain_ReadAll.sql b/src/Sql/dbo/Stored Procedures/PhishingDomain_ReadAll.sql deleted file mode 100644 index 7b8e18060e..0000000000 --- a/src/Sql/dbo/Stored Procedures/PhishingDomain_ReadAll.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE PROCEDURE [dbo].[PhishingDomain_ReadAll] -AS -BEGIN - SET NOCOUNT ON - - SELECT - [Domain] - FROM - [dbo].[PhishingDomain] - ORDER BY - [Domain] ASC -END \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/PhishingDomain_ReadChecksum.sql b/src/Sql/dbo/Stored Procedures/PhishingDomain_ReadChecksum.sql deleted file mode 100644 index 83e23a8c1e..0000000000 --- a/src/Sql/dbo/Stored Procedures/PhishingDomain_ReadChecksum.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE PROCEDURE [dbo].[PhishingDomain_ReadChecksum] -AS -BEGIN - SET NOCOUNT ON - - SELECT TOP 1 - [Checksum] - FROM - [dbo].[PhishingDomain] -END \ No newline at end of file diff --git a/src/Sql/dbo/Tables/PhishingDomain.sql b/src/Sql/dbo/Tables/PhishingDomain.sql deleted file mode 100644 index f816666d6e..0000000000 --- a/src/Sql/dbo/Tables/PhishingDomain.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE TABLE [dbo].[PhishingDomain] ( - [Id] UNIQUEIDENTIFIER NOT NULL, - [Domain] NVARCHAR(255) NOT NULL, - [Checksum] NVARCHAR(64) NULL, - CONSTRAINT [PK_PhishingDomain] PRIMARY KEY CLUSTERED ([Id] ASC) -); - -GO - -CREATE NONCLUSTERED INDEX [IX_PhishingDomain_Domain] - ON [dbo].[PhishingDomain]([Domain] ASC); \ No newline at end of file diff --git a/util/Migrator/DbScripts/2024-03-19_00_PhishingDomain.sql b/util/Migrator/DbScripts/2024-03-19_00_PhishingDomain.sql deleted file mode 100644 index 1ec4e9efe7..0000000000 --- a/util/Migrator/DbScripts/2024-03-19_00_PhishingDomain.sql +++ /dev/null @@ -1,86 +0,0 @@ --- Create PhishingDomain table -IF OBJECT_ID('[dbo].[PhishingDomain]') IS NULL -BEGIN - CREATE TABLE [dbo].[PhishingDomain] ( - [Id] UNIQUEIDENTIFIER NOT NULL, - [Domain] NVARCHAR(255) NOT NULL, - [CreationDate] DATETIME2(7) NOT NULL, - [RevisionDate] DATETIME2(7) NOT NULL, - CONSTRAINT [PK_PhishingDomain] PRIMARY KEY CLUSTERED ([Id] ASC) - ); - - CREATE NONCLUSTERED INDEX [IX_PhishingDomain_Domain] - ON [dbo].[PhishingDomain]([Domain] ASC); -END -GO - --- Create PhishingDomain_ReadAll stored procedure -IF OBJECT_ID('[dbo].[PhishingDomain_ReadAll]') IS NOT NULL -BEGIN - DROP PROCEDURE [dbo].[PhishingDomain_ReadAll] -END -GO - -CREATE PROCEDURE [dbo].[PhishingDomain_ReadAll] -AS -BEGIN - SET NOCOUNT ON - - SELECT - [Domain] - FROM - [dbo].[PhishingDomain] - ORDER BY - [Domain] ASC -END -GO - --- Create PhishingDomain_DeleteAll stored procedure -IF OBJECT_ID('[dbo].[PhishingDomain_DeleteAll]') IS NOT NULL -BEGIN - DROP PROCEDURE [dbo].[PhishingDomain_DeleteAll] -END -GO - -CREATE PROCEDURE [dbo].[PhishingDomain_DeleteAll] -AS -BEGIN - SET NOCOUNT ON - - DELETE FROM - [dbo].[PhishingDomain] -END -GO - --- Create PhishingDomain_Create stored procedure -IF OBJECT_ID('[dbo].[PhishingDomain_Create]') IS NOT NULL -BEGIN - DROP PROCEDURE [dbo].[PhishingDomain_Create] -END -GO - -CREATE PROCEDURE [dbo].[PhishingDomain_Create] - @Id UNIQUEIDENTIFIER, - @Domain NVARCHAR(255), - @CreationDate DATETIME2(7), - @RevisionDate DATETIME2(7) -AS -BEGIN - SET NOCOUNT ON - - INSERT INTO [dbo].[PhishingDomain] - ( - [Id], - [Domain], - [CreationDate], - [RevisionDate] - ) - VALUES - ( - @Id, - @Domain, - @CreationDate, - @RevisionDate - ) -END -GO \ No newline at end of file diff --git a/util/Migrator/DbScripts/2024-05-17_00_PhishingDomainChecksum.sql b/util/Migrator/DbScripts/2024-05-17_00_PhishingDomainChecksum.sql deleted file mode 100644 index 39823b3da7..0000000000 --- a/util/Migrator/DbScripts/2024-05-17_00_PhishingDomainChecksum.sql +++ /dev/null @@ -1,61 +0,0 @@ --- Update PhishingDomain table to use Checksum instead of dates -IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PhishingDomain' AND COLUMN_NAME = 'CreationDate') -BEGIN - -- Add Checksum column - ALTER TABLE [dbo].[PhishingDomain] - ADD [Checksum] NVARCHAR(64) NULL; - - -- Drop old columns - ALTER TABLE [dbo].[PhishingDomain] - DROP COLUMN [CreationDate], [RevisionDate]; -END -GO - --- Update PhishingDomain_Create stored procedure -IF OBJECT_ID('[dbo].[PhishingDomain_Create]') IS NOT NULL -BEGIN - DROP PROCEDURE [dbo].[PhishingDomain_Create] -END -GO - -CREATE PROCEDURE [dbo].[PhishingDomain_Create] - @Id UNIQUEIDENTIFIER, - @Domain NVARCHAR(255), - @Checksum NVARCHAR(64) -AS -BEGIN - SET NOCOUNT ON - - INSERT INTO [dbo].[PhishingDomain] - ( - [Id], - [Domain], - [Checksum] - ) - VALUES - ( - @Id, - @Domain, - @Checksum - ) -END -GO - --- Create PhishingDomain_ReadChecksum stored procedure -IF OBJECT_ID('[dbo].[PhishingDomain_ReadChecksum]') IS NOT NULL -BEGIN - DROP PROCEDURE [dbo].[PhishingDomain_ReadChecksum] -END -GO - -CREATE PROCEDURE [dbo].[PhishingDomain_ReadChecksum] -AS -BEGIN - SET NOCOUNT ON - - SELECT TOP 1 - [Checksum] - FROM - [dbo].[PhishingDomain] -END -GO \ No newline at end of file