fix

DMS/batch_imapsync.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+# batch_imapsync.sh - Führt IMAP-Sync für alle User im Hintergrund aus
+# Format der CSV: email@domain.com,SecretPassword123
+
+HOST1=$1
+HOST2=$2
+CSV_FILE=$3
+
+if [ -z "$HOST1" ] || [ -z "$HOST2" ] || [ -z "$CSV_FILE" ]; then
+    echo "Usage: $0 <source-host> <target-host> <users.csv>"
+    echo "Beispiel: $0 secure.emailsrvr.com 147.93.132.244 stxmaterials.csv"
+    exit 1
+fi
+
+# ======================================================================
+# Die eigentliche Sync-Funktion (wird in den Hintergrund geschickt)
+# ======================================================================
+run_sync_jobs() {
+    TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+    LOG_DIR="sync_logs_$TIMESTAMP"
+    mkdir -p "$LOG_DIR"
+    
+    echo "Beginne Sync-Lauf am $(date)" > "batch_master_${TIMESTAMP}.log"
+
+    while IFS=, read -r email password; do
+        email=$(echo "$email" | tr -d '\r' | xargs)
+        password=$(echo "$password" | tr -d '\r' | xargs)
+        
+        [ -z "$email" ] && continue
+        
+        LOGFILE="$LOG_DIR/imapsync_${email}.log"
+        echo "[$(date)] Syncing $email -> $LOGFILE" >> "batch_master_${TIMESTAMP}.log"
+        
+        # Führe Docker imapsync für den aktuellen User aus
+        docker run --rm gilleslamiral/imapsync imapsync \
+            --host1 "$HOST1" --user1 "$email" --password1 "$password" --ssl1 \
+            --host2 "$HOST2" --user2 "$email" --password2 "$password" --ssl2 \
+            --automap > "$LOGFILE" 2>&1 < /dev/null
+            
+    done < "$CSV_FILE"
+    
+    echo "Alle Sync-Jobs beendet am $(date)" >> "batch_master_${TIMESTAMP}.log"
+}
+
+# ======================================================================
+# Skript-Start: Entkopplung vom Terminal
+# ======================================================================
+echo "🚀 Starte Batch-IMAP-Sync im Hintergrund..."
+
+# Rufe die Funktion auf, leite alle restlichen Ausgaben ins Nichts und schicke sie in den Hintergrund (&)
+run_sync_jobs </dev/null >/dev/null 2>&1 &
+
+echo "✅ Der Job läuft jetzt autark im Hintergrund (sequenziell)."
+echo "Du kannst das SSH-Terminal jetzt bedenkenlos schließen!"
+echo "Überwache den Gesamtfortschritt mit:"
+echo "  tail -f batch_master_*.log"
+echo "Oder die Details eines einzelnen Postfachs mit:"
+echo "  tail -f sync_logs_*/imapsync_<email>.log"

basic_setup/ses_sns_shim_global.py

@@ -53,7 +53,6 @@ def get_queue_url(domain):
             raise
 
 def publish_to_sns(topic_arn, message_body, msg_id):
-    """Versucht SNS Publish. Gibt True bei Erfolg, False bei Topic-Not-Found."""
     attempt = 0
     while attempt < MAX_RETRIES:
         try:
@@ -65,8 +64,9 @@ def publish_to_sns(topic_arn, message_body, msg_id):
             return True
         except ClientError as e:
             error_code = e.response['Error']['Code']
-            if error_code == 'NotFound' or error_code == 'NotFoundException':
+            # Fallback auf SQS bei Topic-nicht-gefunden ODER fehlender Berechtigung
-                logger.info(f"ℹ️ SNS Topic not found for {topic_arn} — falling back to SQS")
+            if error_code in ('NotFound', 'NotFoundException', 'AuthorizationError'):
+                logger.info(f"ℹ️ SNS unavailable for {topic_arn} ({error_code}) — falling back to SQS")
                 return False
             attempt += 1
             logger.warning(f"Retry {attempt}/{MAX_RETRIES} SNS: {error_code}")

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

@@ -26,7 +26,7 @@ import { BlocklistChecker } from '../email/blocklist.js';
 import { BounceHandler } from '../email/bounce-handler.js';
 import { parseEmail, isProcessedByWorker } from '../email/parser.js';
 import { RulesProcessor } from '../email/rules-processor.js';
-
+import { config } from '../config.js';
 // ---------------------------------------------------------------------------
 // Processor
 // ---------------------------------------------------------------------------
@@ -258,34 +258,40 @@ export class MessageProcessor {
 
       if (totalHandled === recipients.length) {
         if (blockedRecipients.length === recipients.length) {
-          // All blocked
+          // All blocked — im Standby kein S3 anfassen
-          try {
+          if (!config.standbyMode) {
-            await this.s3.markAsBlocked(
+            try {
-              domain,
+              await this.s3.markAsBlocked(
-              messageId,
+                domain,
-              blockedRecipients,
+                messageId,
-              fromAddrFinal,
+                blockedRecipients,
-              workerName,
+                fromAddrFinal,
-            );
+                workerName,
-            await this.s3.deleteBlockedEmail(domain, messageId, workerName);
+              );
-          } catch (err: any) {
+              await this.s3.deleteBlockedEmail(domain, messageId, workerName);
-            log(`⚠ Failed to handle blocked email: ${err.message ?? err}`, 'ERROR', workerName);
+            } catch (err: any) {
-            return false;
+              log(`⚠ Failed to handle blocked email: ${err.message ?? err}`, 'ERROR', workerName);
+              return false;
+            }
           }
         } else if (successful.length > 0) {
-          await this.s3.markAsProcessed(
+          if (!config.standbyMode) {
-            domain,
+            await this.s3.markAsProcessed(
-            messageId,
+              domain,
-            workerName,
+              messageId,
-            failedPermanent.length > 0 ? failedPermanent : undefined,
+              workerName,
-          );
+              failedPermanent.length > 0 ? failedPermanent : undefined,
+            );
+          }
         } else if (failedPermanent.length > 0) {
-          await this.s3.markAsAllInvalid(
+          if (!config.standbyMode) {
-            domain,
+            await this.s3.markAsAllInvalid(
-            messageId,
+              domain,
-            failedPermanent,
+              messageId,
-            workerName,
+              failedPermanent,
-          );
+              workerName,
+            );
+          }
         }
 
         // Summary