IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setup ForwardedHeadersOptions via config

Browse Source
This commit is contained in:
Alexey Bannov 2023-04-20 18:15:48 +03:00
parent ee3c73cb0d
commit 0123128b50
3 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/ASC.Api.Core/Core/BaseStartup.cs
View File

@ -24,6 +24,10 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
using System.Linq;
using Microsoft.AspNetCore.Builder;
using JsonConverter = System.Text.Json.Serialization.JsonConverter;
namespace ASC.Api.Core;
@ -64,11 +68,42 @@ public abstract class BaseStartup
public virtual void ConfigureServices(IServiceCollection services)
{
services.AddCustomHealthCheck(_configuration);
services.AddCustomHealthCheck(_configuration);
services.AddHttpContextAccessor();
services.AddMemoryCache();
services.AddHttpClient();
services.Configure<ForwardedHeadersOptions>(options =>
{
options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
options.ForwardLimit = null;
options.KnownNetworks.Clear();
options.KnownProxies.Clear();
var knownProxies = _configuration.GetSection("core:hosting:forwardedHeadersOptions:knownProxies").Get<List<String>>();
var knownNetworks = _configuration.GetSection("core:hosting:forwardedHeadersOptions:knownNetworks").Get<List<String>>();
if (knownProxies != null && knownProxies.Count > 0)
{
foreach (var knownProxy in knownProxies)
{
options.KnownProxies.Add(IPAddress.Parse(knownProxy));
}
}
if (knownNetworks != null && knownNetworks.Count > 0)
{
foreach (var knownNetwork in knownNetworks)
{
var prefix = IPAddress.Parse(knownNetwork.Split("/")[0]);
var prefixLength = Convert.ToInt32(knownNetwork.Split("/")[1]);
options.KnownNetworks.Add(new IPNetwork(prefix, prefixLength));
}
}
});
services.AddScoped<EFLoggerFactory>();
services.AddBaseDbContextPool<AccountLinkContext>()
@ -270,10 +305,7 @@ public abstract class BaseStartup
public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
app.UseForwardedHeaders(new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
});
app.UseForwardedHeaders();
app.UseRouting();

6
config/appsettings.json
View File

@ -37,7 +37,11 @@
"hosting": {
"intervalCheckRegisterInstanceInSeconds": "1",
"timeUntilUnregisterInSeconds": "15",
"singletonMode": true
"singletonMode": true,
"forwardedHeadersOptions": {
"knownNetworks": [],
"knownProxies": [ "127.0.0.1" ]
}
},
"themelimit": "9",
"oidc": {

5
web/ASC.Web.Studio/Startup.cs
View File

@ -35,11 +35,6 @@ public class Startup : BaseStartup
{
base.Configure(app, env);
app.UseForwardedHeaders(new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
});
app.UseRouting();
app.UseAuthentication();