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

Fix install issues with super user

Browse Source
This commit is contained in:
Stephan
2018-03-21 16:01:49 +01:00
parent 37870e906c
commit 10972002d9
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Core/Migrations/Install/DatabaseBuilder.cs
View File

@@ -10,6 +10,7 @@ using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Upgrade;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Dtos;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Core.Scoping;
using Umbraco.Core.Services;
@@ -94,8 +95,12 @@ namespace Umbraco.Core.Migrations.Install
{
using (var scope = _scopeProvider.CreateScope())
{
// look for the default user with default password
var result = scope.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoUser WHERE id=0 AND userPassword='default'");
// look for the super user with default password
var sql = scope.Database.SqlContext.Sql()
.SelectCount()
.From<UserDto>()
.Where<UserDto>(x => x.Id == Constants.Security.SuperId && x.Password == "default");
var result = scope.Database.ExecuteScalar<int>(sql);
var has = result != 1;
if (has == false)
{

11
src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
View File

@@ -21,8 +21,7 @@ namespace Umbraco.Web.Install.InstallSteps
/// error, etc... and the end-user refreshes the installer then we cannot show the user screen because they've already entered that information so instead we'll
/// display a simple continue installation view.
/// </remarks>
[InstallSetupStep(InstallationType.NewInstall,
"User", 20, "")]
[InstallSetupStep(InstallationType.NewInstall, "User", 20, "")]
internal class NewInstallStep : InstallSetupStep<UserModel>
{
private readonly HttpContextBase _http;
@@ -48,16 +47,16 @@ namespace Umbraco.Web.Install.InstallSteps
public override InstallSetupResult Execute(UserModel user)
{
var admin = _userService.GetUserById(0);
var admin = _userService.GetUserById(Constants.Security.SuperId);
if (admin == null)
{
throw new InvalidOperationException("Could not find the admi user!");
throw new InvalidOperationException("Could not find the super user!");
}
var membershipUser = CurrentProvider.GetUser(0, true);
var membershipUser = CurrentProvider.GetUser(Constants.Security.SuperId, true);
if (membershipUser == null)
{
throw new InvalidOperationException("No user found in membership provider with id of 0");
throw new InvalidOperationException($"No user found in membership provider with id of {Constants.Security.SuperId}.");
}
try

4
src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
View File

@@ -62,7 +62,7 @@ namespace Umbraco.Web.Mvc
private static string GetAuthHeaderVal(IUserService userService)
{
var admin = userService.GetUserById(0);
var admin = userService.GetUserById(Core.Constants.Security.SuperId);
var token = $"{admin.Email}u____u{admin.Username}u____u{admin.RawPasswordValue}";
@@ -94,7 +94,7 @@ namespace Umbraco.Web.Mvc
if (keyVal.Count != 1) return false;
if (keyVal[0].Groups.Count != 2) return false;
var admin = UserService.GetUserById(0);
var admin = UserService.GetUserById(Core.Constants.Security.SuperId);
if (admin == null) return false;
try

8
src/Umbraco.Web/NotificationServiceExtensions.cs
View File

@@ -73,10 +73,10 @@ namespace Umbraco.Web
if (user == null)
{
Current.Logger.Debug(typeof(NotificationServiceExtensions), "There is no current Umbraco user logged in, the notifications will be sent from the administrator");
user = userService.GetUserById(0);
user = userService.GetUserById(Constants.Security.SuperId);
if (user == null)
{
Current.Logger.Warn(typeof(NotificationServiceExtensions), "Noticiations can not be sent, no admin user with id 0 could be resolved");
Current.Logger.Warn(typeof(NotificationServiceExtensions), $"Noticiations can not be sent, no admin user with id {Constants.Security.SuperId} could be resolved");
return;
}
}
@@ -98,10 +98,10 @@ namespace Umbraco.Web
if (user == null)
{
Current.Logger.Debug(typeof(NotificationServiceExtensions), "There is no current Umbraco user logged in, the notifications will be sent from the administrator");
user = userService.GetUserById(0);
user = userService.GetUserById(Constants.Security.SuperId);
if (user == null)
{
Current.Logger.Warn(typeof(NotificationServiceExtensions), "Noticiations can not be sent, no admin user with id 0 could be resolved");
Current.Logger.Warn(typeof(NotificationServiceExtensions), $"Noticiations can not be sent, no admin user with id {Constants.Security.SuperId} could be resolved");
return;
}
}

2
src/Umbraco.Web/_Legacy/Packager/Installer.cs
View File

@@ -353,7 +353,7 @@ namespace umbraco.cms.businesslogic.packager
//bool saveNeeded = false;
// Get current user, with a fallback
var currentUser = Current.Services.UserService.GetUserById(0);
var currentUser = Current.Services.UserService.GetUserById(Constants.Security.SuperId);
//TODO: Get rid of this entire class! Until then all packages will be installed by the admin user