rubymta 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a72d1a4230d77bdb5c749ec57da73a347f90b1d8
-  data.tar.gz: a489c579a7e349dd2ef556ac0d431cfaded35d61
+  metadata.gz: 0b111a36b3145f824bf81193bb2814bea8ec8e96
+  data.tar.gz: 981638f013c0d26b0cc09316041cfdc4e35c3334
 SHA512:
-  metadata.gz: 74fa503dd6aa4e0ac0fd4a8b35f1e3defa8a89400d2763e5f561690890c3d9b3f1d0e7495072e8c99b375f4114e2b580bff4cd047c8cf405e3d2fe3bff333000
-  data.tar.gz: d402fb86f2d46cdc3b8013ea40909c8ea0ccacd0e731e46388d45579d55d649e470687455b3f5379f009d79b9e7bee379f8cd1a55f819016c40f9d671919ddb2
+  metadata.gz: 11b8812e113d116da43c3778f72b655ac0e731fdcb98d147c6e3d352524d61dadb480447594748bec0bb38ba59733f2803941e3224abdf142bf295d6c3d12209
+  data.tar.gz: f19e0dff3bc40cf2ccc26d92a4588a7057abcffb167bd4820ee9276e67c551b8be2f65558281431314c4c4456a572bfbe661c01629cdd73ba1622c1220eff071

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.0.15
+
+* Added a rescue for `Server::listening_thread`, at `getnameinfo` to catch errors where the IP address doesn't point to any DNS records. This error is ignored and `hostname` is set to `(none)`. No harm is done because the `hostname` is only used for log messages.
+* Fixed 3 small errors in `queue_runner`.
+* Changed the `Receiver.receive code to convert incomming text to UTF-8 rather than just test for it. A surprising number of emails will contain invalid codeset characters.
+
+
+# v0.0.14
+
+* Took away the check for valid_encoding?, and added a call to convert any characters that are illegal in UTF-8 to '?' as the mail is being stored. This allows email from legacy email generators (that sometimes add strange characters) to still pass when they have illegal characters. It may break some DKIM checks, but that's unavoidable.
+
+
 # v0.0.13
 
 * Removed code (by commenting it out) that saves partially received emails. I originally added it to help see what *exactly* spammers were sending that caused program faults. In my opinion, it's no longer needed.

data/lib/rubymta/item_of_mail.rb

@@ -111,6 +111,9 @@ class ItemOfMail < Hash
   end
 
   def self::retrieve_mail_from_queue_folder(mail_id)
+    m = mail_id.match(/^[0-9A-Za-z]{6}.[0-9A-Za-z]{6}.[0-9A-Za-z]{2}$/)
+    raise ArgumentError.new("*666* #{mail_id.inspect} is invalid") if m.nil?
+
     item = nil
     begin
       # Make sure the file that matches the parcel record exists
@@ -124,6 +127,10 @@ class ItemOfMail < Hash
       end
 
       tmp = nil; File::open("#{MailQueue}/#{mail_id}","r") { |f| tmp = f.read }
+      if tmp.nil?
+        LOG.error(mail_id) {"Failed to read data in 'ItemOfMail::retrieve_mail_from_queue_folder'"}
+      end
+
       data = tmp.split("\n")
 
       # get the number of lines in the hash, and cut that out first
@@ -132,7 +139,16 @@ class ItemOfMail < Hash
       b = data[n+1..-1]
 
       # convert the hash
+begin
       mail = eval(a.join("\n"))
+rescue => e
+  LOG.error(mail_id) {"--> X800X file=>'#{MailQueue}/#{mail_id}'"}
+  LOG.error(mail_id) {"--> X800X tmp.size=>#{tmp.size}, tmp.class=>#{tmp.class.name}"}
+  LOG.error(mail_id) {"--> X800X data.size=>#{data.size}, data.class=>#{data.class.name}"}
+  LOG.error(mail_id) {"--> X800X e=>#{e.inspect}"}
+  LOG.error(mail_id) {"--> X800X a=>#{a.inspect}"}
+  return nil
+end
 
       # create the ItemOfMail structure and insert the text
       item = ItemOfMail::new(mail)

data/lib/rubymta/queue_runner.rb

@@ -213,7 +213,7 @@ class QueueRunner
 #  ~> To: Jones@xyz.com
 #  ~> From: John Q. Public <JQP@bar.com>
 #  ~> Subject: test Thu, 24 Nov 2016 12:22:39 -0800
-#  ~> 
+#  ~>
 #  ~> Bill:
 #  ~>  The next meeting of the board of directors will be
 #  ~>  on Tuesday.
@@ -276,7 +276,7 @@ class QueueRunner
     ok, lines = recv_text
     return mark_parcels(parcels, lines) if ok!='3'
 
-    LOG.info(@mail_id) {"<-  (data)"} if LogQueueRunnerConversation
+    LOG.info(@mail_id) {"<-  (data)"} if !LogQueueRunnerConversation
     mail[:data][:text].each do |line|
       send_text(line, :data)
     end
@@ -286,8 +286,8 @@ class QueueRunner
 
     # get one final message for all parcels (recipients)
     ok, lines = recv_text
+    ret = mark_parcels(parcels, lines)
     if ok=='2'
-      ret = mark_parcels(parcels, lines)
       LOG.info(@mail_id) {"Mail for #{parcels[0][:to_url]}, et.al. delivered remotely"}
     else
       LOG.info(@mail_id) {"Mail for #{parcels[0][:to_url]}, et.al. failed delivery remotely, #{lines.last}"}
@@ -315,7 +315,7 @@ class QueueRunner
 #  ~> To: Jones@xyz.com
 #  ~> From: John Q. Public <JQP@bar.com>
 #  ~> Subject: test Thu, 24 Nov 2016 12:22:39 -0800
-#  ~> 
+#  ~>
 #  ~> Bill:
 #  ~>  The next meeting of the board of directors will be
 #  ~>  on Tuesday.
@@ -374,8 +374,8 @@ class QueueRunner
     parcels.each do |parcel|
       # get the response from DoveCot
       ok, lines = recv_text
+      ret = mark_parcels([parcel], lines)
       if ok=='2'
-        ret = mark_parcels([parcel], lines)
         LOG.info(@mail_id) {"Mail for #{parcel[:to_url]} delivered locally"}
       else
         LOG.info(@mail_id) {"Mail for #{parcel[:to_url]} failed delivery locally, #{lines.last}"}

data/lib/rubymta/receiver.rb

@@ -80,12 +80,8 @@ class Receiver
           when temp.nil?
             LOG.warn(@mail[:mail_id]) {"The client abruptly closed the connection"}
             text = nil
-#          when !temp.valid_encoding?
-#            LOG.warn(@mail[:mail_id]) {"The client sent non-UTF-8 text"}
-#            send_text("500 5.5.1 non-UTF-8 text detected")
-#            raise Quit
           else
-            text = temp.chomp
+            text = temp.chomp.utf8
           end
         rescue Errno::ECONNRESET => e
           LOG.warn(@mail[:mail_id]) {"The client slammed the connection shut"}
@@ -246,22 +242,6 @@ class Receiver
     (LOG.info(@mail[:mail_id]) { "Received Mail:\n#{@mail.pretty_inspect}" }) if DumpMailIntoLog
 
   ensure
-=begin # this is debugging logic
-    # make sure the incoming email is saved, in case there was a receive error;
-    # otherwise, it gets saved just before the "250 OK" in the DATA section
-    if @mail && !@mail[:saved]
-      LOG.error(@mail[:mail_id]) {"#{@mail[:mail_id]} was not received completely. Saving the partial copy to queue."}
-
-      # the email is faulty--save for reference
-      case
-      when !@mail.insert_parcels
-        LOG.error(@mail[:mail_id]) {"#{ServerName} error: unable to save packet id=#{@mail[:mail_id]}"}
-      when !@mail.save_mail_into_queue_folder
-        LOG.error(@mail[:mail_id]) {"#{ServerName} error: unable to save queue id=#{@mail[:mail_id]}"}
-      end
-    end
-=end
-
     # run the mail queue queue runner now, if it's not running already
     ok = nil
     File.open(LockFilePath,"w") do |f|
@@ -449,11 +429,6 @@ class Receiver
         break
       end
       break if text=="."
-#      if !text.valid_encoding?
-#        LOG.warn(@mail[:mail_id]) {"The client sent non-UTF-8 data"}
-#        send_text("500 5.5.1 non-UTF-8 data detected")
-#        raise Quit
-#      end
       lines << text
     end
 

data/lib/rubymta/server.rb

@@ -177,7 +177,12 @@ class Server
       Process::fork do
         begin
           drop_root_privileges if !UserName.nil?
-          remote_hostname, remote_service = connection.io.remote_address.getnameinfo
+          begin
+            remote_hostname, remote_service = connection.io.remote_address.getnameinfo
+          rescue SocketError => e
+            LOG.info("%06d"%Process::pid) { e.to_s }
+            remote_hostname, remote_service = "(none)", nil
+          end
           remote_ip, remote_port = connection.io.remote_address.ip_unpack
           process_call(connection, local_port, remote_port.to_s, remote_ip, remote_hostname, remote_service)
           LOG.info("%06d"%Process::pid) {"Connection closed on port #{local_port} by #{ServerName}"}

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.14"
-  MODIFIED = "2017-11-01"
+  VERSION = "0.0.15"
+  MODIFIED = "2017-11-11"
 end
 

metadata

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