From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 185BD6AB6F for ; Mon, 15 Mar 2021 15:10:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0687522718 for ; Mon, 15 Mar 2021 15:10:39 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C288B22708 for ; Mon, 15 Mar 2021 15:10:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 822D542738 for ; Mon, 15 Mar 2021 15:10:37 +0100 (CET) Date: Mon, 15 Mar 2021 15:10:36 +0100 From: Stoiko Ivanov To: Mira Limbeck Cc: pmg-devel@lists.proxmox.com Message-ID: <20210315151036.69be7ffc@rosa.proxmox.com> In-Reply-To: <20210303150506.10282-1-m.limbeck@proxmox.com> References: <20210303150506.10282-1-m.limbeck@proxmox.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.067 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pmg-devel] [PATCH pmg-log-tracker] close #2106: show outgoing TLS connection in tracking center X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 14:10:39 -0000 Thanks for taking a look at the issue and providing this patch! The general approach seems viable to me (since we simply have no other point of information to go on but the pid)! One issue inline: On Wed, 3 Mar 2021 16:05:06 +0100 Mira Limbeck wrote: > This is a best effort try to add the outgoing TLS connection information > to the output of pmg-log-tracker. The only thing we can match on is the > PID of the 'smtp' process. In the code we asumme that the TLS log entry > always happens before the actual smtp send entry that has a QID. This means > we save the TLS log entry in a map with the PID as key and then, once the > send entry happens, we look it up and add the log entry to the QEntry's > logs. > > Signed-off-by: Mira Limbeck > --- > src/main.rs | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/src/main.rs b/src/main.rs > index 5069252..eaaf00e 100644 > --- a/src/main.rs > +++ b/src/main.rs > @@ -378,6 +378,16 @@ fn handle_qmgr_message(msg: &[u8], parser: &mut Parser, complete_line: &[u8]) { > > // handle log entries for 'lmtp', 'smtp', 'error' and 'local' > fn handle_lmtp_message(msg: &[u8], parser: &mut Parser, complete_line: &[u8]) { > + if msg.starts_with(b"Trusted TLS connection established to") { Not all TLS connections are trusted - e.g. in my test-environment with self-signed certificates: `Mar 15 14:58:45 pmg6 postfix/smtp[17051]: Untrusted TLS connection ...` Adding this match as well - shows the desired behavior in my tracking center (some tests probably need adaptation) > + // the only way to match outgoing TLS connections is by smtp pid > + // this message has to appear before the 'qmgr: : removed' entry in the log > + parser.smtp_tls_log_by_pid.insert( > + parser.current_record_state.pid, > + (complete_line.into(), parser.lines), > + ); > + return; > + } > + > let (qid, data) = match parse_qid(msg, 15) { > Some((q, t)) => (q, t), > None => return, > @@ -393,6 +403,14 @@ fn handle_lmtp_message(msg: &[u8], parser: &mut Parser, complete_line: &[u8]) { > .log > .push((complete_line.into(), parser.lines)); > > + // assume the TLS log entry always appears before as it is the same process > + if let Some(log_line) = parser > + .smtp_tls_log_by_pid > + .remove(&parser.current_record_state.pid) > + { > + qe.borrow_mut().log.push(log_line); > + } > + > let data = &data[2..]; > if !data.starts_with(b"to=<") { > return; > @@ -1668,6 +1686,8 @@ struct Parser { > fentries: HashMap, Rc>>, > qentries: HashMap, Rc>>, > > + smtp_tls_log_by_pid: HashMap, u64)>, > + > current_record_state: RecordState, > rel_line_nr: u64, > > @@ -1705,6 +1725,7 @@ impl Parser { > sentries: HashMap::new(), > fentries: HashMap::new(), > qentries: HashMap::new(), > + smtp_tls_log_by_pid: HashMap::new(), > current_record_state: Default::default(), > rel_line_nr: 0, > current_year: years,