From 39f81c230ff2ed300f781ac390e6977a3af77849 Mon Sep 17 00:00:00 2001
From: tjarls <tjarls@gmail.com>
Date: Sun, 26 Jun 2022 23:49:49 +0100
Subject: [PATCH] Add KnownProxies configuration (#1332)

---
 API/Startup.cs | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/API/Startup.cs b/API/Startup.cs
index 6af35fe8c..c203c6b31 100644
--- a/API/Startup.cs
+++ b/API/Startup.cs
@@ -53,8 +53,10 @@ namespace API
             services.AddControllers();
             services.Configure<ForwardedHeadersOptions>(options =>
             {
-                options.ForwardedHeaders =
-                    ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+                options.ForwardedHeaders = ForwardedHeaders.All;
+                foreach(var proxy in _config.GetSection("KnownProxies").AsEnumerable().Where(c => c.Value != null)) {
+                    options.KnownProxies.Add(IPAddress.Parse(proxy.Value));
+                }
             });
             services.AddCors();
             services.AddIdentityServices(_config);
@@ -125,13 +127,6 @@ namespace API
 
             services.AddResponseCaching();
 
-            services.Configure<ForwardedHeadersOptions>(options =>
-            {
-                options.ForwardedHeaders =
-                    ForwardedHeaders.All;
-            });
-
-
             services.AddHangfire(configuration => configuration
                 .UseSimpleAssemblyNameTypeSerializer()
                 .UseRecommendedSerializerSettings()
@@ -210,10 +205,7 @@ namespace API
 
             app.UseResponseCompression();
 
-            app.UseForwardedHeaders(new ForwardedHeadersOptions
-            {
-                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost
-            });
+            app.UseForwardedHeaders();
 
             app.UseRouting();
 
@@ -295,6 +287,5 @@ namespace API
             throw new KavitaException("No network adapters with an IPv4 address in the system!");
         }
 
-
     }
 }