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

Starts stubbing out role manager code

Browse Source
This commit is contained in:
Shannon
2015-02-22 15:10:14 +01:00
parent d9cf9cee88
commit 4b156ba27e
10 changed files with 188 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Core/Models/Identity/BackOfficeIdentityRole.cs Normal file
View File

@@ -0,0 +1,22 @@
using Microsoft.AspNet.Identity;
namespace Umbraco.Core.Models.Identity
{
public class BackOfficeIdentityRole : IRole
{
public BackOfficeIdentityRole(string id)
{
Id = id;
}
/// <summary>
/// Id of the role
/// </summary>
public string Id { get; private set; }
/// <summary>
/// Name of the role
/// </summary>
public string Name { get; set; }
}
}

27
src/Umbraco.Core/Security/BackOfficeRoleManager.cs Normal file
View File

@@ -0,0 +1,27 @@
using Microsoft.AspNet.Identity;
using Microsoft.AspNet.Identity.Owin;
using Umbraco.Core.Models.Identity;
namespace Umbraco.Core.Security
{
public class BackOfficeRoleManager : RoleManager<BackOfficeIdentityRole>
{
/// <summary>
/// Constructor
/// </summary>
/// <param name="store">The IRoleStore is responsible for commiting changes via the UpdateAsync/CreateAsync methods</param>
public BackOfficeRoleManager(IRoleStore<BackOfficeIdentityRole> store) : base(store)
{
}
public static BackOfficeRoleManager Create(
IdentityFactoryOptions<BackOfficeRoleManager> options)
{
//TODO: Set this up!
var manager = new BackOfficeRoleManager(new BackOfficeRoleStore());
return manager;
}
}
}

67
src/Umbraco.Core/Security/BackOfficeRoleStore.cs Normal file
View File

@@ -0,0 +1,67 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Identity;
using Umbraco.Core.Models.Identity;
namespace Umbraco.Core.Security
{
public class BackOfficeRoleStore : DisposableObject, IRoleStore<BackOfficeIdentityRole>
{
/// <summary>
/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
/// </summary>
protected override void DisposeResources()
{
}
/// <summary>
/// Create a new role
/// </summary>
/// <param name="role"/>
/// <returns/>
public Task CreateAsync(BackOfficeIdentityRole role)
{
throw new NotImplementedException();
}
/// <summary>
/// Update a role
/// </summary>
/// <param name="role"/>
/// <returns/>
public Task UpdateAsync(BackOfficeIdentityRole role)
{
throw new NotImplementedException();
}
/// <summary>
/// Delete a role
/// </summary>
/// <param name="role"/>
/// <returns/>
public Task DeleteAsync(BackOfficeIdentityRole role)
{
throw new NotImplementedException();
}
/// <summary>
/// Find a role by id
/// </summary>
/// <param name="roleId"/>
/// <returns/>
public Task<BackOfficeIdentityRole> FindByIdAsync(string roleId)
{
throw new NotImplementedException();
}
/// <summary>
/// Find a role by name
/// </summary>
/// <param name="roleName"/>
/// <returns/>
public Task<BackOfficeIdentityRole> FindByNameAsync(string roleName)
{
throw new NotImplementedException();
}
}
}

37
src/Umbraco.Core/Security/BackOfficeUserManager.cs
View File

