diff --git a/src/Core/AdminConsole/Enums/IntegrationType.cs b/src/Core/AdminConsole/Enums/IntegrationType.cs new file mode 100644 index 0000000000..16c7818dee --- /dev/null +++ b/src/Core/AdminConsole/Enums/IntegrationType.cs @@ -0,0 +1,7 @@ +namespace Bit.Core.Enums; + +public enum IntegrationType : int +{ + Slack = 1, + Webhook = 2, +} diff --git a/src/Core/AdminConsole/Models/Data/Integrations/IntegrationConfiguration.cs b/src/Core/AdminConsole/Models/Data/Integrations/IntegrationConfiguration.cs new file mode 100644 index 0000000000..046d3ffa47 --- /dev/null +++ b/src/Core/AdminConsole/Models/Data/Integrations/IntegrationConfiguration.cs @@ -0,0 +1,7 @@ +namespace Bit.Core.Models.Data.Integrations; + +public class IntegrationConfiguration +{ + public T Configuration { get; set; } + public string Template { get; set; } = string.Empty; +} diff --git a/src/Core/AdminConsole/Models/Data/Integrations/SlackConfiguration.cs b/src/Core/AdminConsole/Models/Data/Integrations/SlackConfiguration.cs new file mode 100644 index 0000000000..e72f2fbbe4 --- /dev/null +++ b/src/Core/AdminConsole/Models/Data/Integrations/SlackConfiguration.cs @@ -0,0 +1,8 @@ +namespace Bit.Core.Models.Data.Integrations; + +public class SlackConfiguration +{ + public string Token { get; set; } = string.Empty; + public List Channels { get; set; } = new(); + public List UserEmails { get; set; } = new(); +} diff --git a/src/Core/AdminConsole/Models/Data/Integrations/WebhookConfiguration.cs b/src/Core/AdminConsole/Models/Data/Integrations/WebhookConfiguration.cs new file mode 100644 index 0000000000..176ad75d11 --- /dev/null +++ b/src/Core/AdminConsole/Models/Data/Integrations/WebhookConfiguration.cs @@ -0,0 +1,7 @@ +namespace Bit.Core.Models.Data.Integrations; + +public class WebhookConfiguration +{ + public string Url { get; set; } = string.Empty; + public string ApiKey { get; set; } = string.Empty; +} diff --git a/src/Core/AdminConsole/Repositories/IOrganizationIntegrationConfigurationRepository.cs b/src/Core/AdminConsole/Repositories/IOrganizationIntegrationConfigurationRepository.cs new file mode 100644 index 0000000000..264153bffb --- /dev/null +++ b/src/Core/AdminConsole/Repositories/IOrganizationIntegrationConfigurationRepository.cs @@ -0,0 +1,15 @@ +using Bit.Core.Enums; +using Bit.Core.Models.Data.Integrations; + +#nullable enable + +namespace Bit.Core.Repositories; + +public interface IOrganizationIntegrationConfigurationRepository +{ + Task?> GetConfigurationAsync(Guid organizationId, IntegrationType integrationType, EventType eventType); + Task>> GetAllConfigurationsAsync(Guid organizationId); + Task AddConfigurationAsync(Guid organizationId, IntegrationType integrationType, EventType eventType, IntegrationConfiguration configuration); + Task UpdateConfigurationAsync(IntegrationConfiguration configuration); + Task DeleteConfigurationAsync(Guid id); +} diff --git a/src/Core/AdminConsole/Repositories/OrganizationIntegrationConfigurationRepository.cs b/src/Core/AdminConsole/Repositories/OrganizationIntegrationConfigurationRepository.cs new file mode 100644 index 0000000000..af33b123c7 --- /dev/null +++ b/src/Core/AdminConsole/Repositories/OrganizationIntegrationConfigurationRepository.cs @@ -0,0 +1,65 @@ +using Bit.Core.Enums; +using Bit.Core.Models.Data.Integrations; +using Bit.Core.Settings; + +namespace Bit.Core.Repositories; + +#nullable enable + +public class OrganizationIntegrationConfigurationRepository(GlobalSettings globalSettings) + : IOrganizationIntegrationConfigurationRepository +{ + private readonly string _slackToken = globalSettings.EventLogging.SlackToken; + private readonly string _slackUserEmail = globalSettings.EventLogging.SlackUserEmail; + private readonly string _webhookUrl = globalSettings.EventLogging.WebhookUrl; + + public async Task?> GetConfigurationAsync( + Guid organizationId, + IntegrationType integrationType, + EventType eventType) + { + switch (integrationType) + { + case IntegrationType.Slack: + if (string.IsNullOrWhiteSpace(_slackToken) || string.IsNullOrWhiteSpace(_slackUserEmail)) + { + return null; + } + return new IntegrationConfiguration() + { + Configuration = new SlackConfiguration + { + Token = _slackToken, + Channels = new List { }, + UserEmails = new List { _slackUserEmail } + }, + Template = "This is a test of the new Slack integration" + } as IntegrationConfiguration; + case IntegrationType.Webhook: + if (string.IsNullOrWhiteSpace(_webhookUrl)) + { + return null; + } + return new IntegrationConfiguration() + { + Configuration = new WebhookConfiguration() + { + Url = _webhookUrl, + }, + Template = "{ \"newObject\": true }" + } as IntegrationConfiguration; + default: + return null; + } + } + + public async Task>> GetAllConfigurationsAsync(Guid organizationId) => throw new NotImplementedException(); + + public async Task AddConfigurationAsync(Guid organizationId, IntegrationType integrationType, EventType eventType, + IntegrationConfiguration configuration) => + throw new NotImplementedException(); + + public async Task UpdateConfigurationAsync(IntegrationConfiguration configuration) => throw new NotImplementedException(); + + public async Task DeleteConfigurationAsync(Guid id) => throw new NotImplementedException(); +} diff --git a/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs b/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs index 347a12f405..e8446d0894 100644 --- a/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs +++ b/src/Core/AdminConsole/Services/Implementations/SlackEventHandler.cs @@ -1,32 +1,38 @@ -using System.Text.Json; +using Bit.Core.Enums; using Bit.Core.Models.Data; -using Bit.Core.Settings; +using Bit.Core.Models.Data.Integrations; +using Bit.Core.Repositories; namespace Bit.Core.Services; public class SlackEventHandler( - GlobalSettings globalSettings, - SlackMessageSender slackMessageSender) - : IEventMessageHandler + IOrganizationIntegrationConfigurationRepository configurationRepository, + SlackMessageSender slackMessageSender + ) : IEventMessageHandler { - private readonly string _token = globalSettings.EventLogging.SlackToken; - private readonly string _email = globalSettings.EventLogging.SlackUserEmail; - public async Task HandleEventAsync(EventMessage eventMessage) { - await slackMessageSender.SendDirectMessageByEmailAsync( - _token, - JsonSerializer.Serialize(eventMessage), - _email - ); + Guid organizationId = eventMessage.OrganizationId ?? Guid.NewGuid(); + + var configuration = await configurationRepository.GetConfigurationAsync( + organizationId, + IntegrationType.Slack, + eventMessage.Type); + if (configuration is not null) + { + await slackMessageSender.SendDirectMessageByEmailAsync( + configuration.Configuration.Token, + configuration.Template, + configuration.Configuration.UserEmails.First() + ); + } } public async Task HandleManyEventsAsync(IEnumerable eventMessages) { - await slackMessageSender.SendDirectMessageByEmailAsync( - _token, - JsonSerializer.Serialize(eventMessages), - _email - ); + foreach (var eventMessage in eventMessages) + { + await HandleEventAsync(eventMessage); + } } } diff --git a/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs b/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs index d152f9011b..4ad3713107 100644 --- a/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs +++ b/src/Core/AdminConsole/Services/Implementations/WebhookEventHandler.cs @@ -1,30 +1,45 @@ using System.Net.Http.Json; +using Bit.Core.Enums; using Bit.Core.Models.Data; -using Bit.Core.Settings; +using Bit.Core.Models.Data.Integrations; +using Bit.Core.Repositories; + +#nullable enable namespace Bit.Core.Services; public class WebhookEventHandler( IHttpClientFactory httpClientFactory, - GlobalSettings globalSettings) + IOrganizationIntegrationConfigurationRepository configurationRepository) : IEventMessageHandler { private readonly HttpClient _httpClient = httpClientFactory.CreateClient(HttpClientName); - private readonly string _webhookUrl = globalSettings.EventLogging.WebhookUrl; public const string HttpClientName = "WebhookEventHandlerHttpClient"; public async Task HandleEventAsync(EventMessage eventMessage) { - var content = JsonContent.Create(eventMessage); - var response = await _httpClient.PostAsync(_webhookUrl, content); - response.EnsureSuccessStatusCode(); + Guid organizationId = eventMessage.OrganizationId ?? Guid.NewGuid(); + + var configuration = await configurationRepository.GetConfigurationAsync( + organizationId, + IntegrationType.Webhook, + eventMessage.Type); + if (configuration is not null) + { + var content = JsonContent.Create(configuration.Template); + var response = await _httpClient.PostAsync( + configuration.Configuration.Url, + content); + response.EnsureSuccessStatusCode(); + } } public async Task HandleManyEventsAsync(IEnumerable eventMessages) { - var content = JsonContent.Create(eventMessages); - var response = await _httpClient.PostAsync(_webhookUrl, content); - response.EnsureSuccessStatusCode(); + foreach (var eventMessage in eventMessages) + { + await HandleEventAsync(eventMessage); + } } } diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 8a8de3d77d..a271b41784 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -74,6 +74,7 @@ + diff --git a/src/Events/Startup.cs b/src/Events/Startup.cs index 2e10e2971e..000aff4d77 100644 --- a/src/Events/Startup.cs +++ b/src/Events/Startup.cs @@ -2,6 +2,7 @@ using Bit.Core.AdminConsole.Services.Implementations; using Bit.Core.Context; using Bit.Core.IdentityServer; +using Bit.Core.Repositories; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Utilities; @@ -117,33 +118,26 @@ public class Startup globalSettings, globalSettings.EventLogging.RabbitMq.EventRepositoryQueueName)); - if (CoreHelpers.SettingHasValue(globalSettings.EventLogging.SlackToken) && - CoreHelpers.SettingHasValue(globalSettings.EventLogging.SlackUserEmail)) - { - services.AddHttpClient(SlackMessageSender.HttpClientName); - services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); - services.AddSingleton(provider => - new RabbitMqEventListenerService( - provider.GetRequiredService(), - provider.GetRequiredService>(), - globalSettings, - globalSettings.EventLogging.RabbitMq.SlackQueueName)); - } + services.AddHttpClient(SlackMessageSender.HttpClientName); + services.AddSingleton(); + services.AddSingleton(); - if (CoreHelpers.SettingHasValue(globalSettings.EventLogging.WebhookUrl)) - { - services.AddSingleton(); - services.AddHttpClient(WebhookEventHandler.HttpClientName); + services.AddSingleton(provider => + new RabbitMqEventListenerService( + provider.GetRequiredService(), + provider.GetRequiredService>(), + globalSettings, + globalSettings.EventLogging.RabbitMq.SlackQueueName)); - services.AddSingleton(provider => - new RabbitMqEventListenerService( - provider.GetRequiredService(), - provider.GetRequiredService>(), - globalSettings, - globalSettings.EventLogging.RabbitMq.WebhookQueueName)); - } + services.AddSingleton(); + services.AddSingleton(provider => + new RabbitMqEventListenerService( + provider.GetRequiredService(), + provider.GetRequiredService>(), + globalSettings, + globalSettings.EventLogging.RabbitMq.WebhookQueueName)); } }