mirror of
https://github.com/bitwarden/server.git
synced 2025-06-30 07:36:14 -05:00
[PM-16787] Web push enablement for server (#5395)
* 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> * Include preferred push technology in config response SignalR will be the fallback, but clients should attempt web push first if offered and available to the client. * Register web push devices * Working signing and content encrypting * update to RFC-8291 and RFC-8188 * Notification hub is now working, no need to create our own * Fix body * Flip Success Check * use nifty json attribute * Remove vapid private key This is only needed to encrypt data for transmission along webpush -- it's handled by NotificationHub for us * Add web push feature flag to control config response * Update src/Core/NotificationHub/NotificationHubConnection.cs Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com> * Update src/Core/NotificationHub/NotificationHubConnection.cs Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com> * fixup! Update src/Core/NotificationHub/NotificationHubConnection.cs * Move to platform ownership * Remove debugging extension * Remove unused dependencies * Set json content directly * Name web push registration data * Fix FCM type typo * Determine specific feature flag from set of flags * Fixup merged tests * Fixup tests * Code quality suggestions * Fix merged tests * Fix test --------- Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com>
This commit is contained in:
@ -23,6 +23,6 @@ public class ConfigController : Controller
|
||||
[HttpGet("")]
|
||||
public ConfigResponseModel GetConfigs()
|
||||
{
|
||||
return new ConfigResponseModel(_globalSettings, _featureService.GetAll());
|
||||
return new ConfigResponseModel(_featureService, _globalSettings);
|
||||
}
|
||||
}
|
||||
|
@ -186,6 +186,19 @@ public class DevicesController : Controller
|
||||
await _deviceService.SaveAsync(model.ToDevice(device));
|
||||
}
|
||||
|
||||
[HttpPut("identifier/{identifier}/web-push-auth")]
|
||||
[HttpPost("identifier/{identifier}/web-push-auth")]
|
||||
public async Task PutWebPushAuth(string identifier, [FromBody] WebPushAuthRequestModel model)
|
||||
{
|
||||
var device = await _deviceRepository.GetByIdentifierAsync(identifier, _userService.GetProperUserId(User).Value);
|
||||
if (device == null)
|
||||
{
|
||||
throw new NotFoundException();
|
||||
}
|
||||
|
||||
await _deviceService.SaveAsync(model.ToData(), device);
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
[HttpPut("identifier/{identifier}/clear-token")]
|
||||
[HttpPost("identifier/{identifier}/clear-token")]
|
||||
|
@ -1,6 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Bit.Core.Entities;
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.NotificationHub;
|
||||
using Bit.Core.Utilities;
|
||||
|
||||
namespace Bit.Api.Models.Request;
|
||||
@ -37,6 +38,26 @@ public class DeviceRequestModel
|
||||
}
|
||||
}
|
||||
|
||||
public class WebPushAuthRequestModel
|
||||
{
|
||||
[Required]
|
||||
public string Endpoint { get; set; }
|
||||
[Required]
|
||||
public string P256dh { get; set; }
|
||||
[Required]
|
||||
public string Auth { get; set; }
|
||||
|
||||
public WebPushRegistrationData ToData()
|
||||
{
|
||||
return new WebPushRegistrationData
|
||||
{
|
||||
Endpoint = Endpoint,
|
||||
P256dh = P256dh,
|
||||
Auth = Auth
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public class DeviceTokenRequestModel
|
||||
{
|
||||
[StringLength(255)]
|
||||
|
@ -1,4 +1,7 @@
|
||||
using Bit.Core.Models.Api;
|
||||
using Bit.Core;
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.Models.Api;
|
||||
using Bit.Core.Services;
|
||||
using Bit.Core.Settings;
|
||||
using Bit.Core.Utilities;
|
||||
|
||||
@ -11,6 +14,7 @@ public class ConfigResponseModel : ResponseModel
|
||||
public ServerConfigResponseModel Server { get; set; }
|
||||
public EnvironmentConfigResponseModel Environment { get; set; }
|
||||
public IDictionary<string, object> FeatureStates { get; set; }
|
||||
public PushSettings Push { get; set; }
|
||||
public ServerSettingsResponseModel Settings { get; set; }
|
||||
|
||||
public ConfigResponseModel() : base("config")
|
||||
@ -23,8 +27,9 @@ public class ConfigResponseModel : ResponseModel
|
||||
}
|
||||
|
||||
public ConfigResponseModel(
|
||||
IGlobalSettings globalSettings,
|
||||
IDictionary<string, object> featureStates) : base("config")
|
||||
IFeatureService featureService,
|
||||
IGlobalSettings globalSettings
|
||||
) : base("config")
|
||||
{
|
||||
Version = AssemblyHelpers.GetVersion();
|
||||
GitHash = AssemblyHelpers.GetGitHash();
|
||||
@ -37,7 +42,9 @@ public class ConfigResponseModel : ResponseModel
|
||||
Notifications = globalSettings.BaseServiceUri.Notifications,
|
||||
Sso = globalSettings.BaseServiceUri.Sso
|
||||
};
|
||||
FeatureStates = featureStates;
|
||||
FeatureStates = featureService.GetAll();
|
||||
var webPushEnabled = FeatureStates.TryGetValue(FeatureFlagKeys.WebPush, out var webPushEnabledValue) ? (bool)webPushEnabledValue : false;
|
||||
Push = PushSettings.Build(webPushEnabled, globalSettings);
|
||||
Settings = new ServerSettingsResponseModel
|
||||
{
|
||||
DisableUserRegistration = globalSettings.DisableUserRegistration
|
||||
@ -61,6 +68,23 @@ public class EnvironmentConfigResponseModel
|
||||
public string Sso { get; set; }
|
||||
}
|
||||
|
||||
public class PushSettings
|
||||
{
|
||||
public PushTechnologyType PushTechnology { get; private init; }
|
||||
public string VapidPublicKey { get; private init; }
|
||||
|
||||
public static PushSettings Build(bool webPushEnabled, IGlobalSettings globalSettings)
|
||||
{
|
||||
var vapidPublicKey = webPushEnabled ? globalSettings.WebPush.VapidPublicKey : null;
|
||||
var pushTechnology = vapidPublicKey != null ? PushTechnologyType.WebPush : PushTechnologyType.SignalR;
|
||||
return new()
|
||||
{
|
||||
VapidPublicKey = vapidPublicKey,
|
||||
PushTechnology = pushTechnology
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public class ServerSettingsResponseModel
|
||||
{
|
||||
public bool DisableUserRegistration { get; set; }
|
||||
|
@ -1,6 +1,7 @@
|
||||
using Bit.Core.Context;
|
||||
using Bit.Core.Exceptions;
|
||||
using Bit.Core.Models.Api;
|
||||
using Bit.Core.NotificationHub;
|
||||
using Bit.Core.Platform.Push;
|
||||
using Bit.Core.Settings;
|
||||
using Bit.Core.Utilities;
|
||||
@ -42,9 +43,8 @@ public class PushController : Controller
|
||||
public async Task RegisterAsync([FromBody] PushRegistrationRequestModel model)
|
||||
{
|
||||
CheckUsage();
|
||||
await _pushRegistrationService.CreateOrUpdateRegistrationAsync(model.PushToken, Prefix(model.DeviceId),
|
||||
Prefix(model.UserId), Prefix(model.Identifier), model.Type, model.OrganizationIds.Select(Prefix),
|
||||
model.InstallationId);
|
||||
await _pushRegistrationService.CreateOrUpdateRegistrationAsync(new PushRegistrationData(model.PushToken), Prefix(model.DeviceId),
|
||||
Prefix(model.UserId), Prefix(model.Identifier), model.Type, model.OrganizationIds.Select(Prefix), model.InstallationId);
|
||||
}
|
||||
|
||||
[HttpPost("delete")]
|
||||
|
11
src/Api/Platform/Push/PushTechnologyType.cs
Normal file
11
src/Api/Platform/Push/PushTechnologyType.cs
Normal file
@ -0,0 +1,11 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Bit.Core.Enums;
|
||||
|
||||
public enum PushTechnologyType
|
||||
{
|
||||
[Display(Name = "SignalR")]
|
||||
SignalR = 0,
|
||||
[Display(Name = "WebPush")]
|
||||
WebPush = 1,
|
||||
}
|
Reference in New Issue
Block a user