Better handling of mail addressed to an alias

management/reporting/capture/db/SqliteEventStore.py

@@ -54,6 +54,7 @@ mta_delivery_fields = [
 	'service',
 #	'service_tid',
 	'rcpt_to',
+	'orig_to',
 #	'postgrey_tid',
 	'postgrey_result',
 	'postgrey_reason',
@@ -155,7 +156,14 @@ schema_updates = [
 		)",
 
 		"INSERT INTO db_info (key,value) VALUES ('schema_version', '0')"
+	],
+
+	# update 1
+	[
+		"ALTER TABLE mta_delivery ADD COLUMN orig_to TEXT COLLATE NOCASE",
+		"UPDATE db_info SET value='1' WHERE key='schema_version'"
 	]
+
 ]
 
 

management/reporting/capture/mail/InboundMailLogHandler.py

@@ -1184,6 +1184,8 @@ class InboundMailLogHandler(ReadLineHandler):
         # 12a. postfix/lmtp: POSTFIX_MSG-ID: to=user@tld, status=bounced (host...said...550 5.1.1 <user@tld> User doesn't exist ....)
         # 12b. postfix/smtp[32052]: A493B1FAF1: to=<alice@post.com>, relay=mx.post.com[1.2.3.4]:25, delay=1.2, delays=0.65/0.06/0.4/0.09, dsn=2.0.0, status=sent (250 2.0.0 OK 7E/38-26906-CDC5DCF5): None
         # 12c. postfix/smtp[21816]: BD1D31FB12: host mx2.comcast.net[2001:558:fe21:2a::6] refused to talk to me: 554 resimta-ch2-18v.sys.comcast.net resimta-ch2-18v.sys.comcast.net 2600:3c02::f03c:92ff:febb:192f found on one or more DNSBLs, see http://postmaster.comcast.net/smtp-error-codes.php#BL000001
+        # 12d. postfix/lmtp[26439]: B306D1F77F: to=<user@local.com>, orig_to=<alias@local.com>, relay=127.0.0.1[127.0.0.1]:10025, delay=1.7, delays=0.53/0.01/0/1.1, dsn=2.0.0, status=sent (250 2.0.0 <user@local.com> 4BYfOjho/19oZQAAlWWVsw Saved)
+
         #    1=system ("lmtp" or "smtp")
         #    2=system_tid
         #    3=postfix_msg_id
@@ -1214,17 +1216,34 @@ class InboundMailLogHandler(ReadLineHandler):
                 return { 'mta_conn': mta_conn, 'mta_accept': mta_accept }
 
             
-            # 12, 12a, 12b
+            # 12, 12a, 12b, 12d
             detail = PostfixLogParser.SplitList(line[m.end():]).asDict()
             if 'to' not in detail:
                 return True
-            
+
             mta_delivery = self.find_delivery(
                 mta_accept,
                 detail['to']['value'],
                 service_tid=service_tid,
                 auto_add=True
             )
+            
+            if 'orig_to' in detail:
+                # sent to an alias, then delivered to a user
+                # 'to' is the final user, 'orig_to' is the alias
+                mta_delivery['orig_to'] = detail['orig_to']['value']
+                mta_delivery_2 = self.find_delivery(
+                    mta_accept,
+                    detail['orig_to']['value'],
+                    service_tid=service_tid,
+                    auto_add=False
+                )
+                if mta_delivery_2:
+                    # combine first record into second, then remove the first
+                    mta_delivery_2.update(mta_delivery)
+                    mta_accept['mta_delivery'].remove(mta_delivery)
+                    mta_delivery = mta_delivery_2
+                
             mta_delivery['service'] = service
             mta_delivery['service_tid'] = service_tid
             log.debug('DELIVERY(accept): %s', mta_accept)

management/reporting/ui/panel-user-activity.html

@@ -61,6 +61,7 @@
         </template>
         <template #row-details="row">
           <b-card>
+            <div><strong>Sent to alias</strong>: {{ row.item.orig_to }}</div>
             <div><strong>Connection disposition</strong>: {{ disposition_formatter(row.item.disposition) }}</div>
             <div v-if="row.item.dkim_reason"><strong>Dkim reason</strong>: {{row.item.dkim_reason}}</div>
             <div v-if="row.item.dmarc_reason"><strong>Dmarc reason</strong>: {{row.item.dmarc_reason}}</div>

management/reporting/ui/panel-user-activity.js

@@ -128,8 +128,8 @@ Vue.component('panel-user-activity', function(resolve, reject) {
                     'dmarc_reason',
                     'postgrey_reason',
                     'postgrey_delay',
-                    'spam_score'
+                    'spam_score',
-                    
+                    'orig_to'
                 ]);
                 // combine fields 'envelope_from' and 'sasl_username'
                 var f = this.received_mail.combine_fields(
@@ -140,7 +140,7 @@ Vue.component('panel-user-activity', function(resolve, reject) {
                             return v;
                         return `${v} (${item.sasl_username})`;
                     });
-                f.label = 'Evelope From (user)';
+                f.label = 'Envelope From (user)';
             },
 
             get_row_limit: function() {

management/reporting/uidata/user_activity.2.sql

@@ -7,7 +7,7 @@ connect_time, mta_connection.service AS service, sasl_username, disposition,
 -- mta_accept
 envelope_from, spf_result, dkim_result, dkim_reason, dmarc_result, dmarc_reason,
 -- mta_delivery
-postgrey_result, postgrey_reason, postgrey_delay, spam_score, spam_result, message_size
+postgrey_result, postgrey_reason, postgrey_delay, spam_score, spam_result, message_size, orig_to
 FROM mta_accept
 JOIN mta_connection ON mta_accept.mta_conn_id = mta_connection.mta_conn_id
 JOIN mta_delivery ON mta_accept.mta_accept_id = mta_delivery.mta_accept_id

management/reporting/uidata/user_activity.py

@@ -121,6 +121,7 @@ def user_activity(conn, args):
             'dmarc_reason',
             
             # mta_delivery
+            'orig_to',
             'postgrey_result',
             'postgrey_reason',
             'postgrey_delay',
@@ -139,6 +140,7 @@ def user_activity(conn, args):
             'text/plain',    # dkim_result
             'text/plain',    # dmarc_result
             'text/plain',    # dmarc_result
+            'text/email',    # orig_to
             'text/plain',    # postgrey_result
             'text/plain',    # postgrey_reason
             { 'type':'time/span', 'unit':'s' },   # postgrey_delay