remailer 0.5.2 → 0.9.1

data/lib/remailer/smtp/client/interpreter.rb

@@ -1,3 +1,6 @@
+require 'base64'
+require 'set'
+
 class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
   # == Constants ============================================================
   
@@ -22,7 +25,7 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
   # Encodes the given data for an RFC5321-compliant stream where lines with
   # leading period chracters are escaped.
   def self.encode_data(data)
-    data.gsub(/((?:\r\n|\n)\.)/m, '\\1.')
+    data.gsub(/\r?\n/, "\r\n").gsub(/\r\n\./, "\r\n..")
   end
 
   # Encodes a string in Base64 as a single line
@@ -37,6 +40,10 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
   end
   
   state :initialized do
+    enter do
+      @tls = false
+    end
+
     interpret(220) do |message, continues|
       message_parts = message.split(/\s+/)
       delegate.remote = message_parts.first
@@ -68,6 +75,8 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
   state :helo do
     enter do
       delegate.send_line("HELO #{delegate.hostname}")
+
+      delegate.auth_support = Set.new(%i[ plain ])
     end
 
     interpret(250) do
@@ -85,20 +94,17 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
     end
 
     interpret(250) do |message, continues|
-      message_parts = message.split(/\s+/)
+      directive, *message_parts = message.split(/\s+/)
 
-      case (message_parts[0].to_s.upcase)
+      case (directive.to_s.upcase)
       when 'SIZE'
-        delegate.max_size = message_parts[1].to_i
+        delegate.max_size = message_parts[0].to_i
       when 'PIPELINING'
         delegate.pipelining = true
       when 'STARTTLS'
         delegate.tls_support = true
       when 'AUTH'
-        delegate.auth_support = message_parts[1, message_parts.length].inject({ }) do |h, v|
-          h[v] = true
-          h
-        end
+        delegate.auth_support = Set.new(message_parts.map(&:downcase).map(&:to_sym))
       end
 
       unless (continues)
@@ -140,7 +146,19 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
 
   state :auth do
     enter do
-      delegate.send_line("AUTH PLAIN #{self.class.encode_authentication(delegate.options[:username], delegate.options[:password])}")
+      if (delegate.auth_support?(:plain))
+        delegate.send_line(
+          'AUTH PLAIN %s' % [ 
+            self.class.encode_authentication(
+              delegate.options[:username],
+              delegate.options[:password]
+            )
+          ]
+        )
+      elsif (delegate.auth_support&.include?(:login))
+        delegate.send_line('AUTH LOGIN')
+        enter_state(:auth_username)
+      end
     end
     
     interpret(235) do
@@ -158,7 +176,62 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
       end
     end
   end
-  
+
+  state :auth_username do
+    interpret(334) do
+      delegate.send_line(Base64.strict_encode64(delegate.options[:username]))
+
+      enter_state(:auth_password)
+    end
+
+    interpret(535) do |reply_message, continues|
+      handle_reply_continuation(535, reply_message, continues) do |reply_code, reply_message|
+        @error = reply_message
+
+        delegate.debug_notification(:error, "[#{@state}] #{reply_code} #{reply_message}")
+        delegate.error_notification(reply_code, reply_message)
+
+        enter_state(:quit)
+      end
+    end
+  end
+
+  state :auth_password do
+    interpret(334) do
+      delegate.send_line(Base64.strict_encode64(delegate.options[:password]))
+
+      enter_state(:auth_acknowledge)
+    end
+
+    interpret(535) do |reply_message, continues|
+      handle_reply_continuation(535, reply_message, continues) do |reply_code, reply_message|
+        @error = reply_message
+
+        delegate.debug_notification(:error, "[#{@state}] #{reply_code} #{reply_message}")
+        delegate.error_notification(reply_code, reply_message)
+
+        enter_state(:quit)
+      end
+    end
+  end
+
+  state :auth_acknowledge do
+    interpret(235) do
+      enter_state(:established)
+    end
+
+    interpret(535) do |reply_message, continues|
+      handle_reply_continuation(535, reply_message, continues) do |reply_code, reply_message|
+        @error = reply_message
+
+        delegate.debug_notification(:error, "[#{@state}] #{reply_code} #{reply_message}")
+        delegate.error_notification(reply_code, reply_message)
+
+        enter_state(:quit)
+      end
+    end
+  end
+
   state :established do
     enter do
       delegate.connect_notification(true)
@@ -251,7 +324,7 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
       end
     end
     
-    interpret(500..599) do |reply_code, reply_message, continues|
+    interpret(400..599) do |reply_code, reply_message, continues|
       handle_reply_continuation(reply_code, reply_message, continues) do |reply_code, reply_message|
         delegate_call(:after_message_sent, reply_code, reply_message)
 
@@ -281,7 +354,7 @@ class Remailer::SMTP::Client::Interpreter < Remailer::Interpreter
       # Ensure that a blank line is sent after the last bit of email content
       # to ensure that the dot is on its own line.
       delegate.send_line
-      delegate.send_line(".")
+      delegate.send_line('.')
     end
     
     default do |reply_code, reply_message, continues|

