changed blocked sender list

email-worker-nodejs/src/email/blocklist.ts

@@ -26,15 +26,15 @@ export class BlocklistChecker {
    * Batch-check whether a sender is blocked for each recipient.
    * Uses a single batch DynamoDB call for efficiency.
    */
-  async batchCheckBlockedSenders(
+async batchCheckBlockedSenders(
     recipients: string[],
-    sender: string,
+    senders: string[], // <-- Geändert zu Array
     workerName: string,
   ): Promise<Record<string, boolean>> {
-    const patternsByRecipient =
+    const patternsByRecipient = await this.dynamodb.batchGetBlockedPatterns(recipients);
-      await this.dynamodb.batchGetBlockedPatterns(recipients);
     
-    const senderClean = extractAddress(sender);
+    // Alle übergebenen Adressen bereinigen
+    const sendersClean = senders.map(s => extractAddress(s)).filter(Boolean);
     const result: Record<string, boolean> = {};
 
     for (const recipient of recipients) {
@@ -42,10 +42,10 @@ export class BlocklistChecker {
       let isBlocked = false;
 
       for (const pattern of patterns) {
+        for (const senderClean of sendersClean) {
           if (picomatch.isMatch(senderClean, pattern.toLowerCase())) {
             log(
-            `⛔ BLOCKED: Sender ${senderClean} matches pattern '${pattern}' ` +
+              `⛔ BLOCKED: Sender ${senderClean} matches pattern '${pattern}' for inbox ${recipient}`,
-              `for inbox ${recipient}`,
               'WARNING',
               workerName,
             );
@@ -53,10 +53,10 @@ export class BlocklistChecker {
             break;
           }
         }
-
+        if (isBlocked) break;
+      }
       result[recipient] = isBlocked;
     }
-
     return result;
   }
 }

email-worker-nodejs/src/worker/message-processor.ts

@@ -179,9 +179,17 @@ export class MessageProcessor {
       }
 
       // 6. BLOCKLIST CHECK
+      const sendersToCheck: string[] = [];
+      if (fromAddrFinal) sendersToCheck.push(fromAddrFinal);
+      
+      const headerFrom = parsedFinal?.from?.text;
+      if (headerFrom && !sendersToCheck.includes(headerFrom)) {
+        sendersToCheck.push(headerFrom);
+      }
+
       const blockedByRecipient = await this.blocklist.batchCheckBlockedSenders(
         recipients,
-        fromAddrFinal,
+        sendersToCheck, // <-- Array übergeben
         workerName,
       );