Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ public sealed class SandboxUAuthAccessPolicy(IDbContextFactory<LabDbContext> dbF
public bool AppliesTo(AccessContext context)
=> IsProtectedAction(context.Action);

public async ValueTask<AccessDecision> DecideAsync(
AccessContext context,
CancellationToken cancellationToken = default)
public async ValueTask<AccessDecision> DecideAsync(AccessContext context, CancellationToken cancellationToken = default)
{
cancellationToken.ThrowIfCancellationRequested();

Expand Down Expand Up @@ -45,8 +43,7 @@ public async ValueTask<AccessDecision> DecideAsync(
if (rootResolver.IsLadmin(context))
return AccessDecision.Allow();

await using var db = await dbFactory.CreateDbContextAsync(
cancellationToken);
await using var db = await dbFactory.CreateDbContextAsync(cancellationToken);

var actor = await db.SandboxMembers
.AsNoTracking()
Expand All @@ -70,18 +67,35 @@ public async ValueTask<AccessDecision> DecideAsync(
if (operation == SandboxOperation.Denied)
return AccessDecision.Deny("sandbox_operation_restricted");

if (actor.Status == SandboxStatus.Passive &&
operation != SandboxOperation.Read)
if (actor.Status == SandboxStatus.Passive && operation != SandboxOperation.Read)
{
return AccessDecision.Deny("sandbox_read_only");
}

if (operation == SandboxOperation.Manage &&
actor.Role != SandboxMemberRole.Owner)
if (operation == SandboxOperation.Manage && actor.Role != SandboxMemberRole.Owner)
{
return AccessDecision.Deny("sandbox_owner_required");
}

if (action == UAuthActions.Users.GetByKeysAdmin)
{
var requestedKeys = context.TargetUserKeys;

if (requestedKeys.Count == 0)
return AccessDecision.Deny("sandbox_targets_required");

var keys = requestedKeys.Distinct().ToArray();

var allowedCount = await db.SandboxMembers
.AsNoTracking()
.CountAsync(x => x.SandboxId == actor.SandboxId && keys.Contains(x.UserKey), cancellationToken);

if (allowedCount != keys.Length)
{
return AccessDecision.Deny("sandbox_target_out_of_scope");
}
}

// All target-based admin operations must remain
// inside the actor's sandbox.
if (RequiresTarget(action))
Expand All @@ -91,10 +105,7 @@ public async ValueTask<AccessDecision> DecideAsync(

var belongsToSandbox = await db.SandboxMembers
.AsNoTracking()
.AnyAsync(
x => x.UserKey == targetKey &&
x.SandboxId == actor.SandboxId,
cancellationToken);
.AnyAsync(x => x.UserKey == targetKey && x.SandboxId == actor.SandboxId, cancellationToken);

if (!belongsToSandbox)
return AccessDecision.Deny("sandbox_target_out_of_scope");
Expand Down Expand Up @@ -138,18 +149,14 @@ private static SandboxOperation ClassifyAction(string action)
{
// User creation requires a controlled sandbox
// creation workflow, including membership and capacity.
if (action is
UAuthActions.Users.CreateAdmin or
UAuthActions.Users.QueryAdmin)
if (action is UAuthActions.Users.CreateAdmin or UAuthActions.Users.QueryAdmin)
{
return SandboxOperation.Denied;
}

// Global role definitions and assignments are
// handled separately by LabApplicationPolicy.
if (action.StartsWith(
"authorization.roles.",
StringComparison.Ordinal))
if (action.StartsWith("authorization.roles.", StringComparison.Ordinal))
{
return action is
UAuthActions.Authorization.Roles.GetSelf or
Expand All @@ -173,6 +180,7 @@ UAuthActions.Authorization.Roles.GetAdmin or

private static bool IsReadAction(string action)
=> action is
UAuthActions.Users.GetByKeysAdmin or
UAuthActions.UserProfiles.GetSelf or
UAuthActions.UserProfiles.GetAdmin or
UAuthActions.UserIdentifiers.GetSelf or
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
using CodeBeam.UltimateAuth.IdentityLab.Contracts;
using CodeBeam.UltimateAuth.IdentityLab.Domain;
using CodeBeam.UltimateAuth.IdentityLab.Persistence;
using CodeBeam.UltimateAuth.Users.Contracts;
using Microsoft.EntityFrameworkCore;

namespace CodeBeam.UltimateAuth.IdentityLab.Services;

public sealed class LabAdminService(IDbContextFactory<LabDbContext> dbFactory, IRoleStoreFactory roleStoreFactory,
IUserRoleStoreFactory userRoleStoreFactory, IUAuthClient uAuthClient)
IUserRoleStoreFactory userRoleStoreFactory, IUserSummaryQueryStoreFactory userSummaryQueryStoreFactory)
{
public async Task<bool> IsAdminAsync(UserKey actorUserKey, CancellationToken ct = default)
{
Expand All @@ -30,11 +31,7 @@ public async Task<bool> IsAdminAsync(UserKey actorUserKey, CancellationToken ct
.Create(tenant)
.GetByIdsAsync(roleIds, ct);

return roles.Any(x =>
string.Equals(
x.Name,
"Ladmin",
StringComparison.OrdinalIgnoreCase));
return roles.Any(x => string.Equals(x.Name, "Ladmin", StringComparison.OrdinalIgnoreCase));
}

private async Task RequireAdminAsync(UserKey actorUserKey, CancellationToken ct)
Expand Down Expand Up @@ -142,21 +139,26 @@ public async Task<IReadOnlyList<AdminSandboxMemberItem>> GetMemberDetailsAsync(U
{
var members = await GetMembersAsync(actorUserKey, sandboxId, ct);

var result = new List<AdminSandboxMemberItem>();
if (members.Count == 0)
return Array.Empty<AdminSandboxMemberItem>();

var keys = members.Select(x => x.UserKey).Distinct().ToArray();

var store = userSummaryQueryStoreFactory.Create(TenantKeys.Single);

var summaries = await store.GetByKeysAsync(keys, ct);

var userMap = summaries.ToDictionary(x => x.UserKey);

var result = new List<AdminSandboxMemberItem>(members.Count);

foreach (var member in members)
{
var userResult = await uAuthClient.Users.GetUserAsync(
member.UserKey);

if (!userResult.IsSuccess || userResult.Value is null)
if (!userMap.TryGetValue(member.UserKey, out var user))
{
throw new InvalidOperationException(
$"Unable to load member {member.UserKey.Value}.");
throw new InvalidOperationException($"Unable to load member {member.UserKey.Value}.");
}

var user = userResult.Value;

result.Add(new AdminSandboxMemberItem(
member.UserKey,
user.DisplayName ?? user.UserName ?? "Unknown",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
namespace CodeBeam.UltimateAuth.IdentityLab.Services;

public sealed class SandboxUserService(SandboxService sandboxService, SandboxAccessService accessService, IUAuthClient uAuthClient,
IRoleStoreFactory roleStoreFactory, IUserRoleStoreFactory userRoleStoreFactory, ActivityLogService activityLogService)
IRoleStoreFactory roleStoreFactory, IUserRoleStoreFactory userRoleStoreFactory, IUserSummaryQueryStoreFactory userSummaryQueryStoreFactory,
ActivityLogService activityLogService)
{
public async Task<SandboxUsersSnapshot?> GetUsersAsync(UserKey actorUserKey, CancellationToken ct = default)
{
Expand All @@ -25,16 +26,28 @@ public sealed class SandboxUserService(SandboxService sandboxService, SandboxAcc
throw new UnauthorizedAccessException();

var members = await sandboxService.GetMembersAsync(sandbox.Id, ct);
var users = new List<SandboxUserItem>();

foreach (var member in members)
if (members.Count == 0)
{
var result = await uAuthClient.Users.GetUserAsync(member.UserKey);
return new SandboxUsersSnapshot(sandbox.Id, sandbox.Settings.MaxUsers, Array.Empty<SandboxUserItem>());
}

if (!result.IsSuccess || result.Value is null)
throw new InvalidOperationException($"Unable to load user {member.UserKey.Value}.");
var keys = members.Select(x => x.UserKey).Distinct().ToArray();

var store = userSummaryQueryStoreFactory.Create(TenantKeys.Single);

var summaries = await store.GetByKeysAsync(keys, ct);

var user = result.Value;
var userMap = summaries.ToDictionary(x => x.UserKey);

var users = new List<SandboxUserItem>(members.Count);

foreach (var member in members)
{
if (!userMap.TryGetValue(member.UserKey, out var user))
{
throw new InvalidOperationException($"Unable to load user {member.UserKey.Value}.");
}

users.Add(new SandboxUserItem(
UserKey: member.UserKey,
Expand All @@ -45,7 +58,7 @@ public sealed class SandboxUserService(SandboxService sandboxService, SandboxAcc
Email: user.PrimaryEmail ?? "",
IsOwner: member.Role == SandboxMemberRole.Owner,
Status: user.Status,
CreatedAt: user.CreatedAt ?? member.JoinedAt
CreatedAt: user.CreatedAt
));
}

Expand Down
Loading
Loading