mirror of
https://github.com/bitwarden/server.git
synced 2024-11-24 12:35:25 +01:00
f44a59f7a9
* Allow for binning of comb IDs by date and value
* Introduce notification hub pool
* Replace device type sharding with comb + range sharding
* Fix proxy interface
* Use enumerable services for multiServiceNotificationHub
* Fix push interface usage
* Fix push notification service dependencies
* Fix push notification keys
* Fixup documentation
* Remove deprecated settings
* Fix tests
* PascalCase method names
* Remove unused request model properties
* Remove unused setting
* Improve DateFromComb precision
* Prefer readonly service enumerable
* Pascal case template holes
* Name TryParse methods TryParse
* Apply suggestions from code review
Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
* AllClients is a set of clients and must be deduplicated
* Fix registration start time
* Add logging to initialization of a notification hub
* more logging
* Add lower level logging for hub settings
* Log when connection is resolved
* Improve log message
* Log pushes to notification hub
* temporarily elevate log messages for visibility
* Log in multi-service when relaying to another push service
* Revert to more reasonable logging free of user information
* Fixup merge
Deleting user was extracted to a command in #4803, this updates that work to use just the device ids as I did elsewhere in abd67e8ec
* Do not use bouncy castle exception types
* Add required services for logging
---------
Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Co-authored-by: bnagawiecki <107435978+bnagawiecki@users.noreply.github.com>
157 lines
5.0 KiB
C#
157 lines
5.0 KiB
C#
using Bit.Core.NotificationHub;
|
|
using Bit.Core.Settings;
|
|
using Bit.Core.Utilities;
|
|
using Microsoft.Extensions.Logging;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
using static Bit.Core.Settings.GlobalSettings;
|
|
|
|
namespace Bit.Core.Test.NotificationHub;
|
|
|
|
public class NotificationHubPoolTests
|
|
{
|
|
[Fact]
|
|
public void NotificationHubPool_WarnsOnMissingConnectionString()
|
|
{
|
|
// Arrange
|
|
var globalSettings = new GlobalSettings()
|
|
{
|
|
NotificationHubPool = new NotificationHubPoolSettings()
|
|
{
|
|
NotificationHubs = new() {
|
|
new() {
|
|
ConnectionString = null,
|
|
HubName = "hub",
|
|
RegistrationStartDate = DateTime.UtcNow,
|
|
RegistrationEndDate = DateTime.UtcNow.AddDays(1)
|
|
}
|
|
}
|
|
}
|
|
};
|
|
var logger = Substitute.For<ILogger<NotificationHubPool>>();
|
|
|
|
// Act
|
|
var sut = new NotificationHubPool(logger, globalSettings);
|
|
|
|
// Assert
|
|
logger.Received().Log(LogLevel.Warning, Arg.Any<EventId>(),
|
|
Arg.Is<object>(o => o.ToString() == "Invalid notification hub settings: hub"),
|
|
null,
|
|
Arg.Any<Func<object, Exception, string>>());
|
|
}
|
|
|
|
[Fact]
|
|
public void NotificationHubPool_WarnsOnMissingHubName()
|
|
{
|
|
// Arrange
|
|
var globalSettings = new GlobalSettings()
|
|
{
|
|
NotificationHubPool = new NotificationHubPoolSettings()
|
|
{
|
|
NotificationHubs = new() {
|
|
new() {
|
|
ConnectionString = "connection",
|
|
HubName = null,
|
|
RegistrationStartDate = DateTime.UtcNow,
|
|
RegistrationEndDate = DateTime.UtcNow.AddDays(1)
|
|
}
|
|
}
|
|
}
|
|
};
|
|
var logger = Substitute.For<ILogger<NotificationHubPool>>();
|
|
|
|
// Act
|
|
var sut = new NotificationHubPool(logger, globalSettings);
|
|
|
|
// Assert
|
|
logger.Received().Log(LogLevel.Warning, Arg.Any<EventId>(),
|
|
Arg.Is<object>(o => o.ToString() == "Invalid notification hub settings: hub name missing"),
|
|
null,
|
|
Arg.Any<Func<object, Exception, string>>());
|
|
}
|
|
|
|
[Fact]
|
|
public void NotificationHubPool_ClientFor_ThrowsOnNoValidHubs()
|
|
{
|
|
// Arrange
|
|
var globalSettings = new GlobalSettings()
|
|
{
|
|
NotificationHubPool = new NotificationHubPoolSettings()
|
|
{
|
|
NotificationHubs = new() {
|
|
new() {
|
|
ConnectionString = "connection",
|
|
HubName = "hub",
|
|
RegistrationStartDate = null,
|
|
RegistrationEndDate = null,
|
|
}
|
|
}
|
|
}
|
|
};
|
|
var logger = Substitute.For<ILogger<NotificationHubPool>>();
|
|
var sut = new NotificationHubPool(logger, globalSettings);
|
|
|
|
// Act
|
|
Action act = () => sut.ClientFor(Guid.NewGuid());
|
|
|
|
// Assert
|
|
Assert.Throws<InvalidOperationException>(act);
|
|
}
|
|
|
|
[Fact]
|
|
public void NotificationHubPool_ClientFor_ReturnsClient()
|
|
{
|
|
// Arrange
|
|
var globalSettings = new GlobalSettings()
|
|
{
|
|
NotificationHubPool = new NotificationHubPoolSettings()
|
|
{
|
|
NotificationHubs = new() {
|
|
new() {
|
|
ConnectionString = "Endpoint=sb://example.servicebus.windows.net/;SharedAccessKey=example///example=",
|
|
HubName = "hub",
|
|
RegistrationStartDate = DateTime.UtcNow.AddMinutes(-1),
|
|
RegistrationEndDate = DateTime.UtcNow.AddDays(1),
|
|
}
|
|
}
|
|
}
|
|
};
|
|
var logger = Substitute.For<ILogger<NotificationHubPool>>();
|
|
var sut = new NotificationHubPool(logger, globalSettings);
|
|
|
|
// Act
|
|
var client = sut.ClientFor(CoreHelpers.GenerateComb(Guid.NewGuid(), DateTime.UtcNow));
|
|
|
|
// Assert
|
|
Assert.NotNull(client);
|
|
}
|
|
|
|
[Fact]
|
|
public void NotificationHubPool_AllClients_ReturnsProxy()
|
|
{
|
|
// Arrange
|
|
var globalSettings = new GlobalSettings()
|
|
{
|
|
NotificationHubPool = new NotificationHubPoolSettings()
|
|
{
|
|
NotificationHubs = new() {
|
|
new() {
|
|
ConnectionString = "connection",
|
|
HubName = "hub",
|
|
RegistrationStartDate = DateTime.UtcNow,
|
|
RegistrationEndDate = DateTime.UtcNow.AddDays(1),
|
|
}
|
|
}
|
|
}
|
|
};
|
|
var logger = Substitute.For<ILogger<NotificationHubPool>>();
|
|
var sut = new NotificationHubPool(logger, globalSettings);
|
|
|
|
// Act
|
|
var proxy = sut.AllClients;
|
|
|
|
// Assert
|
|
Assert.NotNull(proxy);
|
|
}
|
|
}
|