@serve.zone/dcrouter 17.2.4 → 17.4.0

package/ts/opsserver/handlers/email-ops.handler.ts

@@ -197,14 +197,7 @@ export class EmailOpsHandler {
         authMethod: '',
         authUser: this.extractSessionUser(session),
       },
-      authenticationResults: {
-        spf: 'none',
-        spfDomain: '',
-        dkim: 'none',
-        dkimDomain: '',
-        dmarc: 'none',
-        dmarcPolicy: '',
-      },
+      authenticationResults: this.mapInboundSecurityResults(doc.inboundSecurityResults),
       rejectionReason: doc.status === 'failed' ? doc.lastError : undefined,
       bounceMessage: doc.status === 'failed' ? doc.lastError : undefined,
       headers,
@@ -388,6 +381,46 @@ export class EmailOpsHandler {
   /**
    * Map queue status to catalog TEmailStatus
    */
+  /**
+   * Maps SmartMTA inbound SPF/DKIM/DMARC verdicts (persisted as JSON on the
+   * cached email) into the catalog authenticationResults shape. Falls back to
+   * all-'none' when no verdicts were captured.
+   */
+  private mapInboundSecurityResults(serializedArg?: string): interfaces.requests.IEmailDetail['authenticationResults'] {
+    const noneResult: interfaces.requests.IEmailDetail['authenticationResults'] = {
+      spf: 'none',
+      spfDomain: '',
+      dkim: 'none',
+      dkimDomain: '',
+      dmarc: 'none',
+      dmarcPolicy: '',
+    };
+    if (!serializedArg) return noneResult;
+    try {
+      const parsed = JSON.parse(serializedArg) as {
+        spf?: { result?: string; domain?: string } | null;
+        dkim?: Array<{ is_valid?: boolean; domain?: string | null; status?: string }> | null;
+        dmarc?: { passed?: boolean; policy?: string; domain?: string } | null;
+      };
+      const spfResult = (parsed.spf?.result || '').toLowerCase();
+      const spf = (['pass', 'fail', 'softfail', 'neutral'] as const).find((value) => value === spfResult) || 'none';
+      const dkimSignatures = Array.isArray(parsed.dkim) ? parsed.dkim : [];
+      const validSignature = dkimSignatures.find((signature) => signature?.is_valid);
+      const dkim = validSignature ? 'pass' : dkimSignatures.length > 0 ? 'fail' : 'none';
+      const dmarc = parsed.dmarc ? (parsed.dmarc.passed ? 'pass' : 'fail') : 'none';
+      return {
+        spf,
+        spfDomain: parsed.spf?.domain || '',
+        dkim,
+        dkimDomain: validSignature?.domain || dkimSignatures[0]?.domain || '',
+        dmarc,
+        dmarcPolicy: parsed.dmarc?.policy || '',
+      };
+    } catch {
+      return noneResult;
+    }
+  }
+
   private mapStatus(queueStatus: string): interfaces.requests.TEmailStatus {
     switch (queueStatus) {
       case 'pending':
@@ -395,6 +428,7 @@ export class EmailOpsHandler {
       case 'queued':
         return 'pending';
       case 'delivered':
+      case 'stored':
         return 'delivered';
       case 'failed':
         return 'bounced';