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)

README.md

@@ -62,15 +62,6 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 [![Mega Sponsors List](https://opencollective.com/Readarr/tiers/mega-sponsor.svg?width=890)](https://opencollective.com/readarr#mega-sponsor)
 
-## DigitalOcean
-
-This project is also supported by DigitalOcean
-<p>
-  <a href="https://www.digitalocean.com/">
-    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
-  </a>
-</p>
-
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)

frontend/src/Utilities/String/translate.js

@@ -1,18 +1,22 @@
-import createAjaxRequest from 'Utilities/createAjaxRequest';
+import $ from 'jquery';
 
 function getTranslations() {
   let localization = null;
   const ajaxOptions = {
     async: false,
+    type: 'GET',
+    global: false,
     dataType: 'json',
-    url: '/localization',
+    url: `${window.Readarr.apiRoot}/localization`,
     success: function(data) {
       localization = data.Strings;
     }
   };
 
-  createAjaxRequest(ajaxOptions);
+  ajaxOptions.headers = ajaxOptions.headers || {};
+  ajaxOptions.headers['X-Api-Key'] = window.Readarr.apiKey;
 
+  $.ajax(ajaxOptions);
   return localization;
 }
 

src/NzbDrone.Common.Test/Http/HttpUriFixture.cs

@@ -52,26 +52,6 @@ namespace NzbDrone.Common.Test.Http
             newUri.FullUri.Should().Be(expected);
         }
 
-        [TestCase("", "./relative", "relative")]
-        [TestCase("/", "./relative", "/relative")]
-        [TestCase("/base", "./relative", "/relative")]
-        [TestCase("/base/sub", "./relative", "/base/relative")]
-        [TestCase("/base/sub/", "./relative", "/base/sub/relative")]
-        [TestCase("base/sub", "./relative", "base/relative")]
-        [TestCase("base/sub/", "./relative", "base/sub/relative")]
-        [TestCase("", "../relative", "relative")]
-        [TestCase("/", "../relative", "/relative")]
-        [TestCase("/base", "../relative", "/relative")]
-        [TestCase("/base/sub", "../relative", "/base/relative")]
-        [TestCase("/base/sub/", "../relative", "/base/sub/relative")]
-        [TestCase("base/sub", "../relative", "base/relative")]
-        [TestCase("base/sub/", "../relative", "base/sub/relative")]
-        public void should_combine_uri_with_dot_segment(string basePath, string relativePath, string expected)
-        {
-            var newUri = new HttpUri(basePath) + new HttpUri(relativePath);
-            newUri.FullUri.Should().Be(expected);
-        }
-
         [TestCase("", "", "")]
         [TestCase("/", "", "/")]
         [TestCase("base", "", "base")]

src/NzbDrone.Common/Http/HttpUri.cs

@@ -164,37 +164,6 @@ namespace NzbDrone.Common.Http
                 return relativePath;
             }
 
-            if (relativePath.StartsWith("./"))
-            {
-                relativePath = relativePath.TrimStart('.').TrimStart('/');
-
-                var lastIndex = basePath.LastIndexOf("/");
-
-                if (lastIndex > 0)
-                {
-                    basePath = basePath.Substring(0, lastIndex) + "/";
-                }
-            }
-
-            if (relativePath.StartsWith("../"))
-            {
-                relativePath = relativePath.TrimStart('.').TrimStart('/');
-
-                var lastIndex = basePath.LastIndexOf("/");
-
-                if (lastIndex > 0)
-                {
-                    basePath = basePath.Substring(0, lastIndex) + "/";
-                }
-
-                var secondLastIndex = basePath.LastIndexOf("/");
-
-                if (lastIndex > 0)
-                {
-                    basePath = basePath.Substring(0, secondLastIndex) + "/";
-                }
-            }
-
             var baseSlashIndex = basePath.LastIndexOf('/');
 
             if (baseSlashIndex >= 0)

src/Readarr.Http/Extensions/RequestExtensions.cs

@@ -162,39 +162,7 @@ namespace Readarr.Http.Extensions
                 remoteIP = remoteIP.MapToIPv4();
             }
 
-            var remoteAddress = 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;
+            return remoteIP.ToString();
         }
 
         public static void DisableCache(this IHeaderDictionary headers)

src/Readarr.Http/REST/RestController.cs

@@ -74,7 +74,7 @@ namespace Readarr.Http.REST
             }
 
             var attributes = descriptor.MethodInfo.CustomAttributes;
-            if (attributes.Any(x => VALIDATE_ID_ATTRIBUTES.Contains(x.AttributeType)) && !skipValidate)
+            if (attributes.Any(x => VALIDATE_ID_ATTRIBUTES.Contains(x.GetType())) && !skipValidate)
             {
                 if (context.ActionArguments.TryGetValue("id", out var idObj))
                 {