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

Normalized int to string conversion

Browse Source
This commit is contained in:
Scott Brady
2020-04-28 12:20:04 +01:00
parent 7947ce16dd
commit 1862bf033f
4 changed files with 14 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -349,13 +349,13 @@ namespace Umbraco.Web.Editors
public async Task<IEnumerable<string>> Get2FAProviders()
{
var userId = await SignInManager.GetVerifiedUserIdAsync();
if (userId == int.MinValue)
if (string.IsNullOrWhiteSpace(userId))
{
Logger.Warn<AuthenticationController>("Get2FAProviders :: No verified user found, returning 404");
throw new HttpResponseException(HttpStatusCode.NotFound);
}
var user = await UserManager.FindByIdAsync(userId.ToString());
var user = await UserManager.FindByIdAsync(userId);
var userFactors = await UserManager.GetValidTwoFactorProvidersAsync(user);
return userFactors;
@@ -368,7 +368,7 @@ namespace Umbraco.Web.Editors
throw new HttpResponseException(HttpStatusCode.NotFound);
var userId = await SignInManager.GetVerifiedUserIdAsync();
if (userId == int.MinValue)
if (string.IsNullOrWhiteSpace(userId))
{
Logger.Warn<AuthenticationController>("Get2FAProviders :: No verified user found, returning 404");
throw new HttpResponseException(HttpStatusCode.NotFound);

35
src/Umbraco.Web/Security/BackOfficeSignInManager.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Diagnostics;
using System.Globalization;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
@@ -219,7 +218,7 @@ namespace Umbraco.Web.Security
if (rememberBrowser)
{
var rememberBrowserIdentity = _authenticationManager.CreateTwoFactorRememberBrowserIdentity(ConvertIdToString(user.Id));
var rememberBrowserIdentity = _authenticationManager.CreateTwoFactorRememberBrowserIdentity(user.Id.ToString());
_authenticationManager.SignIn(new AuthenticationProperties()
{
IsPersistent = isPersistent,
@@ -263,14 +262,14 @@ namespace Umbraco.Web.Security
/// <remarks>
/// Replaces the underlying call which is not flexible and doesn't support a custom cookie
/// </remarks>
public async Task<int> GetVerifiedUserIdAsync()
public async Task<string> GetVerifiedUserIdAsync()
{
var result = await _authenticationManager.AuthenticateAsync(Constants.Security.BackOfficeTwoFactorAuthenticationType);
if (result != null && result.Identity != null && string.IsNullOrEmpty(result.Identity.GetUserId()) == false)
{
return ConvertIdFromString(result.Identity.GetUserId());
return result.Identity.GetUserId();
}
return int.MinValue;
return null;
}
/// <summary>
@@ -304,11 +303,11 @@ namespace Umbraco.Web.Security
public async Task<SignInResult> TwoFactorSignInAsync(string provider, string code, bool isPersistent, bool rememberBrowser)
{
var userId = await GetVerifiedUserIdAsync();
if (userId == int.MinValue)
if (string.IsNullOrWhiteSpace(userId))
{
return SignInResult.Failed;
}
var user = await _userManager.FindByIdAsync(ConvertIdToString(userId));
var user = await _userManager.FindByIdAsync(userId.ToString());
if (user == null)
{
return SignInResult.Failed;
@@ -339,29 +338,9 @@ namespace Umbraco.Web.Security
/// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
/// all of this code to check for int.MinVale instead.
/// </remarks>
public async Task<bool> SendTwoFactorCodeAsync(string provider)
public Task<bool> SendTwoFactorCodeAsync(string provider)
{
throw new NotImplementedException();
/*var userId = await GetVerifiedUserIdAsync();
if (userId == int.MinValue)
return false;
var token = await _userManager.GenerateTwoFactorTokenAsync(userId, provider);
var identityResult = await _userManager.NotifyTwoFactorTokenAsync(userId, provider, token);
return identityResult.Succeeded;*/
}
private string ConvertIdToString(int id)
{
return Convert.ToString(id, CultureInfo.InvariantCulture);
}
private int ConvertIdFromString(string id)
{
return id == null ? default(int) : (int) Convert.ChangeType(id, typeof(int), CultureInfo.InvariantCulture);
}
public void Dispose()

5
src/Umbraco.Web/Security/BackOfficeUserManager.cs
View File

@@ -305,10 +305,7 @@ namespace Umbraco.Web.Security
/// </remarks>
public async Task<IdentityResult> ChangePasswordWithResetAsync(int userId, string token, string newPassword)
{
var userIdAsString = userId.TryConvertTo<string>();
if (!userIdAsString.Success) throw new InvalidOperationException("Unable to convert userId to int");
var user = await base.FindByIdAsync(userIdAsString.Result);
var user = await base.FindByIdAsync(userId.ToString());
var result = await base.ResetPasswordAsync(user, token, newPassword);
if (result.Succeeded) RaisePasswordChangedEvent(userId);
return result;

17
src/Umbraco.Web/Security/BackOfficeUserStore.cs
View File

@@ -14,9 +14,6 @@ using Umbraco.Core.Models.Membership;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Web.Models.Identity;
using Constants = Umbraco.Core.Constants;
using IUser = Umbraco.Core.Models.Membership.IUser;
using UserLoginInfo = Microsoft.AspNetCore.Identity.UserLoginInfo;
namespace Umbraco.Web.Security
{
@@ -70,7 +67,7 @@ namespace Umbraco.Web.Security
ThrowIfDisposed();
if (user == null) throw new ArgumentNullException(nameof(user));
return Task.FromResult(UserIdToString(user.Id));
return Task.FromResult(user.Id.ToString());
}
public Task<string> GetUserNameAsync(BackOfficeIdentityUser user, CancellationToken cancellationToken)
@@ -895,16 +892,8 @@ namespace Umbraco.Web.Security
return Task.FromResult(false);
}
private string UserIdToString(int userId)
{
var attempt = userId.TryConvertTo<string>();
if (attempt.Success) return attempt.Result;
throw new InvalidOperationException("Unable to convert user ID to string", attempt.Exception);
}
private int UserIdToInt(string userId)
private static int UserIdToInt(string userId)
{
var attempt = userId.TryConvertTo<int>();
if (attempt.Success) return attempt.Result;