From 746c9d6c36683fb7507b00806f4034915977f96e Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Fri, 23 Aug 2024 19:55:16 +0300
Subject: [PATCH] New: Bypass IP addresses ranges in proxies

(cherry picked from commit 402db9128c214d4c5af6583643cb49d3aa7a28b5)
---
 src/NzbDrone.Common/Lidarr.Common.csproj             |  1 +
 .../Http/HttpProxySettingsProviderFixture.cs         |  4 +++-
 src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs  | 12 +++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/NzbDrone.Common/Lidarr.Common.csproj b/src/NzbDrone.Common/Lidarr.Common.csproj
index 2971b63ae..68449041a 100644
--- a/src/NzbDrone.Common/Lidarr.Common.csproj
+++ b/src/NzbDrone.Common/Lidarr.Common.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DryIoc.dll" Version="5.4.3" />
+    <PackageReference Include="IPAddressRange" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.2.0" />
diff --git a/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs b/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
index 067149904..2beeb16f9 100644
--- a/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/Http/HttpProxySettingsProviderFixture.cs
@@ -12,7 +12,7 @@ public class HttpProxySettingsProviderFixture : TestBase<HttpProxySettingsProvid
     {
         private HttpProxySettings GetProxySettings()
         {
-            return new HttpProxySettings(ProxyType.Socks5, "localhost", 8080, "*.httpbin.org,google.com", true, null, null);
+            return new HttpProxySettings(ProxyType.Socks5, "localhost", 8080, "*.httpbin.org,google.com,172.16.0.0/12", true, null, null);
         }
 
         [Test]
@@ -23,6 +23,7 @@ public void should_bypass_proxy()
             Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://eu.httpbin.org/get")).Should().BeTrue();
             Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://google.com/get")).Should().BeTrue();
             Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://localhost:8654/get")).Should().BeTrue();
+            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://172.21.0.1:8989/api/v3/indexer/schema")).Should().BeTrue();
         }
 
         [Test]
@@ -31,6 +32,7 @@ public void should_not_bypass_proxy()
             var settings = GetProxySettings();
 
             Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://bing.com/get")).Should().BeFalse();
+            Subject.ShouldProxyBeBypassed(settings, new HttpUri("http://172.3.0.1:8989/api/v3/indexer/schema")).Should().BeFalse();
         }
     }
 }
diff --git a/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs b/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs
index 33ed6e31d..32beb8080 100644
--- a/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs
+++ b/src/NzbDrone.Core/Http/HttpProxySettingsProvider.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Net;
+using NetTools;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Http.Proxy;
 using NzbDrone.Core.Configuration;
@@ -52,7 +54,15 @@ public bool ShouldProxyBeBypassed(HttpProxySettings proxySettings, HttpUri url)
             // We are utilizing the WebProxy implementation here to save us having to re-implement it. This way we use Microsofts implementation
             var proxy = new WebProxy(proxySettings.Host + ":" + proxySettings.Port, proxySettings.BypassLocalAddress, proxySettings.BypassListAsArray);
 
-            return proxy.IsBypassed((Uri)url);
+            return proxy.IsBypassed((Uri)url) || IsBypassedByIpAddressRange(proxySettings.BypassListAsArray, url.Host);
+        }
+
+        private static bool IsBypassedByIpAddressRange(string[] bypassList, string host)
+        {
+            return bypassList.Any(bypass =>
+                IPAddressRange.TryParse(bypass, out var ipAddressRange) &&
+                IPAddress.TryParse(host, out var ipAddress) &&
+                ipAddressRange.Contains(ipAddress));
         }
     }
 }