[pmg-devel] [PATCH pmg-log-tracker] close #2106: show outgoing TLS connection in tracking center

[pmg-devel] [PATCH pmg-log-tracker] close #2106: show outgoing TLS connection in tracking center

[Mira Limbeck]

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 <m.limbeck@proxmox.com>
---
 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") {
+        // the only way to match outgoing TLS connections is by smtp pid
+        // this message has to appear before the 'qmgr: <QID>: 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<Box<[u8]>, Rc<RefCell<FEntry>>>,
     qentries: HashMap<Box<[u8]>, Rc<RefCell<QEntry>>>,
 
+    smtp_tls_log_by_pid: HashMap<u64, (Box<[u8]>, 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,
-- 
2.20.1

Re: [pmg-devel] [PATCH pmg-log-tracker] close #2106: show outgoing TLS connection in tracking center

[Stoiko Ivanov]

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 <m.limbeck@proxmox.com> 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 <m.limbeck@proxmox.com>
> ---
>  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: <QID>: 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<Box<[u8]>, Rc<RefCell<FEntry>>>,
>      qentries: HashMap<Box<[u8]>, Rc<RefCell<QEntry>>>,
>  
> +    smtp_tls_log_by_pid: HashMap<u64, (Box<[u8]>, 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,