commit
710fae4b0e
|
@ -6,6 +6,7 @@
|
|||
@inject IProfileService ProfileService
|
||||
@inject ISettingService SettingService
|
||||
@inject IFileService FileService
|
||||
@inject IServiceProvider ServiceProvider
|
||||
@inject IStringLocalizer<Edit> Localizer
|
||||
@inject IStringLocalizer<SharedResources> SharedLocalizer
|
||||
|
||||
|
@ -130,6 +131,10 @@
|
|||
|
||||
<button type="button" class="btn btn-success" @onclick="SaveUser">@SharedLocalizer["Save"]</button>
|
||||
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
|
||||
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) && PageState.Runtime != Shared.Runtime.Hybrid && !ishost)
|
||||
{
|
||||
<button type="button" class="btn btn-primary ms-2" @onclick="ImpersonateUser">@Localizer["Impersonate"]</button>
|
||||
}
|
||||
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host) && isdeleted == "True")
|
||||
{
|
||||
<ActionDialog Header="Delete User" Message="Are You Sure You Wish To Permanently Delete This User?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteUser())" ResourceKey="DeleteUser" />
|
||||
|
@ -152,6 +157,7 @@
|
|||
private string isdeleted;
|
||||
private string lastlogin;
|
||||
private string lastipaddress;
|
||||
private bool ishost = false;
|
||||
|
||||
private List<Profile> profiles;
|
||||
private Dictionary<string, string> userSettings;
|
||||
|
@ -186,6 +192,7 @@
|
|||
isdeleted = user.IsDeleted.ToString();
|
||||
lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
|
||||
lastipaddress = user.LastIPAddress;
|
||||
ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host);
|
||||
|
||||
userSettings = user.Settings;
|
||||
createdby = user.CreatedBy;
|
||||
|
@ -267,6 +274,25 @@
|
|||
}
|
||||
}
|
||||
|
||||
private async Task ImpersonateUser()
|
||||
{
|
||||
try
|
||||
{
|
||||
await logger.LogInformation(LogFunction.Security, "User {Username} Impersonated By Administrator {Administrator}", username, PageState.User.Username);
|
||||
|
||||
// post back to the server so that the cookies are set correctly
|
||||
var interop = new Interop(JSRuntime);
|
||||
var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = username, returnurl = PageState.Alias.Path };
|
||||
string url = Utilities.TenantUrl(PageState.Alias, "/pages/impersonate/");
|
||||
await interop.SubmitForm(url, fields);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await logger.LogError(ex, "Error Impersonating User {Username} {Error}", username, ex.Message);
|
||||
AddModuleMessage(Localizer["Error.User.Impersonate"], MessageType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task DeleteUser()
|
||||
{
|
||||
try
|
||||
|
|
|
@ -204,4 +204,10 @@
|
|||
<data name="DeleteUser.Message" xml:space="preserve">
|
||||
<value>Are You Sure You Wish To Permanently Delete This User?</value>
|
||||
</data>
|
||||
<data name="Impersonate" xml:space="preserve">
|
||||
<value>Impersonate</value>
|
||||
</data>
|
||||
<data name="Error.User.Impersonate" xml:space="preserve">
|
||||
<value>Unable To Impersonate User</value>
|
||||
</data>
|
||||
</root>
|
|
@ -12,6 +12,7 @@ using Oqtane.Enums;
|
|||
using Oqtane.Infrastructure;
|
||||
using Oqtane.Models;
|
||||
using Oqtane.Repository;
|
||||
using Oqtane.Security;
|
||||
using Oqtane.Shared;
|
||||
|
||||
namespace Oqtane.Managers
|
||||
|
@ -369,7 +370,7 @@ namespace Oqtane.Managers
|
|||
if (user != null)
|
||||
{
|
||||
// ensure user is registered for site
|
||||
if (user.Roles.Contains(RoleNames.Registered))
|
||||
if (UserSecurity.ContainsRole(user.Roles, RoleNames.Registered))
|
||||
{
|
||||
user.IsAuthenticated = true;
|
||||
user.LastLoginOn = DateTime.UtcNow;
|
||||
|
|
3
Oqtane.Server/Pages/Impersonate.cshtml
Normal file
3
Oqtane.Server/Pages/Impersonate.cshtml
Normal file
|
@ -0,0 +1,3 @@
|
|||
@page "/pages/impersonate"
|
||||
@namespace Oqtane.Pages
|
||||
@model Oqtane.Pages.ImpersonateModel
|
79
Oqtane.Server/Pages/Impersonate.cshtml.cs
Normal file
79
Oqtane.Server/Pages/Impersonate.cshtml.cs
Normal file
|
@ -0,0 +1,79 @@
|
|||
using System.Net;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Oqtane.Enums;
|
||||
using Oqtane.Extensions;
|
||||
using Oqtane.Infrastructure;
|
||||
using Oqtane.Managers;
|
||||
using Oqtane.Security;
|
||||
using Oqtane.Shared;
|
||||
|
||||
namespace Oqtane.Pages
|
||||
{
|
||||
public class ImpersonateModel : PageModel
|
||||
{
|
||||
private readonly UserManager<IdentityUser> _identityUserManager;
|
||||
private readonly SignInManager<IdentityUser> _identitySignInManager;
|
||||
private readonly IUserManager _userManager;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public ImpersonateModel(UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, IUserManager userManager, ILogManager logger)
|
||||
{
|
||||
_identityUserManager = identityUserManager;
|
||||
_identitySignInManager = identitySignInManager;
|
||||
_userManager = userManager;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostAsync(string username, string returnurl)
|
||||
{
|
||||
if (User.IsInRole(RoleNames.Admin) && !string.IsNullOrEmpty(username))
|
||||
{
|
||||
bool validuser = false;
|
||||
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(username);
|
||||
if (identityuser != null)
|
||||
{
|
||||
var alias = HttpContext.GetAlias();
|
||||
var user = _userManager.GetUser(identityuser.UserName, alias.SiteId);
|
||||
if (user != null && !user.IsDeleted && UserSecurity.ContainsRole(user.Roles, RoleNames.Registered) && !UserSecurity.ContainsRole(user.Roles, RoleNames.Host))
|
||||
{
|
||||
validuser = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (validuser)
|
||||
{
|
||||
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User {Username} Successfully Impersonated By Administrator {Administrator}", username, User.Identity.Name);
|
||||
|
||||
// note that .NET Identity uses a hardcoded ApplicationScheme of "Identity.Application" in SignInAsync
|
||||
await _identitySignInManager.SignInAsync(identityuser, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Impersonation By Administrator {Administrator} Failed For User {Username} ", User.Identity.Name, username);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Attempt To Impersonate User {Username} By User {User}", username, User.Identity.Name);
|
||||
}
|
||||
|
||||
if (returnurl == null)
|
||||
{
|
||||
returnurl = "";
|
||||
}
|
||||
else
|
||||
{
|
||||
returnurl = WebUtility.UrlDecode(returnurl);
|
||||
}
|
||||
if (!returnurl.StartsWith("/"))
|
||||
{
|
||||
returnurl = "/" + returnurl;
|
||||
}
|
||||
|
||||
return LocalRedirect(Url.Content("~" + returnurl));
|
||||
}
|
||||
}
|
||||
}
|
|
@ -4,8 +4,11 @@ using Microsoft.AspNetCore.Authorization;
|
|||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Oqtane.Enums;
|
||||
using Oqtane.Extensions;
|
||||
using Oqtane.Infrastructure;
|
||||
using Oqtane.Managers;
|
||||
using Oqtane.Security;
|
||||
using Oqtane.Shared;
|
||||
|
||||
namespace Oqtane.Pages
|
||||
|
@ -16,12 +19,14 @@ namespace Oqtane.Pages
|
|||
private readonly UserManager<IdentityUser> _identityUserManager;
|
||||
private readonly SignInManager<IdentityUser> _identitySignInManager;
|
||||
private readonly IUserManager _userManager;
|
||||
private readonly ILogManager _logger;
|
||||
|
||||
public LoginModel(UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, IUserManager userManager)
|
||||
public LoginModel(UserManager<IdentityUser> identityUserManager, SignInManager<IdentityUser> identitySignInManager, IUserManager userManager, ILogManager logger)
|
||||
{
|
||||
_identityUserManager = identityUserManager;
|
||||
_identitySignInManager = identitySignInManager;
|
||||
_userManager = userManager;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostAsync(string username, string password, bool remember, string returnurl)
|
||||
|
@ -37,7 +42,7 @@ namespace Oqtane.Pages
|
|||
{
|
||||
var alias = HttpContext.GetAlias();
|
||||
var user = _userManager.GetUser(identityuser.UserName, alias.SiteId);
|
||||
if (user != null && !user.IsDeleted)
|
||||
if (user != null && !user.IsDeleted && UserSecurity.ContainsRole(user.Roles, RoleNames.Registered))
|
||||
{
|
||||
validuser = true;
|
||||
}
|
||||
|
@ -48,7 +53,16 @@ namespace Oqtane.Pages
|
|||
{
|
||||
// note that .NET Identity uses a hardcoded ApplicationScheme of "Identity.Application" in SignInAsync
|
||||
await _identitySignInManager.SignInAsync(identityuser, remember);
|
||||
_logger.Log(LogLevel.Information, this, LogFunction.Security, "Login Successful For User {Username}", username);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Login Failed For User {Username}", username);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Attempt To Login User {Username}", username);
|
||||
}
|
||||
|
||||
if (returnurl == null)
|
||||
|
|
|
@ -72,6 +72,11 @@ namespace Oqtane.Security
|
|||
return isAuthorized;
|
||||
}
|
||||
|
||||
public static bool ContainsRole(string roles, string roleName)
|
||||
{
|
||||
return roles.Split(';', StringSplitOptions.RemoveEmptyEntries).Contains(roleName);
|
||||
}
|
||||
|
||||
public static bool ContainsRole(List<Permission> permissions, string permissionName, string roleName)
|
||||
{
|
||||
return permissions.Any(item => item.PermissionName == permissionName && item.RoleName == roleName);
|
||||
|
@ -101,7 +106,7 @@ namespace Oqtane.Security
|
|||
identity.AddClaim(new Claim(ClaimTypes.Name, user.Username));
|
||||
identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, user.UserId.ToString()));
|
||||
identity.AddClaim(new Claim(Constants.SiteKeyClaimType, alias.SiteKey));
|
||||
if (user.Roles.Contains(RoleNames.Host))
|
||||
if (ContainsRole(user.Roles, RoleNames.Host))
|
||||
{
|
||||
// host users are site admins by default
|
||||
identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Host));
|
||||
|
|
Loading…
Reference in New Issue
Block a user