New: Pass general proxy credentials to FlareSolverr

Fixes #2073
Prowlarr · Mar 19, 2024 · d279c97 · d279c97
1 parent 7d5d338
commit d279c97
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs b/src/NzbDrone.Core/IndexerProxies/FlareSolverr/FlareSolverr.cs
@@ -102,9 +102,15 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
             var url = request.Url.ToString();
             var maxTimeout = Settings.RequestTimeout * 1000;
 
-            // Use Proxy if no credentials are set (creds not supported as of FS 2.2.9)
             var proxySettings = _proxySettingsProvider.GetProxySettings();
-            var proxyUrl = proxySettings != null && proxySettings.Username.IsNullOrWhiteSpace() && proxySettings.Password.IsNullOrWhiteSpace() ? GetProxyUri(proxySettings) : null;
+            var proxyUrl = proxySettings != null ? GetProxyUri(proxySettings) : null;
+
+            var requestProxy = new FlareSolverrProxy
+            {
+                Url = proxyUrl?.OriginalString,
+                Username = proxySettings != null && proxySettings.Username.IsNotNullOrWhiteSpace() ? proxySettings.Username : null,
+                Password = proxySettings != null && proxySettings.Password.IsNotNullOrWhiteSpace() ? proxySettings.Password : null
+            };
 
             if (request.Method == HttpMethod.Get)
             {
@@ -113,10 +119,7 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
                     Cmd = "request.get",
                     Url = url,
                     MaxTimeout = maxTimeout,
-                    Proxy = new FlareSolverrProxy
-                    {
-                        Url = proxyUrl?.OriginalString
-                    }
+                    Proxy = requestProxy
                 };
             }
             else if (request.Method == HttpMethod.Post)
@@ -139,10 +142,7 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
                             ContentLength = null
                         },
                         MaxTimeout = maxTimeout,
-                        Proxy = new FlareSolverrProxy
-                        {
-                            Url = proxyUrl?.OriginalString
-                        }
+                        Proxy = requestProxy
                     };
                 }
                 else if (contentTypeType.Contains("multipart/form-data")
@@ -169,6 +169,7 @@ private HttpRequest GenerateFlareSolverrRequest(HttpRequest request)
             newRequest.LogResponseContent = true;
             newRequest.RequestTimeout = TimeSpan.FromSeconds(Settings.RequestTimeout + 5);
             newRequest.SetContent(req.ToJson());
+            newRequest.ContentSummary = req.ToJson(Formatting.None);
 
             _logger.Debug("Cloudflare Detected, Applying FlareSolverr Proxy {0} to request {1}", Name, request.Url);
 
@@ -243,6 +244,8 @@ private class FlareSolverrRequestPostUrlEncoded : FlareSolverrRequestPost
         private class FlareSolverrProxy
         {
             public string Url { get; set; }
+            public string Username { get; set; }
+            public string Password { get; set; }
         }
 
         private class HeadersPost