mirror of
https://github.com/bitwarden/server
synced 2026-01-05 01:53:17 +00:00
[PM-24192] Move account recovery logic to command (#6184)
* Move account recovery logic to command (temporarily duplicated behind feature flag) * Move permission checks to authorization handler * Prevent user from recovering provider member account unless they are also provider member
This commit is contained in:
@@ -13,9 +13,10 @@ public static class AuthorizationHandlerCollectionExtensions
|
||||
|
||||
services.TryAddEnumerable([
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, BulkCollectionAuthorizationHandler>(),
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, CollectionAuthorizationHandler>(),
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, GroupAuthorizationHandler>(),
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, OrganizationRequirementHandler>(),
|
||||
]);
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, CollectionAuthorizationHandler>(),
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, GroupAuthorizationHandler>(),
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, OrganizationRequirementHandler>(),
|
||||
ServiceDescriptor.Scoped<IAuthorizationHandler, RecoverAccountAuthorizationHandler>(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
using System.Security.Claims;
|
||||
using Bit.Core.AdminConsole.Repositories;
|
||||
using Bit.Core.Context;
|
||||
using Bit.Core.Entities;
|
||||
using Bit.Core.Enums;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
|
||||
namespace Bit.Api.AdminConsole.Authorization;
|
||||
|
||||
/// <summary>
|
||||
/// An authorization requirement for recovering an organization member's account.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Note: this is different to simply being able to manage account recovery. The user must be recovering
|
||||
/// a member who has equal or lesser permissions than them.
|
||||
/// </remarks>
|
||||
public class RecoverAccountAuthorizationRequirement : IAuthorizationRequirement;
|
||||
|
||||
/// <summary>
|
||||
/// Authorizes members and providers to recover a target OrganizationUser's account.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// This prevents privilege escalation by ensuring that a user cannot recover the account of
|
||||
/// another user with a higher role or with provider membership.
|
||||
/// </remarks>
|
||||
public class RecoverAccountAuthorizationHandler(
|
||||
IOrganizationContext organizationContext,
|
||||
ICurrentContext currentContext,
|
||||
IProviderUserRepository providerUserRepository)
|
||||
: AuthorizationHandler<RecoverAccountAuthorizationRequirement, OrganizationUser>
|
||||
{
|
||||
public const string FailureReason = "You are not permitted to recover this user's account.";
|
||||
public const string ProviderFailureReason = "You are not permitted to recover a Provider member's account.";
|
||||
|
||||
protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context,
|
||||
RecoverAccountAuthorizationRequirement requirement,
|
||||
OrganizationUser targetOrganizationUser)
|
||||
{
|
||||
// Step 1: check that the User has permissions with respect to the organization.
|
||||
// This may come from their role in the organization or their provider relationship.
|
||||
var canRecoverOrganizationMember =
|
||||
AuthorizeMember(context.User, targetOrganizationUser) ||
|
||||
await AuthorizeProviderAsync(context.User, targetOrganizationUser);
|
||||
|
||||
if (!canRecoverOrganizationMember)
|
||||
{
|
||||
context.Fail(new AuthorizationFailureReason(this, FailureReason));
|
||||
return;
|
||||
}
|
||||
|
||||
// Step 2: check that the User has permissions with respect to any provider the target user is a member of.
|
||||
// This prevents an organization admin performing privilege escalation into an unrelated provider.
|
||||
var canRecoverProviderMember = await CanRecoverProviderAsync(targetOrganizationUser);
|
||||
if (!canRecoverProviderMember)
|
||||
{
|
||||
context.Fail(new AuthorizationFailureReason(this, ProviderFailureReason));
|
||||
return;
|
||||
}
|
||||
|
||||
context.Succeed(requirement);
|
||||
}
|
||||
|
||||
private async Task<bool> AuthorizeProviderAsync(ClaimsPrincipal currentUser, OrganizationUser targetOrganizationUser)
|
||||
{
|
||||
return await organizationContext.IsProviderUserForOrganization(currentUser, targetOrganizationUser.OrganizationId);
|
||||
}
|
||||
|
||||
private bool AuthorizeMember(ClaimsPrincipal currentUser, OrganizationUser targetOrganizationUser)
|
||||
{
|
||||
var currentContextOrganization = organizationContext.GetOrganizationClaims(currentUser, targetOrganizationUser.OrganizationId);
|
||||
if (currentContextOrganization == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Current user must have equal or greater permissions than the user account being recovered
|
||||
var authorized = targetOrganizationUser.Type switch
|
||||
{
|
||||
OrganizationUserType.Owner => currentContextOrganization.Type is OrganizationUserType.Owner,
|
||||
OrganizationUserType.Admin => currentContextOrganization.Type is OrganizationUserType.Owner or OrganizationUserType.Admin,
|
||||
_ => currentContextOrganization is
|
||||
{ Type: OrganizationUserType.Owner or OrganizationUserType.Admin }
|
||||
or { Type: OrganizationUserType.Custom, Permissions.ManageResetPassword: true }
|
||||
};
|
||||
|
||||
return authorized;
|
||||
}
|
||||
|
||||
private async Task<bool> CanRecoverProviderAsync(OrganizationUser targetOrganizationUser)
|
||||
{
|
||||
if (!targetOrganizationUser.UserId.HasValue)
|
||||
{
|
||||
// If an OrganizationUser is not linked to a User then it can't be linked to a Provider either.
|
||||
// This is invalid but does not pose a privilege escalation risk. Return early and let the command
|
||||
// handle the invalid input.
|
||||
return true;
|
||||
}
|
||||
|
||||
var targetUserProviderUsers =
|
||||
await providerUserRepository.GetManyByUserAsync(targetOrganizationUser.UserId.Value);
|
||||
|
||||
// If the target user belongs to any provider that the current user is not a member of,
|
||||
// deny the action to prevent privilege escalation from organization to provider.
|
||||
// Note: we do not expect that a user is a member of more than 1 provider, but there is also no guarantee
|
||||
// against it; this returns a sequence, so we handle the possibility.
|
||||
var authorized = targetUserProviderUsers.All(providerUser => currentContext.ProviderUser(providerUser.ProviderId));
|
||||
return authorized;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user