Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add null checks to attachment viewer/uploader in web app to prevent exceptions

Leendert de Borst6dc9b638da29
diff --git a/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentUploader.razor b/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentUploader.razor
index 362b70d70..dd5fee92d 100644
--- a/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentUploader.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentUploader.razor
@@ -15,7 +15,14 @@
@foreach (var attachment in Attachments.Where(x => !x.IsDeleted))
{
<li class="flex items-center justify-between text-sm text-gray-600 dark:text-gray-400">
- <span>@attachment.Filename</span>
+ @if (attachment.Blob != null && attachment.Blob.Length > 0)
+ {
+ <span>@attachment.Filename</span>
+ }
+ else
+ {
+ <span class="text-gray-400 dark:text-gray-500" title="Attachment data unavailable">@attachment.Filename (unavailable)</span>
+ }
<button type="button" @onclick="() => DeleteAttachment(attachment)" class="text-red-500 hover:text-red-700">
Delete
</button>
diff --git a/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentViewer.razor b/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentViewer.razor
index e93751003..096d45683 100644
--- a/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentViewer.razor
+++ b/apps/server/AliasVault.Client/Main/Components/Attachments/AttachmentViewer.razor
@@ -17,7 +17,14 @@
{
<tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
<td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
- <span @onclick="() => DownloadAttachment(attachment)" class="text-primary cursor-pointer">@attachment.Filename</span>
+ @if (attachment.Blob != null && attachment.Blob.Length > 0)
+ {
+ <span @onclick="() => DownloadAttachment(attachment)" class="text-primary cursor-pointer">@attachment.Filename</span>
+ }
+ else
+ {
+ <span class="text-gray-400 dark:text-gray-500" title="Attachment data unavailable">@attachment.Filename (unavailable)</span>
+ }
</td>
<td class="px-6 py-4">
@attachment.CreatedAt.ToLocalTime().ToString("g")
diff --git a/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs b/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs
index e3fe7575a..4adbbe19d 100644
--- a/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs
+++ b/apps/server/AliasVault.Client/Main/Models/ItemEdit.cs
@@ -87,6 +87,7 @@ public sealed class ItemEdit
/// <summary>
/// Creates an ItemEdit instance from an Item entity.
/// Creates clones of Attachments, TotpCodes, and Passkeys to avoid modifying EF-tracked entities.
+ /// Handles null navigation properties defensively to prevent errors from incomplete data loads.
/// </summary>
/// <param name="item">The item entity to convert.</param>
/// <returns>A new ItemEdit instance.</returns>
@@ -100,15 +101,15 @@ public sealed class ItemEdit
LogoId = item.LogoId,
ServiceLogo = item.Logo?.FileData,
FolderId = item.FolderId,
- Attachments = item.Attachments.Where(a => !a.IsDeleted).Select(CloneAttachment).ToList(),
- TotpCodes = item.TotpCodes.Where(t => !t.IsDeleted).Select(CloneTotpCode).ToList(),
- Passkeys = item.Passkeys.Where(p => !p.IsDeleted).Select(ClonePasskey).ToList(),
+ Attachments = item.Attachments?.Where(a => !a.IsDeleted).Select(CloneAttachment).ToList() ?? [],
+ TotpCodes = item.TotpCodes?.Where(t => !t.IsDeleted).Select(CloneTotpCode).ToList() ?? [],
+ Passkeys = item.Passkeys?.Where(p => !p.IsDeleted).Select(ClonePasskey).ToList() ?? [],
CreateDate = item.CreatedAt,
LastUpdate = item.UpdatedAt,
};
// Group field values by FieldKey to handle multi-value fields
- var groupedFields = item.FieldValues
+ var groupedFields = (item.FieldValues ?? [])
.Where(f => !f.IsDeleted)
.GroupBy(f => f.FieldKey ?? f.FieldDefinitionId?.ToString() ?? string.Empty);
@@ -573,6 +574,7 @@ public sealed class ItemEdit
/// <summary>
/// Creates a clone of an Attachment entity to avoid modifying EF-tracked entities.
+ /// Handles null blob data defensively to prevent errors from corrupted sync data.
/// </summary>
/// <param name="attachment">The attachment to clone.</param>
/// <returns>A new Attachment instance with copied values.</returns>
@@ -581,8 +583,8 @@ public sealed class ItemEdit
return new Attachment
{
Id = attachment.Id,
- Filename = attachment.Filename,
- Blob = attachment.Blob,
+ Filename = attachment.Filename ?? string.Empty,
+ Blob = attachment.Blob ?? [],
ItemId = attachment.ItemId,
CreatedAt = attachment.CreatedAt,
UpdatedAt = attachment.UpdatedAt,