rubymta 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f2f695c59541a20a8e34337ba317ed506f133cd
-  data.tar.gz: c8c8a8de990c8c5be242d9ebfd0045752412acb6
+  metadata.gz: 2300f8a4d7ef99c5500ef87f19bb71f41b5c97da
+  data.tar.gz: 096043e53d78adaa7c639dbe721f5a5e33c6c026
 SHA512:
-  metadata.gz: 9278791fe76b519f1346170f53bdecd9d49c7016e932db7d3efdb9525c6482ae14d214303c40c8f1e4da2c2d78aeb3771e2db3a605755fb8724f2863ea679532
-  data.tar.gz: 95803e0c36063ec5b425cf374b345d547f7db38084be49eba421694798039e235b5172951d97803d9a5918ef76c77226db06726f78e48a7e8b4a14603537c746
+  metadata.gz: 44aff1177adcf639cc6c4b16ef5efe14f7fb65ea8b77ef6e60a47a5fa0a52b75a33e37f0236d54a8c5edfabfa1793d735eab7aee99c04cb5e386a94ff400b940
+  data.tar.gz: d84934a81e7f623e57fb9b808231208fe0b99a46c7be36b57979af124b328196bb79178747f4b403ffe728a1137aa9f63b400c8b82564484b2cae612cd1b5633

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 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.
+* Added code to call Spam Assassin just before saving. If you have spamassassin installed and you want to use it, add `
+  SpamAssassinInstalled = true` to your config.rb. (I added it in mine after `MailQueue` in `# item of mail configuration`.
+
+
 # v0.0.12
 
 * Fixed the `send_text` in `QueueRunner` to not echo the data into the log when `LogQueueRunnerConversation` is set to `true`.

data/lib/rubymta/item_of_mail.rb

@@ -1,5 +1,6 @@
 require_relative 'base-x'
 require_relative 'deepclone'
+require 'open3'
 require "./config" # config.rb is in user space
 
 class SaveError < StandardError; end
@@ -97,7 +98,10 @@ class ItemOfMail < Hash
         f.write("#{tmp.lines.count}\n")
         f.write(tmp)
         f.write("\n")
-        f.write(text.join("\n"))
+        text_out = text_in = text.join("\n")
+        text_out, e, s = Open3.capture3("spamc", :stdin_data=>text_in) if defined?(SpamAssassinInstalled)
+        LOG.error(self[:mail_id]) {e} unless e.empty?
+        f.write(text_out)
       end
       self[:saved] = true
     rescue => e

data/lib/rubymta/receiver.rb

@@ -246,6 +246,7 @@ 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]
@@ -259,6 +260,7 @@ class Receiver
         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

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.12"
-  MODIFIED = "2017-10-25"
+  VERSION = "0.0.13"
+  MODIFIED = "2017-10-29"
 end
 

metadata

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