From 6df3c036822213359edce17bcdd47fc7ec2a89c2 Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Thu, 6 Mar 2025 10:40:50 +0100 Subject: [PATCH] Add less severe log message for email received for orphaned user email claim (#651) --- .../Handlers/DatabaseMessageStore.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs b/src/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs index 039307cf9..c25bb5c7a 100644 --- a/src/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs +++ b/src/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs @@ -317,6 +317,16 @@ public class DatabaseMessageStore(ILogger logger, Config c return false; } + if (userEmailClaim.UserId is null) + { + // This email claim has no user attached to it (anymore), which most likely means the user has deleted + // its account. We cannot process this email. + logger.LogWarning( + "Rejected email: email for {ToAddress} is claimed but has no user associated with it. User has most likely deleted their account.", + toAddress.User + "@" + toAddress.Host); + return false; + } + // Retrieve user public encryption key from database var userPublicKey = await dbContext.UserEncryptionKeys.FirstOrDefaultAsync( x =>