nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

Fix queue message encoding for Azure (UTF-16 in XML) (#1439)

Browse Source 
* Revert "Encode into b64 to avoid illegal xml encoding when sending to Azure (#1425)"

This reverts commit 2c9a5bb4ab.

* Azure queue to use base64 encoding universally

* Ensure byte size calc is using encoded byte count

* Remove message text extension from blockIP svc

* Remove unused using on blockIp hosted service
This commit is contained in:
Chad Scharf
2021-07-07 10:49:59 -04:00
committed by GitHub
parent 908e1504af
commit 898c7baf89
6 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Admin/HostedServices/AzureQueueMailHostedService.cs
View File

@ -18,7 +18,6 @@ namespace Bit.Admin.HostedServices
{
public class AzureQueueMailHostedService : IHostedService
{
private readonly JsonSerializer _jsonSerializer;
private readonly ILogger<AzureQueueMailHostedService> _logger;
private readonly GlobalSettings _globalSettings;
private readonly IMailService _mailService;
@ -35,11 +34,6 @@ namespace Bit.Admin.HostedServices
_logger = logger;
_mailService = mailService;
_globalSettings = globalSettings;
_jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings
{
Converters = new[] { new EncodedStringConverter() },
});
}
public Task StartAsync(CancellationToken cancellationToken)
@ -76,10 +70,10 @@ namespace Bit.Admin.HostedServices
{
try
{
var token = JToken.Parse(message.MessageText);
var token = JToken.Parse(message.DecodeMessageText());
if (token is JArray)
{
foreach (var mailQueueMessage in token.ToObject<List<MailQueueMessage>>(_jsonSerializer))
foreach (var mailQueueMessage in token.ToObject<List<MailQueueMessage>>())
{
await _mailService.SendEnqueuedMailMessageAsync(mailQueueMessage);
}