mirror of
https://github.com/Radarr/Radarr.git
synced 2024-08-16 15:29:40 +02:00
New: Option to disable Email encryption
* New: Option to disable Email encryption (cherry picked from commit 7be5732a3a6679120b0f01bd1eb1207194f57f5e) * Fix possible NullRef in Email Encryption migration (cherry picked from commit 271266b10ac51ee6dd7a7024d346b631bd5397c2) --------- Co-authored-by: Mark McDowall <mark@mcdowall.ca>
This commit is contained in:
parent
23830f50ac
commit
4beb5b328b
@ -0,0 +1,166 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using FluentAssertions;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NzbDrone.Common.Serializer;
|
||||||
|
using NzbDrone.Core.Datastore.Migration;
|
||||||
|
using NzbDrone.Core.Notifications.Email;
|
||||||
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Test.Datastore.Migration
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class email_encryptionFixture : MigrationTest<email_encryption>
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void should_convert_do_not_require_encryption_to_auto()
|
||||||
|
{
|
||||||
|
var db = WithMigrationTestDb(c =>
|
||||||
|
{
|
||||||
|
c.Insert.IntoTable("Notifications").Row(new
|
||||||
|
{
|
||||||
|
OnGrab = true,
|
||||||
|
OnDownload = true,
|
||||||
|
OnUpgrade = true,
|
||||||
|
OnHealthIssue = true,
|
||||||
|
IncludeHealthWarnings = true,
|
||||||
|
OnRename = true,
|
||||||
|
OnMovieDelete = false,
|
||||||
|
Name = "Mail Radarr",
|
||||||
|
Implementation = "Email",
|
||||||
|
Tags = "[]",
|
||||||
|
Settings = new EmailSettings234
|
||||||
|
{
|
||||||
|
Server = "smtp.gmail.com",
|
||||||
|
Port = 563,
|
||||||
|
To = new List<string> { "dont@email.me" },
|
||||||
|
RequireEncryption = false
|
||||||
|
}.ToJson(),
|
||||||
|
ConfigContract = "EmailSettings"
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
var items = db.Query<NotificationDefinition235>("SELECT * FROM \"Notifications\"");
|
||||||
|
|
||||||
|
items.Should().HaveCount(1);
|
||||||
|
items.First().Implementation.Should().Be("Email");
|
||||||
|
items.First().ConfigContract.Should().Be("EmailSettings");
|
||||||
|
items.First().Settings.UseEncryption.Should().Be((int)EmailEncryptionType.Preferred);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_convert_require_encryption_to_always()
|
||||||
|
{
|
||||||
|
var db = WithMigrationTestDb(c =>
|
||||||
|
{
|
||||||
|
c.Insert.IntoTable("Notifications").Row(new
|
||||||
|
{
|
||||||
|
OnGrab = true,
|
||||||
|
OnDownload = true,
|
||||||
|
OnUpgrade = true,
|
||||||
|
OnHealthIssue = true,
|
||||||
|
IncludeHealthWarnings = true,
|
||||||
|
OnRename = true,
|
||||||
|
OnMovieDelete = false,
|
||||||
|
Name = "Mail Radarr",
|
||||||
|
Implementation = "Email",
|
||||||
|
Tags = "[]",
|
||||||
|
Settings = new EmailSettings234
|
||||||
|
{
|
||||||
|
Server = "smtp.gmail.com",
|
||||||
|
Port = 563,
|
||||||
|
To = new List<string> { "dont@email.me" },
|
||||||
|
RequireEncryption = true
|
||||||
|
}.ToJson(),
|
||||||
|
ConfigContract = "EmailSettings"
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
var items = db.Query<NotificationDefinition235>("SELECT * FROM \"Notifications\"");
|
||||||
|
|
||||||
|
items.Should().HaveCount(1);
|
||||||
|
items.First().Implementation.Should().Be("Email");
|
||||||
|
items.First().ConfigContract.Should().Be("EmailSettings");
|
||||||
|
items.First().Settings.UseEncryption.Should().Be((int)EmailEncryptionType.Always);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_use_defaults_when_settings_are_empty()
|
||||||
|
{
|
||||||
|
var db = WithMigrationTestDb(c =>
|
||||||
|
{
|
||||||
|
c.Insert.IntoTable("Notifications").Row(new
|
||||||
|
{
|
||||||
|
OnGrab = true,
|
||||||
|
OnDownload = true,
|
||||||
|
OnUpgrade = true,
|
||||||
|
OnHealthIssue = true,
|
||||||
|
IncludeHealthWarnings = true,
|
||||||
|
OnRename = true,
|
||||||
|
OnMovieDelete = false,
|
||||||
|
Name = "Mail Radarr",
|
||||||
|
Implementation = "Email",
|
||||||
|
Tags = "[]",
|
||||||
|
Settings = new { }.ToJson(),
|
||||||
|
ConfigContract = "EmailSettings"
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
var items = db.Query<NotificationDefinition235>("SELECT * FROM \"Notifications\"");
|
||||||
|
|
||||||
|
items.Should().HaveCount(1);
|
||||||
|
items.First().Implementation.Should().Be("Email");
|
||||||
|
items.First().ConfigContract.Should().Be("EmailSettings");
|
||||||
|
items.First().Settings.UseEncryption.Should().Be((int)EmailEncryptionType.Preferred);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class NotificationDefinition235
|
||||||
|
{
|
||||||
|
public int Id { get; set; }
|
||||||
|
public string Implementation { get; set; }
|
||||||
|
public string ConfigContract { get; set; }
|
||||||
|
public EmailSettings235 Settings { get; set; }
|
||||||
|
public string Name { get; set; }
|
||||||
|
public bool OnGrab { get; set; }
|
||||||
|
public bool OnDownload { get; set; }
|
||||||
|
public bool OnUpgrade { get; set; }
|
||||||
|
public bool OnRename { get; set; }
|
||||||
|
public bool OnMovieDelete { get; set; }
|
||||||
|
public bool OnMovieFileDelete { get; set; }
|
||||||
|
public bool OnMovieFileDeleteForUpgrade { get; set; }
|
||||||
|
public bool OnHealthIssue { get; set; }
|
||||||
|
public bool OnApplicationUpdate { get; set; }
|
||||||
|
public bool OnManualInteractionRequired { get; set; }
|
||||||
|
public bool OnMovieAdded { get; set; }
|
||||||
|
public bool OnHealthRestored { get; set; }
|
||||||
|
public bool IncludeHealthWarnings { get; set; }
|
||||||
|
public List<int> Tags { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class EmailSettings234
|
||||||
|
{
|
||||||
|
public string Server { get; set; }
|
||||||
|
public int Port { get; set; }
|
||||||
|
public bool RequireEncryption { get; set; }
|
||||||
|
public string Username { get; set; }
|
||||||
|
public string Password { get; set; }
|
||||||
|
public string From { get; set; }
|
||||||
|
public IEnumerable<string> To { get; set; }
|
||||||
|
public IEnumerable<string> Cc { get; set; }
|
||||||
|
public IEnumerable<string> Bcc { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class EmailSettings235
|
||||||
|
{
|
||||||
|
public string Server { get; set; }
|
||||||
|
public int Port { get; set; }
|
||||||
|
public int UseEncryption { get; set; }
|
||||||
|
public string Username { get; set; }
|
||||||
|
public string Password { get; set; }
|
||||||
|
public string From { get; set; }
|
||||||
|
public IEnumerable<string> To { get; set; }
|
||||||
|
public IEnumerable<string> Cc { get; set; }
|
||||||
|
public IEnumerable<string> Bcc { get; set; }
|
||||||
|
}
|
||||||
|
}
|
@ -25,6 +25,7 @@ public void Setup()
|
|||||||
_emailSettings = Builder<EmailSettings>.CreateNew()
|
_emailSettings = Builder<EmailSettings>.CreateNew()
|
||||||
.With(s => s.Server = "someserver")
|
.With(s => s.Server = "someserver")
|
||||||
.With(s => s.Port = 567)
|
.With(s => s.Port = 567)
|
||||||
|
.With(s => s.UseEncryption = (int)EmailEncryptionType.Always)
|
||||||
.With(s => s.From = "radarr@radarr.video")
|
.With(s => s.From = "radarr@radarr.video")
|
||||||
.With(s => s.To = new string[] { "radarr@radarr.video" })
|
.With(s => s.To = new string[] { "radarr@radarr.video" })
|
||||||
.Build();
|
.Build();
|
||||||
|
@ -0,0 +1,50 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Data;
|
||||||
|
using Dapper;
|
||||||
|
using FluentMigrator;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
using NzbDrone.Common.Serializer;
|
||||||
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
|
{
|
||||||
|
[Migration(235)]
|
||||||
|
public class email_encryption : NzbDroneMigrationBase
|
||||||
|
{
|
||||||
|
protected override void MainDbUpgrade()
|
||||||
|
{
|
||||||
|
Execute.WithConnection(ChangeEncryption);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ChangeEncryption(IDbConnection conn, IDbTransaction tran)
|
||||||
|
{
|
||||||
|
var updated = new List<object>();
|
||||||
|
using (var getEmailCmd = conn.CreateCommand())
|
||||||
|
{
|
||||||
|
getEmailCmd.Transaction = tran;
|
||||||
|
getEmailCmd.CommandText = "SELECT \"Id\", \"Settings\" FROM \"Notifications\" WHERE \"Implementation\" = 'Email'";
|
||||||
|
|
||||||
|
using (var reader = getEmailCmd.ExecuteReader())
|
||||||
|
{
|
||||||
|
while (reader.Read())
|
||||||
|
{
|
||||||
|
var id = reader.GetInt32(0);
|
||||||
|
var settings = Json.Deserialize<JObject>(reader.GetString(1));
|
||||||
|
|
||||||
|
settings["useEncryption"] = settings.Value<bool?>("requireEncryption") ?? false ? 1 : 0;
|
||||||
|
settings["requireEncryption"] = null;
|
||||||
|
|
||||||
|
updated.Add(new
|
||||||
|
{
|
||||||
|
Settings = settings.ToJson(),
|
||||||
|
Id = id
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var updateSql = "UPDATE \"Notifications\" SET \"Settings\" = @Settings WHERE \"Id\" = @Id";
|
||||||
|
conn.Execute(updateSql, updated, transaction: tran);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -830,10 +830,10 @@
|
|||||||
"NotificationsEmailSettingsName": "Email",
|
"NotificationsEmailSettingsName": "Email",
|
||||||
"NotificationsEmailSettingsRecipientAddress": "Recipient Address(es)",
|
"NotificationsEmailSettingsRecipientAddress": "Recipient Address(es)",
|
||||||
"NotificationsEmailSettingsRecipientAddressHelpText": "Comma separated list of email recipients",
|
"NotificationsEmailSettingsRecipientAddressHelpText": "Comma separated list of email recipients",
|
||||||
"NotificationsEmailSettingsRequireEncryption": "Require Encryption",
|
|
||||||
"NotificationsEmailSettingsRequireEncryptionHelpText": "Require SSL (Port 465 only) or StartTLS (any other port)",
|
|
||||||
"NotificationsEmailSettingsServer": "Server",
|
"NotificationsEmailSettingsServer": "Server",
|
||||||
"NotificationsEmailSettingsServerHelpText": "Hostname or IP of Email server",
|
"NotificationsEmailSettingsServerHelpText": "Hostname or IP of Email server",
|
||||||
|
"NotificationsEmailSettingsUseEncryption": "Use Encryption",
|
||||||
|
"NotificationsEmailSettingsUseEncryptionHelpText": "Whether to prefer using encryption if configured on the server, to always use encryption via SSL (Port 465 only) or StartTLS (any other port) or to never use encryption",
|
||||||
"NotificationsEmbySettingsSendNotifications": "Send Notifications",
|
"NotificationsEmbySettingsSendNotifications": "Send Notifications",
|
||||||
"NotificationsEmbySettingsSendNotificationsHelpText": "Have MediaBrowser send notifications to configured providers",
|
"NotificationsEmbySettingsSendNotificationsHelpText": "Have MediaBrowser send notifications to configured providers",
|
||||||
"NotificationsEmbySettingsUpdateLibraryHelpText": "Update Library on Import, Rename, or Delete?",
|
"NotificationsEmbySettingsUpdateLibraryHelpText": "Update Library on Import, Rename, or Delete?",
|
||||||
|
@ -135,19 +135,16 @@ private void Send(MimeMessage email, EmailSettings settings)
|
|||||||
using var client = new SmtpClient();
|
using var client = new SmtpClient();
|
||||||
client.Timeout = 10000;
|
client.Timeout = 10000;
|
||||||
|
|
||||||
var serverOption = SecureSocketOptions.Auto;
|
var useEncyption = (EmailEncryptionType)settings.UseEncryption;
|
||||||
|
|
||||||
if (settings.RequireEncryption)
|
var serverOption = useEncyption switch
|
||||||
{
|
{
|
||||||
if (settings.Port == 465)
|
EmailEncryptionType.Always => settings.Port == 465
|
||||||
{
|
? SecureSocketOptions.SslOnConnect
|
||||||
serverOption = SecureSocketOptions.SslOnConnect;
|
: SecureSocketOptions.StartTls,
|
||||||
}
|
EmailEncryptionType.Never => SecureSocketOptions.None,
|
||||||
else
|
_ => SecureSocketOptions.Auto
|
||||||
{
|
};
|
||||||
serverOption = SecureSocketOptions.StartTls;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
client.ServerCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError;
|
client.ServerCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError;
|
||||||
|
|
||||||
|
@ -45,8 +45,8 @@ public EmailSettings()
|
|||||||
[FieldDefinition(1, Label = "Port")]
|
[FieldDefinition(1, Label = "Port")]
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(2, Label = "NotificationsEmailSettingsRequireEncryption", HelpText = "NotificationsEmailSettingsRequireEncryptionHelpText", Type = FieldType.Checkbox)]
|
[FieldDefinition(2, Label = "NotificationsEmailSettingsUseEncryption", HelpText = "NotificationsEmailSettingsUseEncryptionHelpText", Type = FieldType.Select, SelectOptions = typeof(EmailEncryptionType))]
|
||||||
public bool RequireEncryption { get; set; }
|
public int UseEncryption { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(3, Label = "Username", Privacy = PrivacyLevel.UserName)]
|
[FieldDefinition(3, Label = "Username", Privacy = PrivacyLevel.UserName)]
|
||||||
public string Username { get; set; }
|
public string Username { get; set; }
|
||||||
@ -71,4 +71,11 @@ public NzbDroneValidationResult Validate()
|
|||||||
return new NzbDroneValidationResult(Validator.Validate(this));
|
return new NzbDroneValidationResult(Validator.Validate(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum EmailEncryptionType
|
||||||
|
{
|
||||||
|
Preferred = 0,
|
||||||
|
Always = 1,
|
||||||
|
Never = 2
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user