rubymta 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1601cb4b77cb390064b8a90aaec523a6bdf3c993
-  data.tar.gz: 764b1ccf31bfbb1b3386f9ec42a61510ee5a7edc
+  metadata.gz: 5365c89f03c443c663b6910c77d8766e007428dc
+  data.tar.gz: e15eb994bef497cde1e7035e729ba50e5109edf2
 SHA512:
-  metadata.gz: eda93abc4e139bec74e5ef868ff3ed2449832557c24948856158a51ad170ec0e0dde2e88feb81dadad1b6e71d160646ed09501d118bebbe14e018556255cb88f
-  data.tar.gz: f1c860ab3f0e7b44da1bc34109e6a2583a641521a30a64eed331894168ca05f42a831e6c0d652d6f0d16a445a88401d1b1eb27bf6a137b89a1605c0dabdfbb73
+  metadata.gz: 783ffeac1b863c66e6d81aa96f314aca7954029a7d6f1bc3aaf96c8aefd3edeb8c4332812efdcaabe913d9285577e96e6824a0eff565310831432ff57aa094da
+  data.tar.gz: a83ca9f014ae626de9f52faba9f9fc622a1664889ceadbb4855a70f1c12709d14717a90ae9cafec6e7c5901deaa24e5460a9c8807b0b4440936b6916d1799e76

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.0.11
+
+* Changed the STARTTLS to return a 500 error and continue processing. Before this change, it just erred out and closed the port with no feedback to the client. Because this error returns a 500 level error, the client is (ideally) expected to quit or restart the attempt from the beginning (at EHLO).
+* if `e` is in a string like so: `"... #{e} ..."`, it doesn't require a `.to_s` because `#{}` does a `.to_s`. Changed all non-conforming strings to conform to this rule. Exception: where `e` is found in `rescue => e`, it takes the form `"... #{e.inspect} ..."` so that the actual error class will be displayed (so you'll know what specific rescue may be added).
+* moved the initialization code for $ctx out of the `listening_thread` because it only needs to be set once, not for each port.
+
+
 # v0.0.10
 
 #### Warning: This version changes the queue file format. Previous queue files will *not* be compatible with this version.

data/lib/rubymta/extended_classes.rb

@@ -145,9 +145,9 @@ class String
       end
       return "250 #{welcome.chomp[4..-1]}"
     rescue SocketError => e
-      return "421 Service not available (#{e.to_s})"
+      return "421 Service not available (#{e})"
     rescue Timeout::Error => e
-      return "421 Service not available (#{e.to_s})"
+      return "421 Service not available (#{e})"
     end
   end
 

data/lib/rubymta/item_of_mail.rb

@@ -76,7 +76,7 @@ class ItemOfMail < Hash
       end
       return true
     rescue => e
-      LOG.error(self[:mail_id]) {e.to_s}
+      LOG.error(self[:mail_id]) {e.inspect}
       e.backtrace.each { |line| LOG.error(self[:mail_id]) {line} }
       return false
     end
@@ -101,7 +101,7 @@ class ItemOfMail < Hash
       end
       self[:saved] = true
     rescue => e
-      LOG.error(self[:mail_id]) {e.to_s}
+      LOG.error(self[:mail_id]) {e.inspect}
       e.backtrace.each { |line| LOG.error(self[:mail_id]) {line} }
       return false
     end
@@ -135,7 +135,7 @@ class ItemOfMail < Hash
       item = ItemOfMail::new(mail)
       item[:data][:text] = b
     rescue => e
-      LOG.error(mail_id) {e.to_s}
+      LOG.error(mail_id) {e.inspect}
       e.backtrace.each { |line| LOG.error(mail_id) {line} }
     end
     return item

data/lib/rubymta/receiver.rb

@@ -60,10 +60,10 @@ class Receiver
         return text[0]
       end
     rescue Errno::EPIPE => e
-      LOG.error(@mail[:mail_id]) {"#{e.to_s}#{Unexpectedly}"}
+      LOG.error(@mail[:mail_id]) {"#{e}#{Unexpectedly}"}
       raise Quit
     rescue Errno::EIO => e
-      LOG.error(@mail[:mail_id]) {"#{e.to_s}#{Unexpectedly}"}
+      LOG.error(@mail[:mail_id]) {"#{e}#{Unexpectedly}"}
       raise Quit
     end
   end
