mirror of
https://github.com/bitwarden/server
synced 2025-12-25 04:33:26 +00:00
* Revoking users when enabling single org and 2fa policies. Fixing tests. * Added migration. * Wrote tests and fixed bugs found. * Patch build process * Fixing tests. * Added unit test around disabling the feature flag. * Updated error message to be public and added test for validating the request. * formatting * Added some tests for single org policy validator. * Fix issues from merge. * Added sending emails to revoked non-compliant users. * Fixing name. Adding two factor policy email. * Send email when user has been revoked. * Correcting migration name. * Fixing templates and logic issue in Revoke command. * Moving interface into its own file. * Correcting namespaces for email templates. * correcting logic that would not allow normal users to revoke non owners. * Actually correcting the test and logic. * dotnet format. Added exec to bottom of bulk sproc * Update src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RevokeNonCompliantOrganizationUserCommand.cs Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com> * Updated OrgIds to be a json string * Fixing errors. * Updating test * Moving command result. * Formatting and request rename * Realized this would throw a null error from the system domain verification. Adding unknown type to event system user. Adding optional parameter to SaveAsync in policy service in order to pass in event system user. * Code review changes * Removing todos * Corrected test name. * Syncing filename to record name. * Fixing up the tests. * Added happy path test * Naming corrections. And corrected EF query. * added check against event service * Code review changes. * Fixing tests. * splitting up tests * Added templates and email side effect for claiming a domain. * bringing changes from nc user changes. * Switched to enqueue mail message. * Filled in DomainClaimedByOrganization.html.hbs * Added text document for domain claiming * Fixing migration script. * Remove old sproc * Limiting sending of the email down to users who are a part of the domain being claimed. * Added test for change * Renames and fixed up email. * Fixing up CSS --------- Co-authored-by: Matt Bishop <mbishop@bitwarden.com> Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com> Co-authored-by: Rui Tome <rtome@bitwarden.com>
160 lines
6.3 KiB
C#
160 lines
6.3 KiB
C#
using Bit.Core.AdminConsole.Enums;
|
|
using Bit.Core.AdminConsole.Models.Data;
|
|
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
|
|
using Bit.Core.AdminConsole.OrganizationFeatures.Policies;
|
|
using Bit.Core.AdminConsole.OrganizationFeatures.Policies.Models;
|
|
using Bit.Core.Context;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Bit.Core.Exceptions;
|
|
using Bit.Core.Models.Data.Organizations;
|
|
using Bit.Core.Repositories;
|
|
using Bit.Core.Services;
|
|
using Bit.Core.Settings;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
|
|
|
|
public class VerifyOrganizationDomainCommand(
|
|
IOrganizationDomainRepository organizationDomainRepository,
|
|
IDnsResolverService dnsResolverService,
|
|
IEventService eventService,
|
|
IGlobalSettings globalSettings,
|
|
IFeatureService featureService,
|
|
ICurrentContext currentContext,
|
|
ISavePolicyCommand savePolicyCommand,
|
|
IMailService mailService,
|
|
IOrganizationUserRepository organizationUserRepository,
|
|
IOrganizationRepository organizationRepository,
|
|
ILogger<VerifyOrganizationDomainCommand> logger)
|
|
: IVerifyOrganizationDomainCommand
|
|
{
|
|
public async Task<OrganizationDomain> UserVerifyOrganizationDomainAsync(OrganizationDomain organizationDomain)
|
|
{
|
|
if (currentContext.UserId is null)
|
|
{
|
|
throw new InvalidOperationException(
|
|
$"{nameof(UserVerifyOrganizationDomainAsync)} can only be called by a user. " +
|
|
$"Please call {nameof(SystemVerifyOrganizationDomainAsync)} for system users.");
|
|
}
|
|
|
|
var actingUser = new StandardUser(currentContext.UserId.Value, await currentContext.OrganizationOwner(organizationDomain.OrganizationId));
|
|
|
|
var domainVerificationResult = await VerifyOrganizationDomainAsync(organizationDomain, actingUser);
|
|
|
|
await eventService.LogOrganizationDomainEventAsync(domainVerificationResult,
|
|
domainVerificationResult.VerifiedDate != null
|
|
? EventType.OrganizationDomain_Verified
|
|
: EventType.OrganizationDomain_NotVerified);
|
|
|
|
await organizationDomainRepository.ReplaceAsync(domainVerificationResult);
|
|
|
|
return domainVerificationResult;
|
|
}
|
|
|
|
public async Task<OrganizationDomain> SystemVerifyOrganizationDomainAsync(OrganizationDomain organizationDomain)
|
|
{
|
|
var actingUser = new SystemUser(EventSystemUser.DomainVerification);
|
|
|
|
organizationDomain.SetJobRunCount();
|
|
|
|
var domainVerificationResult = await VerifyOrganizationDomainAsync(organizationDomain, actingUser);
|
|
|
|
if (domainVerificationResult.VerifiedDate is not null)
|
|
{
|
|
logger.LogInformation(Constants.BypassFiltersEventId, "Successfully validated domain");
|
|
|
|
await eventService.LogOrganizationDomainEventAsync(domainVerificationResult,
|
|
EventType.OrganizationDomain_Verified,
|
|
EventSystemUser.DomainVerification);
|
|
}
|
|
else
|
|
{
|
|
domainVerificationResult.SetNextRunDate(globalSettings.DomainVerification.VerificationInterval);
|
|
|
|
await eventService.LogOrganizationDomainEventAsync(domainVerificationResult,
|
|
EventType.OrganizationDomain_NotVerified,
|
|
EventSystemUser.DomainVerification);
|
|
|
|
logger.LogInformation(Constants.BypassFiltersEventId,
|
|
"Verification for organization {OrgId} with domain {Domain} failed",
|
|
domainVerificationResult.OrganizationId, domainVerificationResult.DomainName);
|
|
}
|
|
|
|
await organizationDomainRepository.ReplaceAsync(domainVerificationResult);
|
|
|
|
return domainVerificationResult;
|
|
}
|
|
|
|
private async Task<OrganizationDomain> VerifyOrganizationDomainAsync(OrganizationDomain domain, IActingUser actingUser)
|
|
{
|
|
domain.SetLastCheckedDate();
|
|
|
|
if (domain.VerifiedDate is not null)
|
|
{
|
|
await organizationDomainRepository.ReplaceAsync(domain);
|
|
throw new ConflictException("Domain has already been verified.");
|
|
}
|
|
|
|
var claimedDomain =
|
|
await organizationDomainRepository.GetClaimedDomainsByDomainNameAsync(domain.DomainName);
|
|
|
|
if (claimedDomain.Count > 0)
|
|
{
|
|
await organizationDomainRepository.ReplaceAsync(domain);
|
|
throw new ConflictException("The domain is not available to be claimed.");
|
|
}
|
|
|
|
try
|
|
{
|
|
if (await dnsResolverService.ResolveAsync(domain.DomainName, domain.Txt))
|
|
{
|
|
domain.SetVerifiedDate();
|
|
|
|
await DomainVerificationSideEffectsAsync(domain, actingUser);
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
logger.LogError("Error verifying Organization domain: {domain}. {errorMessage}",
|
|
domain.DomainName, e.Message);
|
|
}
|
|
|
|
return domain;
|
|
}
|
|
|
|
private async Task DomainVerificationSideEffectsAsync(OrganizationDomain domain, IActingUser actingUser)
|
|
{
|
|
if (featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning))
|
|
{
|
|
await EnableSingleOrganizationPolicyAsync(domain.OrganizationId, actingUser);
|
|
await SendVerifiedDomainUserEmailAsync(domain);
|
|
}
|
|
}
|
|
|
|
private async Task EnableSingleOrganizationPolicyAsync(Guid organizationId, IActingUser actingUser) =>
|
|
await savePolicyCommand.SaveAsync(
|
|
new PolicyUpdate
|
|
{
|
|
OrganizationId = organizationId,
|
|
Type = PolicyType.SingleOrg,
|
|
Enabled = true,
|
|
PerformedBy = actingUser
|
|
});
|
|
|
|
private async Task SendVerifiedDomainUserEmailAsync(OrganizationDomain domain)
|
|
{
|
|
var orgUserUsers = await organizationUserRepository.GetManyDetailsByOrganizationAsync(domain.OrganizationId);
|
|
|
|
var domainUserEmails = orgUserUsers
|
|
.Where(ou => ou.Email.ToLower().EndsWith($"@{domain.DomainName.ToLower()}") &&
|
|
ou.Status != OrganizationUserStatusType.Revoked &&
|
|
ou.Status != OrganizationUserStatusType.Invited)
|
|
.Select(ou => ou.Email);
|
|
|
|
var organization = await organizationRepository.GetByIdAsync(domain.OrganizationId);
|
|
|
|
await mailService.SendClaimedDomainUserEmailAsync(new ManagedUserDomainClaimedEmails(domainUserEmails, organization));
|
|
}
|
|
}
|