diff --git a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs index 9ae370529..7bebcdf09 100644 --- a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs +++ b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs @@ -64,6 +64,7 @@ namespace NzbDrone.Common.Test.InstrumentationTests [TestCase(@"OutputPath=/home/mySecret/Downloads")] [TestCase("Hardlinking episode file: /home/mySecret/Downloads to /media/abc.mkv")] [TestCase("Hardlink '/home/mySecret/Downloads/abs.mkv' to '/media/abc.mkv' failed.")] + [TestCase("https://notifiarr.com/notifier.php: api=1234530f-422f-4aac-b6b3-01233210aaaa&radarr_health_issue_message=Download")] // Announce URLs (passkeys) Magnet & Tracker [TestCase(@"magnet_uri"":""magnet:?xt=urn:btih:9pr04sgkillroyimaveql2tyu8xyui&dn=&tr=https%3a%2f%2fxxx.yyy%2f9pr04sg601233210imaveql2tyu8xyui%2fannounce""}")] diff --git a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs index 862853e74..c62f76569 100644 --- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs +++ b/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net; using System.Text.RegularExpressions; @@ -11,7 +11,7 @@ namespace NzbDrone.Common.Instrumentation private static readonly Regex[] CleansingRules = new[] { // Url - new Regex(@"(?<=\?|&)(apikey|token|passkey|auth|authkey|user|uid|api|[a-z_]*apikey|refresh_token|account|passwd)=(?[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), + new Regex(@"(?<=\?|&|: )(apikey|token|passkey|auth|authkey|user|uid|api|[a-z_]*apikey|refresh_token|account|passwd)=(?[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), new Regex(@"(?<=\?|&)[^=]*?(username|password)=(?[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), new Regex(@"torrentleech\.org/(?!rss)(?[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase), new Regex(@"torrentleech\.org/rss/download/[0-9]+/(?[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase), @@ -19,13 +19,13 @@ namespace NzbDrone.Common.Instrumentation new Regex(@"/fetch/[a-z0-9]{32}/(?[a-z0-9]{32})", RegexOptions.Compiled), new Regex(@"getnzb.*?(?<=\?|&)(r)=(?[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), - // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory - new Regex(@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?[a-z0-9]{16,})|(?[a-z0-9]{16,})(/|%2f)announce"), - // Path new Regex(@"C:\\Users\\(?[^\""]+?)(\\|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), new Regex(@"/home/(?[^/""]+?)(/|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), + // Trackers Announce Keys; Designed for Qbit Json; should work for all in theory + new Regex(@"announce(\.php)?(/|%2f|%3fpasskey%3d)(?[a-z0-9]{16,})|(?[a-z0-9]{16,})(/|%2f)announce"), + // NzbGet new Regex(@"""Name""\s*:\s*""[^""]*(username|password)""\s*,\s*""Value""\s*:\s*""(?[^""]+?)""", RegexOptions.Compiled | RegexOptions.IgnoreCase), diff --git a/src/NzbDrone.Core/Datastore/Migration/047_update_notifiarr.cs b/src/NzbDrone.Core/Datastore/Migration/047_update_notifiarr.cs new file mode 100644 index 000000000..3753fc533 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/047_update_notifiarr.cs @@ -0,0 +1,15 @@ +using FluentMigrator; +using Newtonsoft.Json.Linq; +using NzbDrone.Core.Datastore.Migration.Framework; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(47)] + public class update_notifiarr : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Execute.Sql("UPDATE Notifications SET Implementation = Replace(Implementation, 'DiscordNotifier', 'Notifiarr'),ConfigContract = Replace(ConfigContract, 'DiscordNotifierSettings', 'NotifiarrSettings') WHERE Implementation = 'DiscordNotifier';"); + } + } +} diff --git a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierException.cs b/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierException.cs deleted file mode 100644 index e41b776da..000000000 --- a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierException.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using NzbDrone.Common.Exceptions; - -namespace NzbDrone.Core.Notifications.DiscordNotifier -{ - public class DiscordNotifierException : NzbDroneException - { - public DiscordNotifierException(string message) - : base(message) - { - } - - public DiscordNotifierException(string message, Exception innerException, params object[] args) - : base(message, innerException, args) - { - } - } -} diff --git a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierSettings.cs b/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierSettings.cs deleted file mode 100644 index ae3f910cc..000000000 --- a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierSettings.cs +++ /dev/null @@ -1,28 +0,0 @@ -using FluentValidation; -using NzbDrone.Core.Annotations; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Validation; - -namespace NzbDrone.Core.Notifications.DiscordNotifier -{ - public class DiscordNotifierSettingsValidator : AbstractValidator - { - public DiscordNotifierSettingsValidator() - { - RuleFor(c => c.APIKey).NotEmpty(); - } - } - - public class DiscordNotifierSettings : IProviderConfig - { - private static readonly DiscordNotifierSettingsValidator Validator = new DiscordNotifierSettingsValidator(); - - [FieldDefinition(0, Label = "API Key", HelpText = "Your API key from your profile", HelpLink = "https://discordnotifier.com")] - public string APIKey { get; set; } - - public NzbDroneValidationResult Validate() - { - return new NzbDroneValidationResult(Validator.Validate(this)); - } - } -} diff --git a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs b/src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs similarity index 92% rename from src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs rename to src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs index 1c4830ca0..57f6f1a00 100644 --- a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs +++ b/src/NzbDrone.Core/Notifications/Notifiarr/Notifiarr.cs @@ -6,19 +6,19 @@ using System.Linq; using FluentValidation.Results; using NzbDrone.Common.Extensions; -namespace NzbDrone.Core.Notifications.DiscordNotifier +namespace NzbDrone.Core.Notifications.Notifiarr { - public class DiscordNotifier : NotificationBase + public class Notifiarr : NotificationBase { - private readonly IDiscordNotifierProxy _proxy; + private readonly INotifiarrProxy _proxy; - public DiscordNotifier(IDiscordNotifierProxy proxy) + public Notifiarr(INotifiarrProxy proxy) { _proxy = proxy; } - public override string Link => "https://discordnotifier.com"; - public override string Name => "DiscordNotifier.com"; + public override string Link => "https://notifiarr.com"; + public override string Name => "Notifiarr"; public override void OnGrab(GrabMessage message) { diff --git a/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrException.cs b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrException.cs new file mode 100644 index 000000000..283edda13 --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrException.cs @@ -0,0 +1,18 @@ +using System; +using NzbDrone.Common.Exceptions; + +namespace NzbDrone.Core.Notifications.Notifiarr +{ + public class NotifiarrException : NzbDroneException + { + public NotifiarrException(string message) + : base(message) + { + } + + public NotifiarrException(string message, Exception innerException, params object[] args) + : base(message, innerException, args) + { + } + } +} diff --git a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierProxy.cs b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs similarity index 73% rename from src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierProxy.cs rename to src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs index 548ac3bdc..6e7688ddd 100644 --- a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifierProxy.cs +++ b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs @@ -7,40 +7,40 @@ using NLog; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Http; -namespace NzbDrone.Core.Notifications.DiscordNotifier +namespace NzbDrone.Core.Notifications.Notifiarr { - public interface IDiscordNotifierProxy + public interface INotifiarrProxy { - void SendNotification(StringDictionary message, DiscordNotifierSettings settings); - ValidationFailure Test(DiscordNotifierSettings settings); + void SendNotification(StringDictionary message, NotifiarrSettings settings); + ValidationFailure Test(NotifiarrSettings settings); } - public class DiscordNotifierProxy : IDiscordNotifierProxy + public class NotifiarrProxy : INotifiarrProxy { - private const string URL = "https://discordnotifier.com/notifier.php"; + private const string URL = "https://notifiarr.com/notifier.php"; private readonly IHttpClient _httpClient; private readonly Logger _logger; - public DiscordNotifierProxy(IHttpClient httpClient, Logger logger) + public NotifiarrProxy(IHttpClient httpClient, Logger logger) { _httpClient = httpClient; _logger = logger; } - public void SendNotification(StringDictionary message, DiscordNotifierSettings settings) + public void SendNotification(StringDictionary message, NotifiarrSettings settings) { try { ProcessNotification(message, settings); } - catch (DiscordNotifierException ex) + catch (NotifiarrException ex) { _logger.Error(ex, "Unable to send notification"); - throw new DiscordNotifierException("Unable to send notification"); + throw new NotifiarrException("Unable to send notification"); } } - public ValidationFailure Test(DiscordNotifierSettings settings) + public ValidationFailure Test(NotifiarrSettings settings) { try { @@ -68,7 +68,7 @@ namespace NzbDrone.Core.Notifications.DiscordNotifier } } - private void ProcessNotification(StringDictionary message, DiscordNotifierSettings settings) + private void ProcessNotification(StringDictionary message, NotifiarrSettings settings) { try { @@ -92,7 +92,7 @@ namespace NzbDrone.Core.Notifications.DiscordNotifier throw; } - throw new DiscordNotifierException("Unable to send notification", ex); + throw new NotifiarrException("Unable to send notification", ex); } } } diff --git a/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrSettings.cs b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrSettings.cs new file mode 100644 index 000000000..1a8bb06c9 --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrSettings.cs @@ -0,0 +1,28 @@ +using FluentValidation; +using NzbDrone.Core.Annotations; +using NzbDrone.Core.ThingiProvider; +using NzbDrone.Core.Validation; + +namespace NzbDrone.Core.Notifications.Notifiarr +{ + public class NotifiarrSettingsValidator : AbstractValidator + { + public NotifiarrSettingsValidator() + { + RuleFor(c => c.APIKey).NotEmpty(); + } + } + + public class NotifiarrSettings : IProviderConfig + { + private static readonly NotifiarrSettingsValidator Validator = new NotifiarrSettingsValidator(); + + [FieldDefinition(0, Label = "API Key", Privacy = PrivacyLevel.ApiKey, HelpText = "Your API key from your profile", HelpLink = "https://notifiarr.com")] + public string APIKey { get; set; } + + public NzbDroneValidationResult Validate() + { + return new NzbDroneValidationResult(Validator.Validate(this)); + } + } +}