svn commit: r1899762 - /spamassassin/trunk/spamd/spamd.raw

[he...@apache.org]

Author: hege
Date: Tue Apr 12 06:26:37 2022
New Revision: 1899762

URL: http://svn.apache.org/viewvc?rev=1899762&view=rev
Log:
Log SSL version/cipher

Modified:
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1899762&r1=1899761&r2=1899762&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Tue Apr 12 06:26:37 2022
@@ -1626,9 +1626,27 @@ sub accept_a_conn {
       peer_info_from_socket($client);
     $remote_hostaddr or die 'failed to obtain port and ip from socket';
 
-    my $msg = sprintf("connection from %s [%s]:%s to port %d, fd %d",
+    my $ssl_info = '';
+    if ($client->isa('IO::Socket::SSL')) {
+      $ssl_info = ', ';
+      my $ssl_version = $client->get_sslversion();
+      if (defined $ssl_version) {
+        $ssl_info .= $ssl_version.'/';
+      } else {
+        $ssl_version = $client->get_sslversion_int();
+        if    ($ssl_version == 0x0304) { $ssl_info .= 'TLSv1.3/'; }
+        elsif ($ssl_version == 0x0303) { $ssl_info .= 'TLSv1.2/'; }
+        elsif ($ssl_version == 0x0302) { $ssl_info .= 'TLSv1.1/'; }
+        elsif ($ssl_version == 0x0301) { $ssl_info .= 'TLSv1.0/'; }
+        elsif ($ssl_version == 0x0300) { $ssl_info .= 'SSLv3/'; }
+        elsif ($ssl_version == 0x0002) { $ssl_info .= 'SSLv2/'; }
+      }
+      $ssl_info .= $client->get_cipher();
+    }
+
+    my $msg = sprintf("connection from %s [%s]:%s to port %d, fd %d%s",
                       $remote_hostname, $remote_hostaddr, $remote_port,
-                      $local_port, $socket_info->{fd});
+                      $local_port, $socket_info->{fd}, $ssl_info);
     if (ip_is_allowed($remote_hostaddr)) {
       info("spamd: $msg");
     }