data/lib/remailer/smtp/server.rb

@@ -19,7 +19,7 @@ class Remailer::SMTP::Server < EventMachine::Protocols::LineAndTextProtocol
   
   attr_accessor :logger
   attr_reader :server_name, :quirks
-  attr_reader :remote_ip, :remote_port
+  attr_reader :remote_ip, :remote_port, :remote_name
   attr_reader :local_ip, :local_port
   attr_reader :local_config
   
@@ -60,6 +60,11 @@ class Remailer::SMTP::Server < EventMachine::Protocols::LineAndTextProtocol
     
     @server_name = @options[:server_name] || self.class.hostname(@local_ip) || @local_ip
 
+    @logger = nil
+    @remote_host = nil
+    @tls_support = false
+    @interpreter_class = options && options[:interpreter] || Interpreter
+
     log(:debug, "Connection from #{@remote_ip}:#{@remote_port} to #{@local_ip}:#{@local_port}")
     
     @on_transaction = @options[:on_transaction]
@@ -69,15 +74,15 @@ class Remailer::SMTP::Server < EventMachine::Protocols::LineAndTextProtocol
   def post_init
     super
 
-    @interpreter = Interpreter.new(:delegate => self)
+    @interpreter = @interpreter_class.new(delegate: self)
     
     if (@on_connect)
       @on_connect.call(@remote_ip)
     end
   end
   
-  def on_transaction
-    @on_transaction = Proc.new
+  def on_transaction(&block)
+    @on_transaction = block
   end
   
   def receive_line(line)

data/lib/remailer/smtp/server/interpreter.rb

@@ -40,7 +40,7 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
       end
     end
 
-    interpret(/^\s*HELO\s+(\S+)\s*$/) do |remote_host|
+    interpret(/^\s*HELO\s+(\S+)\s*$/i) do |remote_host|
       delegate.validate_hostname(remote_host) do |valid|
         if (valid)
           delegate.log(:debug, "#{delegate.remote_ip}:#{delegate.remote_port} to #{delegate.local_ip}:#{delegate.local_port} Accepting connection from #{remote_host}")
@@ -54,7 +54,7 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
       end
     end
     
-    interpret(/^\s*MAIL\s+FROM:\s*<([^>]+)>\s*/) do |address|
+    interpret(/^\s*MAIL\s+FROM:\s*<([^>]+)>\s*/i) do |address|
       if (Remailer::EmailAddress.valid?(address))
         accept, message = will_accept_sender(address)
 
@@ -68,7 +68,7 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
       end
     end
 
-    interpret(/^\s*RCPT\s+TO:\s*<([^>]+)>\s*/) do |address|
+    interpret(/^\s*RCPT\s+TO:\s*<([^>]+)>\s*/i) do |address|
       if (@transaction.sender)
         if (Remailer::EmailAddress.valid?(address))
           accept, message = will_accept_recipient(address)
@@ -87,24 +87,24 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
       end
     end
     
-    interpret(/^\s*AUTH\s+PLAIN\s+(.*)\s*$/) do |auth|
+    interpret(/^\s*AUTH\s+PLAIN\s+(.*)\s*$/i) do |auth|
       # 235 2.7.0 Authentication successful
-      delegate.send("235 whatever")
+      delegate.send("235 If you insist")
     end
 
-    interpret(/^\s*AUTH\s+PLAIN\s*$/) do
+    interpret(/^\s*AUTH\s+PLAIN\s*$/i) do
       # Multi-line authentication method
       enter_state(:auth_plain)
     end
     
-    interpret(/^\s*STARTTLS\s*$/) do
+    interpret(/^\s*STARTTLS\s*$/i) do
       if (@tls_started)
         delegate.send_line("454 TLS already started")
       elsif (delegate.tls?)
         delegate.send_line("220 TLS ready to start")
         delegate.start_tls(
-          :private_key_file => Remailer::SMTP::Server.private_key_path,
-          :cert_chain_file => Remailer::SMTP::Server.ssl_cert_path
+          private_key_file: Remailer::SMTP::Server.private_key_path,
+          cert_chain_file: Remailer::SMTP::Server.ssl_cert_path
         )
         
         @tls_started = true
@@ -113,27 +113,27 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
       end
     end
     
-    interpret(/^\s*DATA\s*$/) do
+    interpret(/^\s*DATA\s*$/i) do
       if (@transaction.sender)
       else
-        delegate.send_line("503 valid RCPT command must precede DATA")
+        delegate.send_line("503 Valid RCPT command must precede DATA")
       end
       
       enter_state(:data)
       delegate.send_line("354 Supply message data")
     end
 
-    interpret(/^\s*NOOP\s*$/) do |remote_host|
+    interpret(/^\s*NOOP\s*$/i) do |remote_host|
       delegate.send_line("250 OK")
     end
 
-    interpret(/^\s*RSET\s*$/) do |remote_host|
+    interpret(/^\s*RSET\s*$/i) do |remote_host|
       delegate.send_line("250 Reset OK")
       
       enter_state(:reset)
     end
     