@@ -97,7 +97,7 @@ class Receiver
         return text
       end
     rescue Errno::EIO => e
-      LOG.error(@mail[:mail_id]) {"#{e.to_s}#{Unexpectedly}"}
+      LOG.error(@mail[:mail_id]) {"#{e}#{Unexpectedly}"}
       raise Quit
     rescue Timeout::Error => e
       LOG.info(@mail[:mail_id]) {" -> <eod>"} if LogReceiverConversation
@@ -235,13 +235,10 @@ class Receiver
           @contact.violation
           send_text(response)
         end
-      rescue =>e #OpenSSL::SSL::SSLError => e
-        LOG.error(@mail[:mail_id]) {"SSL error: #{e.to_s}"}
-        e.backtrace.each { |line| LOG.error(@mail[:mail_id]) {line} }
-        @done = true
       end until @done
+
     rescue => e
-      LOG.fatal(@mail[:mail_id]) {e.to_s}
+      LOG.fatal(@mail[:mail_id]) {e.inspect}
       exit(1)
     end
 
@@ -272,7 +269,7 @@ class Receiver
     if ok
       pid = Process::spawn("#{$app[:path]}/run_queue.rb")
       Process::detach(pid)
-      LOG.info(@mail[:mail_id]) {"Spawned run_queue.rb, pwd=#{`pwd`}, path=>#{$app[:path]}, pid=>#{pid.inspect}"}
+      LOG.info(@mail[:mail_id]) {"Spawned run_queue.rb, pwd=#{`pwd`.chomp}, path=>#{$app[:path]}, pid=>#{pid.inspect}"}
     end
   end
 
@@ -622,14 +619,16 @@ class Receiver
   def starttls(value)
     send_text("220 2.0.0 TLS go ahead")
     LOG.info(@mail[:mail_id]) {"<-> (handshake)"} if LogReceiverConversation
+    conn = @connection.clone # save the unencrypted connection in case of error
     begin
       @connection.accept
-      @encrypted = true
-      @mail[:encrypted] = true
-    rescue => e
-      LOG.error(@mail[:mail_id]) {e.inspect}
+      @mail[:encrypted] = @encrypted = true
     rescue OpenSSL::SSL::SSLError => e
-      LOG.error(@mail[:mail_id]) {e.to_s}
+      # STARTTLS failed: restore the unencrypted connection
+      LOG.error(@mail[:mail_id]) {"Error during STARTTLS: #{e}"}
+      @connection = conn # restore original
+      @mail[:encrypted] = @encrypted = false
+      return "500 5.0.0 STARTTLS failed: #{e}"
     end
     return nil
   end

data/lib/rubymta/server.rb

@@ -148,11 +148,6 @@ class Server
   # argument passed to it -- it can be '<ipv6>/<port>', '<ipv4>:<port>', or just '<port>'
   def listening_thread(local_port)
     LOG.info("%06d"%Process::pid) {"listening on port #{local_port}..."}
-
-    # establish an SSL context
-    $ctx = OpenSSL::SSL::SSLContext.new
-    $ctx.key = $prv
-    $ctx.cert = $crt
     
     # check the parameter to see if it's valid
     m = /^(([0-9a-fA-F]{0,4}:{0,1}){1,8})\/([0-9]{1,5})|(([0-9]{1,3}\.{0,1}){4}):([0-9]{1,5})|([0-9]{1,5})$/.match(local_port)
@@ -242,6 +237,11 @@ class Server
     $prv = if PrivateKey then OpenSSL::PKey::RSA.new File.read(PrivateKey) else nil end
     $crt = if Certificate then OpenSSL::X509::Certificate.new File.read(Certificate) else nil end
 
+    # establish an SSL context for use in `listening_thread`
+    $ctx = OpenSSL::SSL::SSLContext.new
+    $ctx.key = $prv
+    $ctx.cert = $crt
+
     # daemonize it if the option was set--it doesn't have to be root to daemonize it
     Process::daemon if @options.daemonize
 

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.10"
-  MODIFIED = "2017-10-18"
+  VERSION = "0.0.11"
+  MODIFIED = "2017-10-21"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymta
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Michael J. Welch, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies: []
 description: RubyMta is an experimental mail transport agent written in Ruby. See
   the README.