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

Cors: fix

Browse Source
This commit is contained in:
pavelbannov 2022-11-21 12:44:28 +03:00
parent 56e0760f96
commit ffe0fbde97
3 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/ASC.Migration/Startup.cs
View File

@ -42,15 +42,4 @@ public class Startup : BaseStartup
base.ConfigureServices(services);
}
public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
app.UseCors(builder =>
builder
.AllowAnyOrigin()
.AllowAnyHeader()
.AllowAnyMethod());
base.Configure(app, env);
}
}

20
web/ASC.Web.Core/CookiesManager.cs
View File

@ -52,7 +52,6 @@ public class CookiesManager
private readonly CoreBaseSettings _coreBaseSettings;
private readonly DbLoginEventsManager _dbLoginEventsManager;
private readonly MessageService _messageService;
private readonly ILogger<CookiesManager> _logger;
public CookiesManager(
IHttpContextAccessor httpContextAccessor,
@ -62,8 +61,7 @@ public class CookiesManager
TenantManager tenantManager,
CoreBaseSettings coreBaseSettings,
DbLoginEventsManager dbLoginEventsManager,
MessageService messageService,
ILogger<CookiesManager> logger)
MessageService messageService)
{
_httpContextAccessor = httpContextAccessor;
_userManager = userManager;
@ -73,7 +71,6 @@ public class CookiesManager
_coreBaseSettings = coreBaseSettings;
_dbLoginEventsManager = dbLoginEventsManager;
_messageService = messageService;
_logger = logger;
}
public void SetCookies(CookiesType type, string value, bool session = false)
@ -296,7 +293,9 @@ public class CookiesManager
if (!string.IsNullOrEmpty(origin))
{
var originUri = new Uri(origin);
result = $"{result}_{originUri.Host.Replace('.', '_')}";
var host = originUri.Host;
var alias = host.Substring(0, host.Length - _coreBaseSettings.Basedomain.Length - 1);
result = $"{result}_{alias}";
}
}
@ -309,23 +308,12 @@ public class CookiesManager
var origin = _httpContextAccessor.HttpContext.Request.Headers[HeaderNames.Origin].FirstOrDefault();
var baseDomain = _coreBaseSettings.Basedomain;
foreach (var h in _httpContextAccessor.HttpContext.Request.Headers)
{
_logger.Debug($"{h.Key}:{h.Value.FirstOrDefault()}");
}
try
{
_logger.Debug($"baseDomain:{baseDomain}");
_logger.Debug($"origin:{origin}");
if (!string.IsNullOrEmpty(origin))
{
var originUri = new Uri(origin);
_logger.Debug($"originHost:{originUri.Host}");
_logger.Debug($"urlRewriter:{urlRewriter.Host}");
if (!string.IsNullOrEmpty(baseDomain) &&
urlRewriter.Host != originUri.Host &&
originUri.Host.EndsWith(baseDomain))

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

@ -41,12 +41,6 @@ public class Startup : BaseStartup
});
app.UseRouting();
app.UseCors(builder =>
builder
.AllowAnyOrigin()
.AllowAnyHeader()
.AllowAnyMethod());
app.UseAuthentication();
@ -71,9 +65,7 @@ public class Startup : BaseStartup
}
public override void ConfigureServices(IServiceCollection services)
{
services.AddCors();
{
base.ConfigureServices(services);
services.AddMemoryCache();