-    interpret(/^\s*QUIT\s*$/) do
+    interpret(/^\s*QUIT\s*$/i) do
       delegate.send_line("221 #{delegate.server_name} closing connection")
 
       delegate.close_connection(true)
@@ -142,6 +142,8 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
   
   state :data do
     interpret(/^\.$/) do
+      @transaction.remote_ip = delegate.remote_ip
+      
       accept, message = will_accept_transaction(@transaction)
       
       if (accept)
@@ -159,7 +161,6 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
     
     default do |line|
       # RFC5321 4.5.2 - Leading dot is removed if line has content
-
       @transaction.data << (line.sub(/^\./, '') << Remailer::Constants::CRLF)
     end
   end

data/lib/remailer/smtp/server/transaction.rb

@@ -1,11 +1,18 @@
 class Remailer::SMTP::Server::Transaction
   # == Constants ============================================================
   
-  ATTRIBUTES = [ :sender, :recipients, :data ].freeze
+  ATTRIBUTES = [
+    :sender,
+    :remote_ip,
+    :remote_name,
+    :auth,
+    :recipients,
+    :data
+  ].freeze
 
   # == Properties ===========================================================
   
-  attr_accessor *ATTRIBUTES
+  attr_accessor(*ATTRIBUTES)
 
   # == Class Methods ========================================================
 

data/lib/remailer/socks5/client/interpreter.rb

@@ -5,14 +5,14 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
   SOCKS5_VERSION = 5
 
   SOCKS5_METHOD = {
-    :no_auth => 0,
-    :gssapi => 1,
-    :username_password => 2
+    no_auth: 0,
+    gssapi: 1,
+    username_password: 2
   }.freeze
   
   SOCKS5_COMMAND = {
-    :connect => 1,
-    :bind => 2
+    connect: 1,
+    bind: 2
   }.freeze
   
   SOCKS5_REPLY = {
@@ -28,9 +28,9 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
   }.freeze
   
   SOCKS5_ADDRESS_TYPE = {
-    :ipv4 => 1,
-    :domainname => 3,
-    :ipv6 => 4
+    ipv4: 1,
+    domainname: 3,
+    ipv6: 4
   }.freeze
   
   # == State Mapping ========================================================
@@ -60,7 +60,7 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
     
     parse do |s|
       if (s.length >= 2)
-        version, method = s.slice!(0,2).unpack('CC')
+        _version, method = s.slice!(0,2).unpack('CC')
       
         method
       end
@@ -109,14 +109,14 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
     
     parse do |s|
       if (s.length >= 10)
-        version, reply, reserved, address_type, address, port = s.slice!(0,10).unpack('CCCCNn')
+        _version, reply, _reserved, address_type, address, port = s.slice!(0,10).unpack('CCCCNn')
       
         [
           reply,
           {
-            :address => address,
-            :port => port,
-            :address_type => address_type
+            address: address,
+            port: port,
+            address_type: address_type
           }
         ]
       end
@@ -128,6 +128,7 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
     
     default do |reply|
       @reply = reply
+
       enter_state(:failed)
     end
   end
@@ -189,4 +190,8 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
   def label
     'SOCKS5'
   end
+
+  def finished?
+    self.state == :connected
+  end
 end

data/remailer.gemspec

@@ -1,23 +1,28 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: remailer 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "remailer"
-  s.version = "0.5.2"
+  s.name = "remailer".freeze
+  s.version = "0.9.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Tadman"]
-  s.date = "2012-11-30"
-  s.description = "EventMachine SMTP Mail User Agent"
-  s.email = "scott@twg.ca"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Scott Tadman".freeze]
+  s.date = "2020-09-22"
+  s.description = "EventMachine Mail Agent for SMTP and IMAP".freeze
+  s.email = "tadman@postageapp.com".freeze
   s.extra_rdoc_files = [
-    "README.rdoc"
+    "LICENSE.txt",
+    "README.md"
   ]
   s.files = [
     ".document",
-    "README.rdoc",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
     "Rakefile",
     "VERSION",
     "lib/remailer.rb",
@@ -42,7 +47,9 @@ Gem::Specification.new do |s|
     "lib/remailer/socks5/client/interpreter.rb",
     "lib/remailer/support.rb",
     "remailer.gemspec",
-    "test/config.example.rb",
+    "test/bin/exercise",
+    "test/config.example.yml",
+    "test/config.rb",
     "test/helper.rb",
     "test/unit/remailer_imap_client_interpreter_test.rb",
     "test/unit/remailer_imap_client_test.rb",
@@ -54,21 +61,24 @@ Gem::Specification.new do |s|
     "test/unit/remailer_socks5_client_interpreter_test.rb",
     "test/unit/remailer_test.rb"
   ]
-  s.homepage = "http://github.com/twg/remailer"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Reactor-Ready SMTP Mailer"
+  s.homepage = "http://github.com/postageapp/remailer".freeze
+  s.rubygems_version = "3.1.4".freeze
+  s.summary = "Reactor-Ready SMTP Mailer".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<eventmachine>.freeze, [">= 0"])
+    s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_development_dependency(%q<minitest-reporters>.freeze, [">= 0"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<eventmachine>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
   end
 end