chore(release): 2.1.2

This makes DNS timeouts occur much more quickly and avoid clients with nonfunctional reverse DNS timing out while waiting for a response to their EHLO requests.

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 This file contains all the latest changes and updates to Postal.
 
+## 2.1.2
+
+### Features
+
+- support for AMQPS for rabbitmq connections ([9f0697](https://github.com/postalserver/postal/commit/9f0697f194209f5fae5e451ba8fb888413fe37fa))
+
+### Bug Fixes
+
+- retry connections without SSL when SSL issue is encountered during smtp sending ([0dc682](https://github.com/postalserver/postal/commit/0dc6824a8f0315ea42b08f7e6812b821b62489c9))
+
 ## 2.1.1
 
 ### Features

config/postal.defaults.yml

@@ -50,6 +50,10 @@ message_db:
 rabbitmq:
   host: 127.0.0.1
   port: 5672
+  tls: false
+  verify_peer: true
+  tls_ca_certificates:
+    - /etc/ssl/certs/ca-certificates.crt
   username: postal
   password:
   vhost: /postal

lib/postal/rabbit_mq.rb

@@ -16,6 +16,9 @@ module Postal
       conn = Bunny.new(
         :hosts => bunny_host,
         :port => Postal.config.rabbitmq&.port || 5672,
+        :tls => Postal.config.rabbitmq&.tls || false,
+        :verify_peer => Postal.config.rabbitmq&.verify_peer || true,
+        :tls_ca_certificates => Postal.config.rabbitmq&.tls_ca_certificates || [ "/etc/ssl/certs/ca-certificates.crt" ],
         :username => Postal.config.rabbitmq&.username || 'guest',
         :password => Postal.config.rabbitmq&.password || 'guest',
         :vhost => Postal.config.rabbitmq&.vhost || nil

lib/postal/smtp_sender.rb

@@ -46,13 +46,16 @@ module Postal
               end
               next
             end
+
             smtp_client = Net::SMTP.new(hostname, port)
             smtp_client.open_timeout = Postal.config.smtp_client.open_timeout
             smtp_client.read_timeout = Postal.config.smtp_client.read_timeout
+
             if @source_ip_address
               # Set the source IP as appropriate
               smtp_client.source_address = ip_type == :aaaa ? @source_ip_address.ipv6 : @source_ip_address.ipv4
             end
+
             case ssl_mode
             when 'Auto'
               smtp_client.enable_starttls_auto(self.class.ssl_context_without_verify)
@@ -63,9 +66,17 @@ module Postal
             else
               # Nothing
             end
+
             smtp_client.start(@source_ip_address ? @source_ip_address.hostname : self.class.default_helo_hostname)
             log "Connected to #{@remote_ip}:#{port} (#{hostname})"
+
           rescue => e
+            if e.is_a?(OpenSSL::SSL::SSLError) && ssl_mode == 'Auto'
+              log "SSL error (#{e.message}), retrying without SSL"
+              ssl_mode = nil
+              retry
+            end
+
             log "Cannot connect to #{@remote_ip}:#{port} (#{hostname}) (#{e.class}: #{e.message})"
             @connection_errors << e.message unless @connection_errors.include?(e.message)
             smtp_client.disconnect rescue nil

lib/postal/smtp_server/client.rb

@@ -105,7 +105,10 @@ module Postal
       private
 
       def resolve_hostname
-        @hostname = Resolv.new.getname(@ip_address) rescue @ip_address
+        Resolv::DNS.open do |dns|
+          dns.timeouts = [10,5]
+          @hostname = dns.getname(@ip_address) rescue @ip_address
+        end
       end
 
       def proxy(data)