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

Core: cookie for origin

Browse Source
This commit is contained in:
pavelbannov 2022-11-18 13:20:50 +03:00
parent fda7f66e7f
commit 34d7f58dbb
2 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,8 @@ public abstract class BaseStartup
policy.WithOrigins(_corsOrigin)
.SetIsOriginAllowedToAllowWildcardSubdomains()
.AllowAnyHeader()
.AllowAnyMethod();
.AllowAnyMethod()
.AllowCredentials();
});
});
}

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

@ -26,6 +26,8 @@
using ASC.Core.Data;
using Microsoft.Net.Http.Headers;
using Constants = ASC.Core.Users.Constants;
namespace ASC.Web.Core;
@ -71,29 +73,6 @@ public class CookiesManager
_messageService = messageService;
}
private static string GetCookiesName(CookiesType type)
{
return type switch
{
CookiesType.AuthKey => AuthCookiesName,
CookiesType.SocketIO => SocketIOCookiesName,
_ => string.Empty,
};
}
public string GetRequestVar(CookiesType type)
{
if (_httpContextAccessor?.HttpContext == null)
{
return "";
}
var cookie = _httpContextAccessor.HttpContext.Request.Query[GetCookiesName(type)].FirstOrDefault() ?? _httpContextAccessor.HttpContext.Request.Form[GetCookiesName(type)].FirstOrDefault();
return string.IsNullOrEmpty(cookie) ? GetCookies(type) : cookie;
}
public void SetCookies(CookiesType type, string value, bool session = false)
{
if (_httpContextAccessor?.HttpContext == null)
@ -110,45 +89,15 @@ public class CookiesManager
{
options.HttpOnly = true;
if (_httpContextAccessor.HttpContext.Request.GetUrlRewriter().Scheme == "https")
var urlRewriter = _httpContextAccessor.HttpContext.Request.GetUrlRewriter();
if (urlRewriter.Scheme == "https")
{
options.Secure = true;
if (_coreBaseSettings.Personal)
{
options.SameSite = SameSiteMode.None;
}
}
}
_httpContextAccessor.HttpContext.Response.Cookies.Append(GetCookiesName(type), value, options);
}
public void SetCookies(CookiesType type, string value, string domain, bool session = false)
{
if (_httpContextAccessor?.HttpContext == null)
{
return;
}
var options = new CookieOptions
{
Expires = GetExpiresDate(session),
Domain = domain
};
if (type == CookiesType.AuthKey)
{
options.HttpOnly = true;
if (_httpContextAccessor.HttpContext.Request.GetUrlRewriter().Scheme == "https")
if (FromCors())
{
options.Secure = true;
if (_coreBaseSettings.Personal)
{
options.SameSite = SameSiteMode.None;
}
options.Domain = $".{_coreBaseSettings.Basedomain}";
}
}
@ -322,4 +271,54 @@ public class CookiesManager
return _messageService.SendLoginMessage(data, action);
}
private string GetCookiesName(CookiesType type)
{
var result = type switch
{
CookiesType.AuthKey => AuthCookiesName,
CookiesType.SocketIO => SocketIOCookiesName,
_ => string.Empty,
};
if (FromCors())
{
var origin = _httpContextAccessor.HttpContext.Request.Headers[HeaderNames.Origin].FirstOrDefault();
if (!string.IsNullOrEmpty(origin))
{
var originUri = new Uri(origin);
result = $"{result}_{originUri.Host.Replace('.', '_')}";
}
}
return result;
}
private bool FromCors()
{
var urlRewriter = _httpContextAccessor.HttpContext.Request.GetUrlRewriter();
var origin = _httpContextAccessor.HttpContext.Request.Headers[HeaderNames.Origin].FirstOrDefault();
var baseDomain = _coreBaseSettings.Basedomain;
try
{
if (!string.IsNullOrEmpty(origin))
{
var originUri = new Uri(origin);
if (!string.IsNullOrEmpty(baseDomain) &&
urlRewriter.Host != originUri.Host &&
originUri.Host.EndsWith(baseDomain))
{
return true;
}
}
}
catch (Exception)
{
}
return false;
}
}