Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add group invitation expire date
Leendert de Borst40ad642423e2
diff --git a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.csindex 663aafef3..da3bcd489 100644--- a/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs+++ b/apps/server/AliasVault.Api/Controllers/V2/GroupsController.cs@@ -42,6 +42,11 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use/// </summary>private const int MaxSharedVaults = 3;+ /// <summary>+ /// How long an offer of access stays open before it expires unanswered.+ /// </summary>+ private static readonly TimeSpan InvitationLifetime = TimeSpan.FromDays(7);+/// <summary>/// Get the overview of the caller's shared groups and the access offers awaiting their answer./// </summary>@@ -63,7 +68,7 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Usevar response = new GroupOverviewResponse{- ReceivedInvitations = await GetReceivedInvitationsAsync(context, me.Id),+ ReceivedInvitations = await GetReceivedInvitationsAsync(context, me.Id, InvitationCutoff()),};if (memberships.Count == 0)@@ -93,7 +98,7 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Usevar publicKeys = administeredGroupIds.Count > 0 ? await GrantHelper.GetPrimaryKeysAsync(context, administeredMemberIds) : [];// Open offers are only shown to the admins who may withdraw them.- var openInvitations = administeredGroupIds.Count > 0 ? await GetOpenInvitationsByManifestAsync(context, [.. administeredGroupIds]) : [];+ var openInvitations = administeredGroupIds.Count > 0 ? await GetOpenInvitationsByManifestAsync(context, [.. administeredGroupIds], InvitationCutoff()) : [];foreach (var membership in memberships){@@ -301,6 +306,7 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use}await CloseStaleInvitationsAsync(context, manifestId, manifestKeyVersion.Value);+ await CloseExpiredInvitationsAsync(context, manifestId);if (await context.GroupInvitations.AnyAsync(i => i.VaultManifestId == manifestId && i.InviteeUserId == model.UserId && i.State == GroupInvitationState.Pending)){@@ -613,6 +619,21 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Usereturn ApiError.Result(ApiErrorCode.INVITATION_KEY_OUTDATED, 400);}+ if (invitation.CreatedAt < InvitationCutoff())+ {+ CloseInvitation(invitation, GroupInvitationState.Expired);+ await context.SaveChangesAsync();+ return ApiError.Result(ApiErrorCode.INVITATION_NOT_FOUND, 404);+ }++ // The offer is only as good as the inviter's right to make it, checked again now and not only when it was sent.+ if (!await InviterMayStillGrantAsync(context, invitation))+ {+ CloseInvitation(invitation, GroupInvitationState.Revoked);+ await context.SaveChangesAsync();+ return ApiError.Result(ApiErrorCode.INVITATION_NOT_FOUND, 404);+ }+if (!await PromoteInvitationGrantAsync(context, invitation, me.Id, manifestKeyVersion.Value)){return ApiError.Result(ApiErrorCode.INVITATION_NOT_FOUND, 404);@@ -693,11 +714,12 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use/// </summary>/// <param name="context">Database context.</param>/// <param name="groupIds">The groups to list offers of.</param>+ /// <param name="createdAfter">Offers created before this moment have expired and are left out.</param>/// <returns>Manifest id to its open offers.</returns>- private static async Task<Dictionary<Guid, List<SentManifestInvitation>>> GetOpenInvitationsByManifestAsync(AliasServerDbContext context, List<Guid> groupIds)+ private static async Task<Dictionary<Guid, List<SentManifestInvitation>>> GetOpenInvitationsByManifestAsync(AliasServerDbContext context, List<Guid> groupIds, DateTime createdAfter){return (await context.GroupInvitations- .Where(i => groupIds.Contains(i.GroupId) && i.State == GroupInvitationState.Pending && i.VaultManifestId != null)+ .Where(i => groupIds.Contains(i.GroupId) && i.State == GroupInvitationState.Pending && i.VaultManifestId != null && i.CreatedAt >= createdAfter).Select(i => new{ManifestId = i.VaultManifestId!.Value,@@ -713,11 +735,15 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use/// </summary>/// <param name="context">Database context.</param>/// <param name="userId">The invitee.</param>+ /// <param name="createdAfter">Offers created before this moment have expired and are left out.</param>/// <returns>Their open offers.</returns>- private static async Task<List<ReceivedManifestInvitation>> GetReceivedInvitationsAsync(AliasServerDbContext context, string userId)+ private static async Task<List<ReceivedManifestInvitation>> GetReceivedInvitationsAsync(AliasServerDbContext context, string userId, DateTime createdAfter){+ // Offers the recipient could no longer accept (expired, or the inviter lost the right to make them) are left out.var invitations = await context.GroupInvitations- .Where(i => i.InviteeUserId == userId && i.State == GroupInvitationState.Pending && i.Group.Type == GroupType.Shared && i.VaultManifestId != null)+ .Where(i => i.InviteeUserId == userId && i.State == GroupInvitationState.Pending && i.Group.Type == GroupType.Shared && i.VaultManifestId != null && i.CreatedAt >= createdAfter)+ .Where(i => context.GroupMembers.Any(m => m.GroupId == i.GroupId && m.UserId == i.InviterUserId && (m.Role == GroupRole.Owner || m.Role == GroupRole.Admin)))+ .Where(i => context.VaultManifestAccessKeys.Any(k => k.UserId == i.InviterUserId && k.Type == ManifestKeyType.GrantKey && k.VaultManifestId == i.VaultManifestId)).OrderBy(i => i.CreatedAt).Select(i => new{@@ -763,6 +789,19 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Use})];}+ /// <summary>+ /// Whether the inviter is still an admin of the group and still holds a grant on the offered manifest.+ /// </summary>+ /// <param name="context">The database context.</param>+ /// <param name="invitation">The invitation.</param>+ /// <returns>True when the inviter may still hand out this manifest's key.</returns>+ private static async Task<bool> InviterMayStillGrantAsync(AliasServerDbContext context, GroupInvitation invitation)+ {+ return invitation.VaultManifestId is Guid manifestId+ && await GroupHelper.IsSharedGroupAdminAsync(context, invitation.GroupId, invitation.InviterUserId)+ && await ManifestAccessHelper.HoldsGrantAsync(context, invitation.InviterUserId, manifestId);+ }+/// <summary>/// Close an offer of access, dropping the manifest key encrypted inside it./// </summary>@@ -807,6 +846,34 @@ public class GroupsController(IAliasServerDbContextFactory dbContextFactory, Usereturn true;}+ /// <summary>+ /// The creation moment before which an open offer of access has expired.+ /// </summary>+ /// <returns>The cutoff in UTC.</returns>+ private DateTime InvitationCutoff()+ {+ return timeProvider.GetUtcNow().UtcDateTime - InvitationLifetime;+ }++ /// <summary>+ /// Close the open offers on a manifest that expired unanswered, so a new offer to the same person can be made.+ /// </summary>+ /// <param name="context">The database context.</param>+ /// <param name="manifestId">The manifest.</param>+ /// <returns>A task.</returns>+ private async Task CloseExpiredInvitationsAsync(AliasServerDbContext context, Guid manifestId)+ {+ var cutoff = InvitationCutoff();+ var expired = await context.GroupInvitations+ .Where(i => i.VaultManifestId == manifestId && i.State == GroupInvitationState.Pending && i.CreatedAt < cutoff)+ .ToListAsync();++ foreach (var invitation in expired)+ {+ CloseInvitation(invitation, GroupInvitationState.Expired);+ }+ }+/// <summary>/// Close every open offer of access to a manifest whose encrypted key predates the manifest's current one, as accepting it/// would fail anyway.diff --git a/apps/server/Databases/AliasServerDb/GroupInvitationState.cs b/apps/server/Databases/AliasServerDb/GroupInvitationState.csindex 82bd038d8..3939de5c1 100644--- a/apps/server/Databases/AliasServerDb/GroupInvitationState.cs+++ b/apps/server/Databases/AliasServerDb/GroupInvitationState.cs@@ -37,4 +37,9 @@ public enum GroupInvitationState/// accepting it would hand the invitee a grant they cannot use. The inviter has to make a fresh invitation./// </summary>Stale = 4,++ /// <summary>+ /// Left unanswered past its lifetime. The inviter has to make a fresh invitation.+ /// </summary>+ Expired = 5,}