From 2ec25b75c1aa5bc73eadb29513986c32b498e8f9 Mon Sep 17 00:00:00 2001 From: downtownallday Date: Sat, 10 Apr 2021 09:29:29 -0400 Subject: [PATCH 1/4] Switch to ES6 modules --- management/reporting/ui/capture-db-stats.js | 9 ++++-- .../ui/chart-multi-line-timeseries.js | 8 +++-- management/reporting/ui/chart-pie.js | 7 +++-- .../ui/chart-stacked-bar-timeseries.js | 5 ++- management/reporting/ui/chart-table.js | 2 +- management/reporting/ui/charting.js | 20 ++++++------ management/reporting/ui/date-range-picker.js | 5 ++- management/reporting/ui/index.html | 28 ++--------------- management/reporting/ui/index.js | 31 +++++++++++-------- management/reporting/ui/page-reports-main.js | 31 ++++++++++++++----- management/reporting/ui/page-settings.js | 13 ++++++-- .../reporting/ui/panel-flagged-connections.js | 19 +++++++++--- .../reporting/ui/panel-messages-received.js | 14 ++++++--- .../reporting/ui/panel-messages-sent.js | 18 ++++++++--- .../ui/panel-remote-sender-activity.js | 6 +++- .../reporting/ui/panel-user-activity.js | 9 ++++-- .../reporting/ui/reports-page-header.js | 6 ++-- management/reporting/ui/settings.js | 7 +++-- management/reporting/ui/wbr-text.js | 2 +- management/ui-common/authentication.js | 7 +++-- management/ui-common/exceptions.js | 6 ++-- management/ui-common/page-header.js | 6 ++-- management/ui-common/page-layout.js | 2 +- 23 files changed, 159 insertions(+), 102 deletions(-) diff --git a/management/reporting/ui/capture-db-stats.js b/management/reporting/ui/capture-db-stats.js index b828dc5d..59d5a049 100644 --- a/management/reporting/ui/capture-db-stats.js +++ b/management/reporting/ui/capture-db-stats.js @@ -1,9 +1,14 @@ +import { BvTable, ConnectionDisposition, DateFormatter } from "./charting.js"; +import { spinner } from "../../ui-common/page-header.js"; - -Vue.component('capture-db-stats', { +export default Vue.component('capture-db-stats', { props: { }, + components: { + spinner, + }, + template:'
'+ ' diff --git a/management/reporting/ui/panel-user-activity.js b/management/reporting/ui/panel-user-activity.js index 386f0311..53ef6e54 100644 --- a/management/reporting/ui/panel-user-activity.js +++ b/management/reporting/ui/panel-user-activity.js @@ -3,6 +3,7 @@ */ import wbr_text from "./wbr-text.js"; +import message_headers_view from "./message_headers_view.js"; import UserSettings from "./settings.js"; import { MailBvTable, ConnectionDisposition } from "./charting.js"; @@ -18,6 +19,7 @@ export default Vue.component('panel-user-activity', function(resolve, reject) { components: { 'wbr-text': wbr_text, + 'message-headers-view': message_headers_view }, data: function() { @@ -35,6 +37,7 @@ export default Vue.component('panel-user-activity', function(resolve, reject) { sent_mail: null, received_mail: null, imap_details: null, + lmtp_id: null, /* for message headers modal */ all_users: [], disposition_formatter: ConnectionDisposition.formatter, }; @@ -150,7 +153,9 @@ export default Vue.component('panel-user-activity', function(resolve, reject) { 'postgrey_reason', 'postgrey_delay', 'spam_score', - 'orig_to' + 'orig_to', + 'message_id', + 'lmtp_id', ]); // combine fields 'envelope_from' and 'sasl_username' var f = this.received_mail.combine_fields( @@ -291,6 +296,15 @@ export default Vue.component('panel-user-activity', function(resolve, reject) { row_clicked: function(item, index, event) { item._showDetails = ! item._showDetails; }, + + show_message_headers: function(lmtp_id) { + // set the lmtp_id that component message-headers-view + // searches for + this.lmtp_id = lmtp_id; + + // show the modal dialog + this.$refs.message_headers_modal.show(); + } } diff --git a/management/reporting/uidata/user_activity.2.sql b/management/reporting/uidata/user_activity.2.sql index 45614707..3f1f3004 100644 --- a/management/reporting/uidata/user_activity.2.sql +++ b/management/reporting/uidata/user_activity.2.sql @@ -7,9 +7,9 @@ connect_time, mta_connection.service AS service, sasl_username, disposition, remote_host, remote_ip, -- mta_accept envelope_from, spf_result, dkim_result, dkim_reason, dmarc_result, dmarc_reason, -failure_info, +message_id, failure_info, -- mta_delivery -postgrey_result, postgrey_reason, postgrey_delay, spam_score, spam_result, message_size, orig_to +postgrey_result, postgrey_reason, postgrey_delay, spam_score, spam_result, message_size, orig_to, delivery_info 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 diff --git a/management/reporting/uidata/user_activity.py b/management/reporting/uidata/user_activity.py index ed135ba1..31221466 100644 --- a/management/reporting/uidata/user_activity.py +++ b/management/reporting/uidata/user_activity.py @@ -124,6 +124,7 @@ def user_activity(conn, args): 'dkim_reason', 'dmarc_result', 'dmarc_reason', + 'message_id', 'failure_info', # mta_delivery @@ -134,6 +135,7 @@ def user_activity(conn, args): 'spam_score', 'spam_result', 'message_size', + 'lmtp_id', ], 'field_types': [ { 'type':'datetime', 'format': '%Y-%m-%d %H:%M:%S' },# connect_time @@ -148,6 +150,7 @@ def user_activity(conn, args): 'text/plain', # dkim_result 'text/plain', # dmarc_result 'text/plain', # dmarc_reason + 'text/plain', # message_id 'text/plain', # failure_info 'text/email', # orig_to 'text/plain', # postgrey_result @@ -156,6 +159,7 @@ def user_activity(conn, args): { 'type':'decimal', 'places':2 }, # spam_score 'text/plain', # spam_result 'number/size', # message_size + 'text/plain', # lmtp_id ], 'items': [] } @@ -167,7 +171,31 @@ def user_activity(conn, args): }): v = [] for key in received_mail['fields']: - v.append(row[key]) + if key == 'lmtp_id': + # Extract the LMTP ID from delivery info, which looks + # like: + # + # "250 2.0.0 oPHmBDvTaWA7UwAAlWWVsw + # Saved" + # + # When we know the LMTP ID, we can get the message + # headers using doveadm, like this: + # + # "/usr/bin/doveadm fetch -u "user@domain.tld" hdr + # HEADER received "LMTP id oPHmBDvTaWA7UwAAlWWVsw" + # + delivery_info = row['delivery_info'] + valid = False + if delivery_info: + parts = delivery_info.split(' ') + if parts[0]=='250' and parts[1]=='2.0.0': + v.append(parts[-2]) + valid = True + if not valid: + v.append(None) + + else: + v.append(row[key]) received_mail['items'].append(v) From 26609c422358b96ccf96eabc7c211c6ae687f663 Mon Sep 17 00:00:00 2001 From: downtownallday Date: Sat, 10 Apr 2021 16:49:46 -0400 Subject: [PATCH 4/4] Fix cell alignment --- management/reporting/ui/chart-table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/reporting/ui/chart-table.js b/management/reporting/ui/chart-table.js index 00aa0366..176427c5 100644 --- a/management/reporting/ui/chart-table.js +++ b/management/reporting/ui/chart-table.js @@ -38,7 +38,7 @@ export default Vue.component('chart-table', { if (this.items.length == 0) { return [{ key: 'no data', - thClass: 'text-nowrap' + thClass: 'text-nowrap align-top' }]; } return this.fields;