rubymta 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db5391a0c0a63fc549ebe8c21db735b96dd901f5
-  data.tar.gz: 48fbfaa4c0678490799c9d5b96dd54cfc40b7cad
+  metadata.gz: c9eee9048f339e3729e46ca659a20b007e12fd31
+  data.tar.gz: 49c064d5f9f642108a58733e6370992272235e3e
 SHA512:
-  metadata.gz: 583963c19dd3465c318c62d0bd5b3576eb5cfb3413582806144d4845aece9b591b2f953b499146bb60ee14aa5dde9f1e00305914d719cffe9a6faac73a2f1760
-  data.tar.gz: c9b5f25a6497ab2be2260588d647f8daca356a8097d5f87d7d26cf43d6252f7909571185b432e5710931dc12fc7d7512d81b1ac72b11c3e1e729f52234019898
+  metadata.gz: 7dc5ab4ce63fbef730f57f44fbb5063a71d3c5040764f43d8cc5825a34112f4e98cff491a07625fb35040ccacc7ea0b6e5cdca96f23c2dee226718599da264a9
+  data.tar.gz: 7525ee10f2723a3b24b0ef1848f72a83ffed99b9ca149f98d30dcc2ec38eddc919183e5778260ae2f3dee8971061b9af17e7a5f50ce51cb4a87697a775f5ec62

data/lib/rubymta/item_of_mail.rb

@@ -59,6 +59,7 @@ class ItemOfMail < Hash
         # make entries into the database for tracking the deliveries
         parcel = {}
         parcel[:id] = nil
+        parcel[:contact_id] = self[:contact_id]
         parcel[:mail_id] = self[:mail_id]
         parcel[:from_url] = self[:mailfrom][:url]
         parcel[:to_url] = rcptto[:url]

data/lib/rubymta/receiver.rb

@@ -170,12 +170,15 @@ class Receiver
 
   def receive(local_port, local_hostname, remote_port, remote_hostname, remote_ip)
     # Start a hash to collect the information gathered from the receive process
+    @contact = Contact::new(remote_ip)
     @mail = ItemOfMail::new
+    @mail[:contact_id] = @contact[:id]
     @mail[:local_port] = local_port
     @mail[:local_hostname] = local_hostname
     @mail[:remote_port] = remote_port
     @mail[:remote_hostname] = remote_hostname
     @mail[:remote_ip] = remote_ip
+    LOG.info(@mail[:mail_id]) {"New item of mail opened with id '#{@mail[:mail_id]}'"}
 
     # start the main receiving process here
     @done = false
@@ -195,6 +198,7 @@ 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")
@@ -271,11 +275,6 @@ class Receiver
 #-------------------------------------------------------#
 
   def connect_base
-    @contact = Contact.new(@mail[:remote_ip])
-    raise StandardError.new("contact.new failed; see log") if @contact.nil?
-
-    LOG.info(@mail[:mail_id]) {"New item of mail opened with id '#{@mail[:mail_id]}'"}
-
     if @contact.prohibited?
       # after the first denied message, we just slam the channel shut: no more nice guy
       LOG.warn(@mail[:mail_id]) {"Slammed connection shut. No more nice guy with #{@mail[:remote_ip]}"}

data/lib/rubymta/server.rb

@@ -73,6 +73,7 @@ end
 # queue runner will read this queue and attempt to deliver the emails.
 S3DB::create_table?(:parcels) do
   primary_key(:id)
+  integer(:contact_id)
   string(:mail_id)
   string(:from_url)
   string(:to_url)

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.2"
-  MODIFIED = "2017-08-14"
+  VERSION = "0.0.3"
+  MODIFIED = "2017-09-05"
 end
 

metadata

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