rubymta 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94b02b7553df5c9c37317c7081949df6e2a1df6
-  data.tar.gz: c8963029d4eda72e12dda04fc7c7dfceebbbf266
+  metadata.gz: db5391a0c0a63fc549ebe8c21db735b96dd901f5
+  data.tar.gz: 48fbfaa4c0678490799c9d5b96dd54cfc40b7cad
 SHA512:
-  metadata.gz: 50b91a554c32a383688f18492125cd08186aba6ded6f0eda35459bb1ed321338f6fc32bccd2795668515678ce999910bbf517393d04186f0bf4bc512ab58fc43
-  data.tar.gz: 308793abfd6ed53b9a7b795ad2b4bb4558e24022c88b0f931c94bf2f3da300da3cf8d47abb9e99a49cda750bc42d5cfbc7bff9eee0740849f0fcd1184ce377e3
+  metadata.gz: 583963c19dd3465c318c62d0bd5b3576eb5cfb3413582806144d4845aece9b591b2f953b499146bb60ee14aa5dde9f1e00305914d719cffe9a6faac73a2f1760
+  data.tar.gz: c9b5f25a6497ab2be2260588d647f8daca356a8097d5f87d7d26cf43d6252f7909571185b432e5710931dc12fc7d7512d81b1ac72b11c3e1e729f52234019898

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# v0.0.2
+
+* Added code to make sure RubyMTA quits on the next command after a violations warning is given.
+* Added code to detect the GET command from an attempt to connect with a web browser.
+* Made corrections to the README.md file.
+* removed the gmta-dev.db test file. A new one will be created when RubyMTA starts running.
+* Added the method `send_local_alert` method which simply places the message into the local delivery system (Dovecot, in my case). This method provides a way to send an alert when there is a failure that requires someone's attention right away.
+* 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/item_of_mail.rb

@@ -64,7 +64,12 @@ class ItemOfMail < Hash
         parcel[:to_url] = rcptto[:url]
         parcel[:delivery_msg] = rcptto[:message]
         parcel[:retry_at] = nil
-        parcel[:delivery] = if rcptto[:accepted] then rcptto[:delivery].to_s else "none" end
+        if self[:accepted] && rcptto[:accepted]
+          parcel[:delivery] = rcptto[:delivery].to_s
+        else
+          parcel[:delivery] = 'none'
+          parcel[:delivery_at] = Time.now
+        end
         parcel[:created_at] = parcel[:updated_at] = Time.now.strftime("%Y-%m-%d %H:%M:%S")
         rcptto[:parcel_id] = S3DB[:parcels].insert(parcel)
       end

data/lib/rubymta/queue_runner.rb

@@ -4,6 +4,8 @@ require 'openssl'
 require 'logger'
 require 'pdkim'
 
+LocalLMTPPort = 24
+
 def manually_run_queue_runner
   exit unless File::open(LockFilePath,"w").flock(File::LOCK_NB | File::LOCK_EX)
   QueueRunner.new.run_queue
@@ -51,7 +53,7 @@ class QueueRunner
       return ok, lines
     end
     rescue Timeout::Error => e
-      raise "Fix this in transporter.rb::recv_text rescue"
+      return '5', "500 5.0.0 No data received after #{QueueRunnerTimeout} seconds (Time Out)"
     end
   end
 
@@ -373,4 +375,63 @@ class QueueRunner
     end
   end
 
+  # to send an alert email to a registered user --
+  # this just delivers the message to dovecot with no processing --
+  # the caller is responsible to provide valid arguments
+  def send_local_email(from, to, subject, text)
+    @connection = nil
+
+    # open connection
+    ssl_socket = TCPSocket.open('localhost',LocalLMTPPort)
+    @connection = OpenSSL::SSL::SSLSocket.new(ssl_socket);
+
+    # receive the server's welcome message
+    ok, lines = recv_text
+    return ok, lines if ok!='2'
+
+    # send the LHLO
+    send_text("LHLO admin")
+    ok, lines = recv_text
+    return ok, lines if ok!='2'
+
+    # MAIL FROM
+    send_text("MAIL FROM:<#{from}>")
+    ok, lines = recv_text
+    return ok, lines if ok!='2'
+
+    # RCPT TO
+    send_text("RCPT TO:<#{to}>")
+    ok, lines = recv_text
+    return ok, lines if ok!='2'
+
+    # DATA -- send the email
+    send_text("DATA")
+    ok, lines = recv_text
+    return ok, lines if ok!='3'
+    lines = <<ALERT
+To: <#{to}>
+From: <#{from}>
+Subject: #{subject}
+Date: #{Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")}
+
+#{text}
+ALERT
+    lines.split("\n").each do |line|
+      send_text(line, :data)
+    end
+
+    # send the end of the message prompt
+    send_text(".", :data)
+
+    # get the response from DoveCot
+    return recv_text
+
+  ensure
+    @connection.close if @connection
+  end
+
+end
+
+def send_local_alert(from, to, subject, text)
+  QueueRunner::new.send_local_email(from, to, subject, text)
 end

data/lib/rubymta/receiver.rb

@@ -181,6 +181,7 @@ class Receiver
     @done = false
     @encrypted = false
     @authenticated = false
+    @warning_given = false
     @mail[:encrypted] = false
     @mail[:authenticated] = nil
     send_text(connect_base)
@@ -190,10 +191,18 @@ class Receiver
       begin
         break if @done
         text = recv_text
-        if (text.nil?) # the  client closed the channel abruptly
+        # the  client closed the channel abruptly or we're forcing QUIT
+        if (text.nil?) || @warning_given
           text = "QUIT"
           @contact.violation
         end
+        # this handles an attempt to connect with HTTP
+        if text.start_with?("GET")
+          LOG.error(@mail[:mail_id]) {"An attempt was made to connect with a web browser"}
+          @mail[:saved] = true # prevent saving
+          raise Quit
+        end
+        # main command detect loop
         unrecognized = true
         Patterns.each do |pattern|
           break if pattern[0]>@level
@@ -249,9 +258,9 @@ class Receiver
     ok = nil
     File.open(LockFilePath,"w") do |f|
       ok = f.flock( File::LOCK_NB | File::LOCK_EX )
-      f.flock(File::LOCK_UN) if ok!=false
+      f.flock(File::LOCK_UN) if ok
     end
-    if ok!=false
+    if ok
       pid = Process::spawn("#{$app[:path]}/run_queue.rb")
       Process::detach(pid)
     end
@@ -275,6 +284,7 @@ class Receiver
 
     if @contact.warning?
       # this is the first denied message
+      @warning_given = true
       expires_at = @contact.violation.strftime('%Y-%m-%d %H:%M:%S %Z') # to kick it up to prohibited
       LOG.warn(@mail[:mail_id]) {"Access TEMPORARILY denied to #{@mail[:remote_ip]} (#{@mail[:remote_hostname]}) until #{expires_at}"}
       return "454 4.7.1 Access TEMPORARILY denied to #{@mail[:remote_ip]}: you may try again after #{expires_at}"
@@ -576,7 +586,7 @@ class Receiver
 
   def quit(value)
     @done = true
-    if @mail[:saved].nil?
+    if (@mail[:saved].nil?) && (@contact.violations? == 0)
       LOG.warn(@mail[:mail_id]) {"Quitting before a message is finished is considered a violation"}
       @contact.violation
     end

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.1"
-  MODIFIED = "2017-07-29"
+  VERSION = "0.0.2"
+  MODIFIED = "2017-08-14"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymta
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael J. Welch, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-08-14 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.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby Gem providing a complete Mail Transport Agent package.