Forráskód Böngészése

Merge commit from fork

Fix not trusting all sources for forward headers if none are configured
Joshua M. Boniface 2 hónapja
szülő
commit
2c9c9f591d

+ 2 - 2
Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs

@@ -119,15 +119,15 @@ namespace Jellyfin.Server.Extensions
                     // https://github.com/dotnet/aspnetcore/blob/master/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
                     // https://github.com/dotnet/aspnetcore/blob/master/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs
                     // Enable debug logging on Microsoft.AspNetCore.HttpOverrides.ForwardedHeadersMiddleware to help investigate issues.
                     // Enable debug logging on Microsoft.AspNetCore.HttpOverrides.ForwardedHeadersMiddleware to help investigate issues.
 
 
-                    options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost;
-
                     if (config.KnownProxies.Length == 0)
                     if (config.KnownProxies.Length == 0)
                     {
                     {
+                        options.ForwardedHeaders = ForwardedHeaders.None;
                         options.KnownNetworks.Clear();
                         options.KnownNetworks.Clear();
                         options.KnownProxies.Clear();
                         options.KnownProxies.Clear();
                     }
                     }
                     else
                     else
                     {
                     {
+                        options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost;
                         AddProxyAddresses(config, config.KnownProxies, options);
                         AddProxyAddresses(config, config.KnownProxies, options);
                     }
                     }