From 0b6a05cf82a72717bedae4d80c97e78639bddbc6 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Sat, 5 Dec 2020 16:22:11 +0100
Subject: [PATCH] Merge pull request #4671 from cvium/allow_proxy

Clear KnownNetworks and KnownProxies if none are configured explicitly

(cherry picked from commit 804dd00425687ed099dc35c73a6ac6cf2077cc7d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
---
 .../Extensions/ApiServiceCollectionExtensions.cs   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 74e7bb4b15..b256c869cf 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -169,11 +169,19 @@ namespace Jellyfin.Server.Extensions
                 .Configure<ForwardedHeadersOptions>(options =>
                 {
                     options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-                    for (var i = 0; i < knownProxies.Count; i++)
+                    if (knownProxies.Count == 0)
                     {
-                        if (IPAddress.TryParse(knownProxies[i], out var address))
+                        options.KnownNetworks.Clear();
+                        options.KnownProxies.Clear();
+                    }
+                    else
+                    {
+                        for (var i = 0; i < knownProxies.Count; i++)
                         {
-                            options.KnownProxies.Add(address);
+                            if (IPAddress.TryParse(knownProxies[i], out var address))
+                            {
+                                options.KnownProxies.Add(address);
+                            }
                         }
                     }
                 })