Skip to content

Commit 7c48640

Browse files
authored
feat: update forwarded headers options setup to use IPNetwork
1 parent ba906e8 commit 7c48640

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/DefaultBuilder/src/ForwardedHeadersOptionsSetup.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.AspNetCore.Builder;
5-
using Microsoft.AspNetCore.HttpOverrides;
65
using Microsoft.Extensions.Configuration;
76
using Microsoft.Extensions.Options;
7+
using System.Net;
88

99
namespace Microsoft.AspNetCore;
1010

@@ -50,16 +50,22 @@ public void Configure(ForwardedHeadersOptions options)
5050
options.KnownIPNetworks.Clear();
5151
options.KnownProxies.Clear();
5252

53-
var knownNetworks = _configuration["ForwardedHeaders_KnownNetworks"]?.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? [];
53+
var knownNetworks = _configuration["ForwardedHeaders_KnownIPNetworks"]?.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? [];
5454
foreach (var network in knownNetworks)
5555
{
56-
options.KnownNetworks.Add(IPNetwork.Parse(network));
56+
if (IPNetwork.TryParse(network, var ipNetwork))
57+
{
58+
options.KnownIPNetworks.Add(ipNetwork);
59+
}
5760
}
5861

5962
var knownProxies = _configuration["ForwardedHeaders_KnownProxies"]?.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? [];
6063
foreach (var proxy in knownProxies)
6164
{
62-
options.KnownProxies.Add(System.Net.IPAddress.Parse(proxy));
65+
if (IPAddress.TryParse(proxy, out var ipAddress))
66+
{
67+
options.KnownProxies.Add(ipAddress);
68+
}
6369
}
6470
}
6571
}

0 commit comments

Comments
 (0)