@@ -12,33 +12,6 @@ using Umbraco.Core.Services;
namespace Umbraco.Core.Security
{
/// <summary>
/// A custom password hasher that conforms to the current password hashing done in Umbraco
/// </summary>
internal class MembershipPasswordHasher : IPasswordHasher
{
private readonly MembershipProviderBase _provider;
public MembershipPasswordHasher(MembershipProviderBase provider)
{
_provider = provider;
}
public string HashPassword(string password)
{
return _provider.HashPasswordForStorage(password);
}
public PasswordVerificationResult VerifyHashedPassword(string hashedPassword, string providedPassword)
{
return _provider.VerifyPassword(providedPassword, hashedPassword)
? PasswordVerificationResult.Success
: PasswordVerificationResult.Failed;
}
}
/// <summary>
/// Back office user manager
/// </summary>
@@ -51,6 +24,12 @@ namespace Umbraco.Core.Security
#region What we support currently
//NOTE: Not sure if we really want/need to ever support this
public override bool SupportsUserClaim
{
get { return false; }
}
//TODO: Support this
public override bool SupportsUserRole
{
@@ -75,11 +54,13 @@ namespace Umbraco.Core.Security
get { return false; }
}
//TODO: Support this
public override bool SupportsUserTwoFactor
{
get { return false; }
}
//TODO: Support this
public override bool SupportsUserPhoneNumber
{
get { return false; }
@@ -127,7 +108,7 @@ namespace Umbraco.Core.Security
}
//custom identity factory for creating the identity object for which we auth against in the back office
manager.ClaimsIdentityFactory = new BackOfficeClaimsIdentityFactory();
manager.ClaimsIdentityFactory = new BackOfficeClaimsIdentityFactory();
//NOTE: Not implementing these currently

18
src/Umbraco.Core/Security/BackOfficeUserStore.cs
View File

@@ -11,7 +11,23 @@ using Umbraco.Core.Services;
namespace Umbraco.Core.Security
{
public class BackOfficeUserStore : DisposableObject, IUserStore<BackOfficeIdentityUser, int>, IUserPasswordStore<BackOfficeIdentityUser, int>, IUserEmailStore<BackOfficeIdentityUser, int>, IUserLoginStore<BackOfficeIdentityUser, int>
public class BackOfficeUserStore : DisposableObject,
IUserStore<BackOfficeIdentityUser, int>,
IUserPasswordStore<BackOfficeIdentityUser, int>,
IUserEmailStore<BackOfficeIdentityUser, int>,
IUserLoginStore<BackOfficeIdentityUser, int>
//IUserRoleStore<BackOfficeIdentityUser, int>,
//TODO: This will require additional columns/tables
//IUserLockoutStore<BackOfficeIdentityUser, int>
//TODO: Implement this - might need to add a new column for this
// http://stackoverflow.com/questions/19487322/what-is-asp-net-identitys-iusersecuritystampstoretuser-interface
//IUserSecurityStampStore<BackOfficeIdentityUser, int>
//TODO: To do this we need to implement IQueryable - seems pretty overkill?
//IQueryableUserStore<BackOfficeIdentityUser, int>
{
private readonly IUserService _userService;
private readonly IExternalLoginService _externalLoginService;

0
src/Umbraco.Core/Security/UmbracoMembersMembershipProviderBase.cs → src/Umbraco.Core/Security/IUmbracoMemberTypeMembershipProvider.cs
View File

31
src/Umbraco.Core/Security/MembershipPasswordHasher.cs Normal file
View File

@@ -0,0 +1,31 @@
using Microsoft.AspNet.Identity;
namespace Umbraco.Core.Security
{
/// <summary>
/// A custom password hasher that conforms to the current password hashing done in Umbraco
/// </summary>
internal class MembershipPasswordHasher : IPasswordHasher
{
private readonly MembershipProviderBase _provider;
public MembershipPasswordHasher(MembershipProviderBase provider)
{
_provider = provider;
}
public string HashPassword(string password)
{
return _provider.HashPasswordForStorage(password);
}
public PasswordVerificationResult VerifyHashedPassword(string hashedPassword, string providedPassword)
{
return _provider.VerifyPassword(providedPassword, hashedPassword)
? PasswordVerificationResult.Success
: PasswordVerificationResult.Failed;
}
}
}

1
src/Umbraco.Core/Services/IUserService.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Models.Membership;
namespace Umbraco.Core.Services

6
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -345,6 +345,7 @@
<Compile Include="IDisposeOnRequestEnd.cs" />
<Compile Include="Models\AuditItem.cs" />
<Compile Include="Models\AuditType.cs" />
<Compile Include="Models\Identity\BackOfficeIdentityRole.cs" />
<Compile Include="Models\Identity\IdentityModelMappings.cs" />
<Compile Include="Models\Identity\IdentityUser.cs" />
<Compile Include="Models\Identity\IdentityUserClaim.cs" />
@@ -419,8 +420,11 @@
<Compile Include="Persistence\Repositories\TaskRepository.cs" />
<Compile Include="Persistence\Repositories\TaskTypeRepository.cs" />
<Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
<Compile Include="Security\BackOfficeRoleManager.cs" />
<Compile Include="Security\BackOfficeRoleStore.cs" />
<Compile Include="Security\BackOfficeUserManager.cs" />
<Compile Include="Security\BackOfficeUserStore.cs" />
<Compile Include="Security\MembershipPasswordHasher.cs" />
<Compile Include="ServiceProviderExtensions.cs" />
<Compile Include="IO\ResizedImage.cs" />
<Compile Include="IO\UmbracoMediaFile.cs" />
@@ -1144,7 +1148,7 @@
<Compile Include="Security\MembershipProviderExtensions.cs" />
<Compile Include="Security\UmbracoBackOfficeIdentity.cs" />
<Compile Include="Security\UmbracoMembershipProviderBase.cs" />
<Compile Include="Security\UmbracoMembersMembershipProviderBase.cs" />
<Compile Include="Security\IUmbracoMemberTypeMembershipProvider.cs" />
<Compile Include="Security\UserData.cs" />
<Compile Include="Serialization\AbstractSerializationService.cs" />
<Compile Include="Serialization\Formatter.cs" />

18
src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
View File

@@ -37,6 +37,9 @@ namespace Umbraco.Web.Security.Identity
appContext.Services.UserService,
appContext.Services.ExternalLoginService,
userMembershipProvider));
//Configure Umbraco role manager to be created per request
app.CreatePerOwinContext<BackOfficeRoleManager>((options, owinContext) => BackOfficeRoleManager.Create(options));
}
/// <summary>
@@ -70,14 +73,16 @@ namespace Umbraco.Web.Security.Identity
return app;
}
/// <summary>
/// Ensures that the cookie middleware for validating external logins is assigned to the pipeline with the correct
/// Umbraco back office configuration
/// </summary>
/// <param name="app"></param>
/// <returns></returns>
public static IAppBuilder UseUmbracoBackOfficeExternalCookieAuthentication(this IAppBuilder app)
{
if (app == null) throw new ArgumentNullException("app");
//TODO: Figure out why this isn't working and is only working with the default one, must be a reference somewhere
//app.UseExternalSignInCookie("UmbracoExternalCookie");
app.SetDefaultSignInAsAuthenticationType("UmbracoExternalCookie");
app.UseCookieAuthentication(new CookieAuthenticationOptions
{
@@ -93,11 +98,6 @@ namespace Umbraco.Web.Security.Identity
CookieDomain = UmbracoConfig.For.UmbracoSettings().Security.AuthCookieDomain
});
//NOTE: This works, but this is just the default implementation which we don't want because other devs
//might want to use this... right?
//app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);
return app;
}