Simplify X-Forwarded-For handling

This happens in asp.net middleware now

Co-Authored-By: ta264 <ta264@users.noreply.github.com>

(cherry picked from commit 16e2d130e6a2e7239bcfe92187a7f990f93eff00)

frontend/src/Store/Actions/Creators/createSaveProviderHandler.js

@@ -54,7 +54,7 @@ function createSaveProviderHandler(section, url, options = {}, removeStale = fal
 
     request.done((data) => {
       lastSaveData = null;
-      
+
       if (!Array.isArray(data)) {
         data = [data];
       }

src/NzbDrone.Core/Download/Clients/Flood/Flood.cs

@@ -125,22 +125,22 @@ namespace NzbDrone.Core.Download.Clients.Flood
                     item.RemainingTime = TimeSpan.FromSeconds(properties.Eta);
                 }
 
-                if (properties.Status.Contains("error"))
+                if (properties.Status.Contains("seeding") || properties.Status.Contains("complete"))
-                {
-                    item.Status = DownloadItemStatus.Warning;
-                }
-                else if (properties.Status.Contains("seeding") || properties.Status.Contains("complete"))
                 {
                     item.Status = DownloadItemStatus.Completed;
                 }
-                else if (properties.Status.Contains("downloading"))
-                {
-                    item.Status = DownloadItemStatus.Downloading;
-                }
                 else if (properties.Status.Contains("stopped"))
                 {
                     item.Status = DownloadItemStatus.Paused;
                 }
+                else if (properties.Status.Contains("error"))
+                {
+                    item.Status = DownloadItemStatus.Warning;
+                }
+                else if (properties.Status.Contains("downloading"))
+                {
+                    item.Status = DownloadItemStatus.Downloading;
+                }
 
                 if (item.Status == DownloadItemStatus.Completed)
                 {

src/NzbDrone.Core/Notifications/Simplepush/Simplepush.cs

@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using FluentValidation.Results;
-using NzbDrone.Common.Extensions;
-
-namespace NzbDrone.Core.Notifications.Simplepush
-{
-    public class Simplepush : NotificationBase<SimplepushSettings>
-    {
-        private readonly ISimplepushProxy _proxy;
-
-        public Simplepush(ISimplepushProxy proxy)
-        {
-            _proxy = proxy;
-        }
-
-        public override string Name => "Simplepush";
-        public override string Link => "https://simplepush.io/";
-
-        public override void OnGrab(GrabMessage grabMessage)
-        {
-            _proxy.SendNotification(EPISODE_GRABBED_TITLE, grabMessage.Message, Settings);
-        }
-
-        public override void OnDownload(DownloadMessage message)
-        {
-            _proxy.SendNotification(EPISODE_DOWNLOADED_TITLE, message.Message, Settings);
-        }
-
-        public override void OnEpisodeFileDelete(EpisodeDeleteMessage deleteMessage)
-        {
-            _proxy.SendNotification(EPISODE_DELETED_TITLE, deleteMessage.Message, Settings);
-        }
-
-        public override void OnSeriesDelete(SeriesDeleteMessage deleteMessage)
-        {
-            _proxy.SendNotification(SERIES_DELETED_TITLE, deleteMessage.Message, Settings);
-        }
-
-        public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck)
-        {
-            _proxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings);
-        }
-
-        public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
-        {
-            _proxy.SendNotification(APPLICATION_UPDATE_TITLE, updateMessage.Message, Settings);
-        }
-
-        public override ValidationResult Test()
-        {
-            var failures = new List<ValidationFailure>();
-
-            failures.AddIfNotNull(_proxy.Test(Settings));
-
-            return new ValidationResult(failures);
-        }
-    }
-}

src/NzbDrone.Core/Notifications/Simplepush/SimplepushProxy.cs

@@ -1,58 +0,0 @@
-using System;
-using FluentValidation.Results;
-using NLog;
-using NzbDrone.Common.Http;
-
-namespace NzbDrone.Core.Notifications.Simplepush
-{
-    public interface ISimplepushProxy
-    {
-        void SendNotification(string title, string message, SimplepushSettings settings);
-        ValidationFailure Test(SimplepushSettings settings);
-    }
-
-    public class SimplepushProxy : ISimplepushProxy
-    {
-        private const string URL = "https://api.simplepush.io/send";
-        private readonly IHttpClient _httpClient;
-        private readonly Logger _logger;
-
-        public SimplepushProxy(IHttpClient httpClient, Logger logger)
-        {
-            _httpClient = httpClient;
-            _logger = logger;
-        }
-
-        public void SendNotification(string title, string message, SimplepushSettings settings)
-        {
-            var requestBuilder = new HttpRequestBuilder(URL).Post();
-
-            requestBuilder.AddFormParameter("key", settings.Key)
-                          .AddFormParameter("event", settings.Event)
-                          .AddFormParameter("title", title)
-                          .AddFormParameter("msg", message);
-
-            var request = requestBuilder.Build();
-
-            _httpClient.Post(request);
-        }
-
-        public ValidationFailure Test(SimplepushSettings settings)
-        {
-            try
-            {
-                const string title = "Test Notification";
-                const string body = "This is a test message from Sonarr";
-
-                SendNotification(title, body, settings);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Unable to send test message");
-                return new ValidationFailure("ApiKey", "Unable to send test message");
-            }
-
-            return null;
-        }
-    }
-}

src/NzbDrone.Core/Notifications/Simplepush/SimplepushSettings.cs

@@ -1,33 +0,0 @@
-using FluentValidation;
-using NzbDrone.Core.Annotations;
-using NzbDrone.Core.ThingiProvider;
-using NzbDrone.Core.Validation;
-
-namespace NzbDrone.Core.Notifications.Simplepush
-{
-    public class SimplepushSettingsValidator : AbstractValidator<SimplepushSettings>
-    {
-        public SimplepushSettingsValidator()
-        {
-            RuleFor(c => c.Key).NotEmpty();
-        }
-    }
-
-    public class SimplepushSettings : IProviderConfig
-    {
-        private static readonly SimplepushSettingsValidator Validator = new SimplepushSettingsValidator();
-
-        [FieldDefinition(0, Label = "Key", Privacy = PrivacyLevel.ApiKey, HelpLink = "https://simplepush.io/features")]
-        public string Key { get; set; }
-
-        [FieldDefinition(1, Label = "Event", HelpText = "Customize the behavior of push notifications", HelpLink = "https://simplepush.io/features")]
-        public string Event { get; set; }
-
-        public bool IsValid => !string.IsNullOrWhiteSpace(Key);
-
-        public NzbDroneValidationResult Validate()
-        {
-            return new NzbDroneValidationResult(Validator.Validate(this));
-        }
-    }
-}

src/Readarr.Http/Extensions/RequestExtensions.cs

@@ -162,39 +162,7 @@ namespace Readarr.Http.Extensions
                 remoteIP = remoteIP.MapToIPv4();
             }
 
-            var remoteAddress = remoteIP.ToString();
+            return remoteIP.ToString();
-
-            // Only check if forwarded by a local network reverse proxy
-            if (remoteIP.IsLocalAddress())
-            {
-                var realIPHeader = request.Headers["X-Real-IP"];
-                if (realIPHeader.Any())
-                {
-                    return realIPHeader.First().ToString();
-                }
-
-                var forwardedForHeader = request.Headers["X-Forwarded-For"];
-                if (forwardedForHeader.Any())
-                {
-                    // Get the first address that was forwarded by a local IP to prevent remote clients faking another proxy
-                    foreach (var forwardedForAddress in forwardedForHeader.SelectMany(v => v.Split(',')).Select(v => v.Trim()).Reverse())
-                    {
-                        if (!IPAddress.TryParse(forwardedForAddress, out remoteIP))
-                        {
-                            return remoteAddress;
-                        }
-
-                        if (!remoteIP.IsLocalAddress())
-                        {
-                            return forwardedForAddress;
-                        }
-
-                        remoteAddress = forwardedForAddress;
-                    }
-                }
-            }
-
-            return remoteAddress;
         }
 
         public static void DisableCache(this IHeaderDictionary headers)