Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #5574 from sbwalker/dev

Browse Source 
fix #5570 - multi-database installation authentication issue
This commit is contained in:
Shaun Walker
2025-09-04 14:02:24 -04:00
committed by GitHub
parent 0d04926d9f ca9ddbd90f
commit 966fc55594
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Server/Security/PrincipalValidator.cs
View File

@ -31,11 +31,11 @@ namespace Oqtane.Security
var userManager = context.HttpContext.RequestServices.GetService(typeof(IUserManager)) as IUserManager; var userManager = context.HttpContext.RequestServices.GetService(typeof(IUserManager)) as IUserManager;
var user = userManager.GetUser(context.Principal.UserId(), alias.SiteId); // cached var user = userManager.GetUser(context.Principal.UserId(), alias.SiteId); // cached
// check if user is valid, not deleted, has roles, and security stamp has not changed // check if user is valid, not deleted, has roles, and security stamp has not changed for this tenant
if (user != null && !user.IsDeleted && !string.IsNullOrEmpty(user.Roles) && context.Principal.SecurityStamp() == user.SecurityStamp) if (user != null && !user.IsDeleted && !string.IsNullOrEmpty(user.Roles) && (context.Principal.SecurityStamp() == user.SecurityStamp || context.Principal.SiteKey() != alias.SiteKey))
{ {
// validate sitekey in case user has changed sites in installation // validate security stamp and sitekey (in case user has changed tenants/sites in installation)
if (context.Principal.SiteKey() != alias.SiteKey || !context.Principal.Roles().Any()) if (context.Principal.SecurityStamp() != user.SecurityStamp || context.Principal.SiteKey() != alias.SiteKey || !context.Principal.Roles().Any())
{ {
// refresh principal // refresh principal
var identity = UserSecurity.CreateClaimsIdentity(alias, user); var identity = UserSecurity.CreateClaimsIdentity(alias, user);