yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix user for v7 migration

Browse Source
This commit is contained in:
Stephan
2019-05-10 09:06:16 +02:00
parent 919fb79db9
commit 301b16a036
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Compose/AuditEventsComponent.cs
View File

@@ -49,9 +49,8 @@ namespace Umbraco.Core.Compose
get
{
var identity = Thread.CurrentPrincipal?.GetUmbracoIdentity();
return identity == null
? new User { Id = 0, Name = "SYSTEM", Email = "" }
: _userService.GetUserById(Convert.ToInt32(identity.Id));
var user = identity == null ? null : _userService.GetUserById(Convert.ToInt32(identity.Id));
return user ?? new User { Id = 0, Name = "SYSTEM", Email = "" };
}
}

26
src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
View File

@@ -34,18 +34,32 @@ namespace Umbraco.Web.Install.InstallSteps
public override Task<InstallSetupResult> ExecuteAsync(object model)
{
//During a new install we'll log the default user in (which is id = 0).
// During an upgrade, the user will already need to be logged in order to run the installer.
var security = new WebSecurity(_httpContext, _userService, _globalSettings);
//we do this check here because for upgrades the user will already be logged in, for brand new installs,
// they will not be logged in, however we cannot check the current installation status because it will tell
// us that it is in 'upgrade' because we already have a database conn configured and a database.
if (security.IsAuthenticated() == false && _globalSettings.ConfigurationStatus.IsNullOrWhiteSpace())
{
security.PerformLogin(-1);
}
if (security.IsAuthenticated())
{
// when a user is already logged in, we need to check whether it's user 'zero'
// which is the legacy super user from v7 - and then we need to actually log the
// true super user in - but before that we need to log off, else audit events
// will try to reference user zero and fail
var userIdAttempt = security.GetUserId();
if (userIdAttempt && userIdAttempt.Result == 0)
{
security.ClearCurrentLogin();
security.PerformLogin(Constants.Security.SuperUserId);
}
}
else if (_globalSettings.ConfigurationStatus.IsNullOrWhiteSpace())
{
// for installs, we need to log the super user in
security.PerformLogin(Constants.Security.SuperUserId);
}
// Update configurationStatus
_globalSettings.ConfigurationStatus = UmbracoVersion.SemanticVersion.ToSemanticString();