rubymta 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9eee9048f339e3729e46ca659a20b007e12fd31
-  data.tar.gz: 49c064d5f9f642108a58733e6370992272235e3e
+  metadata.gz: 342f0caad82d98379a66f1b3a776211bf9469edd
+  data.tar.gz: 90406eb6b7165e27a40f841f3e424883d4390824
 SHA512:
-  metadata.gz: 7dc5ab4ce63fbef730f57f44fbb5063a71d3c5040764f43d8cc5825a34112f4e98cff491a07625fb35040ccacc7ea0b6e5cdca96f23c2dee226718599da264a9
-  data.tar.gz: 7525ee10f2723a3b24b0ef1848f72a83ffed99b9ca149f98d30dcc2ec38eddc919183e5778260ae2f3dee8971061b9af17e7a5f50ce51cb4a87697a775f5ec62
+  metadata.gz: 64bc2f2844106e9aa06089f2f3cdbc145702cbed7a60d155b0c5b287bc62f99a0db11997a2ae5aa81988d29ead7f741eb36409f2be496c6207b964c6a4ebf91d
+  data.tar.gz: 118905e30a717ed45d89da660c5a06ed5dea9c203339d3dfdf1d309eec16ddf3520cd1e182c94a0e136a986d6f1449d8b75d807c2526ae25a4ce6f3cef85ee9e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.0.4
+
+* Updated the gem to reflect changes in Ruby Sequel v4.40.0.
+
+
+# v0.0.3
+
+* Added a `contact_id` firld to the `parcels` table so that the parcels can be related back to the IP that sent them, irrespective of the domain names presented. The contact IP is an absolute quantity, and one of the first ones we get, so it forms the cornerstone of the data structure.
+
+
 # v0.0.2
 
 * Added code to make sure RubyMTA quits on the next command after a violations warning is given.
@@ -8,6 +18,7 @@
 * Fixed a bug in queue_runner where it coded a partial item of mail as 'local'. Now, if the @mail[:accepted] flag is not true, the mail destination in the packet is set to 'none' as it should be.
 * Made a change such that all packets coded as :delivery=>'none' also have the :delivery_at=>Time.now.
 
+
 # v0.0.1
 
 * Initial load. See the README.md for details.

data/lib/rubymta/contact.rb

@@ -2,7 +2,7 @@ class Contact < Hash
 
   def initialize(remote_ip)
     # Reset timed-out records
-    S3DB[:contacts].where("expires_at<'#{Time.now.strftime("%Y-%m-%d %H:%M")}'").update(:violations=>0)
+    S3DB[:contacts].where(Sequel.lit("expires_at<'#{Time.now.strftime("%Y-%m-%d %H:%M")}'")).update(:violations=>0)
 
     # See if it's already there
     rs = S3DB[:contacts].where(:remote_ip=>remote_ip).first

data/lib/rubymta/queue_runner.rb

@@ -64,7 +64,7 @@ class QueueRunner
     while true
       # sqlite3 has a bug: "<=" doesn't work with time, ex. "retry_at<='#{Time.now}'"
       # we have to add 1 second and use "<"; ex. "retry_at<'#{Time.now+1}'"
-      parcels = S3DB[:parcels].where("(delivery<>'none') and (delivery_at is null) and ((retry_at is null) or (retry_at<'#{Time.now + 1}'))").all
+      parcels = S3DB[:parcels].where(Sequel.lit("(delivery<>'none') and (delivery_at is null) and ((retry_at is null) or (retry_at<'#{Time.now + 1}'))")).all
       return if parcels.empty?
 
       # aggregate the emails by destination domain

data/lib/rubymta/receiver.rb

@@ -178,6 +178,7 @@ class Receiver
     @mail[:remote_port] = remote_port
     @mail[:remote_hostname] = remote_hostname
     @mail[:remote_ip] = remote_ip
+    @mail[:saved] = true # prevent saving until we have at least a MAIL FROM
     LOG.info(@mail[:mail_id]) {"New item of mail opened with id '#{@mail[:mail_id]}'"}
 
     # start the main receiving process here
@@ -198,7 +199,6 @@ class Receiver
         if (text.nil?) || @warning_given
           text = "QUIT"
           @contact.violation
-          @mail[:saved] = true # prevent saving
         end
         # this handles an attempt to connect with HTTP
         if text.start_with?("GET")
@@ -246,7 +246,7 @@ class Receiver
   ensure
     # 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[:saved]
+    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
@@ -339,6 +339,7 @@ class Receiver
   def mail_from_base(value)
     @mail[:mailfrom] = from = {}
     @mail[:rcptto] = []
+    @mail[:saved] = false # enable saving
     from[:accepted] = false
     ok = psych_value(from, value)
 

data/lib/rubymta/server.rb

@@ -48,6 +48,11 @@ if !UserName.nil?
   File::chown($app[:uinfo].uid, $app[:ginfo].gid, S3DBPath)
 end
 
+# This changed as of Sequel v.4.40.0
+# This is false by default, but was supposed to be
+# true by default so we have to forcefully set it
+Sequel.split_symbols = true
+
 # Open the sqlite3 database for rubymta use
 S3DB = Sequel.connect("sqlite://#{S3DBPath}")
 LOG.info("Database '#{S3DBPath}' opened")

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.3"
-  MODIFIED = "2017-09-05"
+  VERSION = "0.0.4"
+  MODIFIED = "2017-09-16"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymta
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael J. Welch, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies: []
 description: RubyMta is an experimental mail transport agent written in Ruby. See
   the README.
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Ruby Gem providing a complete Mail Transport Agent package.