remailer 0.7.1.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eb36a038eda0c02e2a03d0d14ab288c47e28353a
-  data.tar.gz: 8053fdfbcfe5c629725a8c298cdd1ac7aba8704f
+SHA256:
+  metadata.gz: c66f7fc5cd78fcb8115342274f77169e4658cfb575d6b2609d2ae07bbd7278a0
+  data.tar.gz: 277347ffde8646bb32f6dc01cddca71be940c21fc46f5cfe32ecb4d02c849065
 SHA512:
-  metadata.gz: 0f239537ae91a5d85599ad9e45d7206130af1368654f478f3d7c6c8fd465857abd34ef7d2519d77ece5b79268993bd2c7a4de242048680e1fc529dd7963abfd5
-  data.tar.gz: 8947e95785a4233fbfefb4df63c36266bc2d2470eaf6e72405b01a7c5ccf326f0870a0783b054d273b56b19167d92c4f61ec5961ee0dd12a96d976be0975ec69
+  metadata.gz: 6352a8dddf0f8cf1cd16cb810af0993a7bbd3386fe0ccc28c20fc9d891a9a9d4ae69e98b106f6d3a31933620364bb88f77217c2db1103400607333e9f5bcec71
+  data.tar.gz: 3b935c992a65b812b268cd616353886b104ba7c3cb97009c6234bae1e57d685d381c466219dd357542d6a424ddfe643f9648a8a644797f35806170e166cdfdd8

data/Gemfile

@@ -5,5 +5,5 @@ gem 'eventmachine'
 group :development do
   gem 'minitest'
   gem 'minitest-reporters'
-  gem 'jeweler'
+  gem 'juwelier'
 end

data/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2010-2019 Scott Tadman, PostageApp Ltd.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -105,4 +105,4 @@ release is made.
 
 ## Copyright
 
-Copyright (c) 2010-2015 Scott Tadman, The Working Group
+Copyright (c) 2010-2019 Scott Tadman, PostageApp Ltd.

data/Rakefile

@@ -6,21 +6,26 @@ require 'bundler/setup'
 Bundler.require
 
 begin
-  require 'jeweler'
+  require 'juwelier'
 
-  Jeweler::Tasks.new do |gem|
+  Juwelier::Tasks.new do |gem|
     gem.name = "remailer"
     gem.summary = %Q{Reactor-Ready SMTP Mailer}
-    gem.description = %Q{EventMachine SMTP Mail User Agent}
-    gem.email = "scott@twg.ca"
-    gem.homepage = "http://github.com/twg/remailer"
+    gem.description = %Q{EventMachine Mail Agent for SMTP and IMAP}
+    gem.email = "tadman@postageapp.com"
+    gem.homepage = "http://github.com/postageapp/remailer"
     gem.authors = [ "Scott Tadman" ]
+
+    gem.files.exclude(
+      '.travis.yml',
+      'test/config.yml.enc'
+    )
   end
 
-  Jeweler::GemcutterTasks.new
+  Juwelier::GemcutterTasks.new
 
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts "Juwelier (or a dependency) not available. Install it with: gem install Juwelier"
 end
 
 require 'rake/testtask'
@@ -31,4 +36,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/VERSION

@@ -1 +1 @@
-0.7.1.2
+0.9.1

data/lib/remailer/abstract_connection.rb

@@ -133,6 +133,14 @@ class Remailer::AbstractConnection < EventMachine::Connection
     @options = options
     @hostname = @options[:hostname] || Socket.gethostname
     @timeout = @options[:timeout] || self.class.default_timeout
+    @timed_out = false
+
+    @active_message = nil
+    @established = false
+    @connected = false
+    @closed = false
+    @unbound = false
+    @connecting_to_proxy = false
 
     @messages = [ ]
   
@@ -156,9 +164,9 @@ class Remailer::AbstractConnection < EventMachine::Connection
     STDERR.puts "#{e.class}: #{e}" rescue nil
   end
 
-  def after_complete
+  def after_complete(&block)
     if (block_given?)
-      @options[:after_complete] = Proc.new
+      @options[:after_complete] = block
     elsif (@options[:after_complete])
       @options[:after_complete].call
     end
@@ -176,9 +184,15 @@ class Remailer::AbstractConnection < EventMachine::Connection
   end
 
   # Returns true if the connection has advertised authentication support, or
-  # false if not availble or could not be detected.
-  def auth_support?
-    !!@auth_support
+  # false if not availble or could not be detected. If type is specified,
+  # returns true only if that type is supported, false otherwise.
+  def auth_support?(type = nil)
+    case (type)
+    when nil
+      !!@auth_support
+    else
+      !!(@auth_support&.include?(type))
+    end
   end
   
   # Returns true if the connection will be using a proxy to connect, false
@@ -381,12 +395,6 @@ class Remailer::AbstractConnection < EventMachine::Connection
   def error?
     !!@error
   end
-  
-  # EventMachine: Enables TLS support on the connection.
-  def start_tls
-    debug_notification(:tls, "Started")
-    super
-  end
 
   # EventMachine: Closes down the connection.
   def close_connection

data/lib/remailer/interpreter.rb

@@ -19,7 +19,7 @@ class Remailer::Interpreter
   
   # Defines the initial state for objects of this class.
   def self.initial_state
-    @initial_state || :initialized
+    @initial_state ||= :initialized
   end
   
   # Can be used to reassign the initial state for this class. May be easier
@@ -82,15 +82,15 @@ class Remailer::Interpreter
   end
   
   # This is a method to convert a spec and a block into a proper parser
-  # method. If spec is specified, it should be a Fixnum, or a Regexp. A 
-  # Fixnum defines a minimum size to process, useful for packed binary
+  # method. If spec is specified, it should be a Integer, or a Regexp. A 
+  # Integer defines a minimum size to process, useful for packed binary
   # streams, while a Regexp defines a pattern that must match before the
   # parser is engaged.
   def self.create_parser_for_spec(spec, &block)
     case (spec)
     when nil
       block
-    when Fixnum
+    when Integer
       lambda do |s|
         if (s.length >= spec)
           part = s.slice!(0, spec)
@@ -168,6 +168,8 @@ class Remailer::Interpreter
   # before the first state is entered.
   def initialize(options = nil)
     @delegate = (options and options[:delegate])
+    @state = nil
+    @error = nil
     
     yield(self) if (block_given?)
     
@@ -258,7 +260,7 @@ class Remailer::Interpreter
           match_result = match_result.to_a
         
           if (match_result.length > 1)
-            match_string = match_result.shift
+            match_result.shift
             args[0, 1] = match_result
           else
             args[0].sub!(match_result[0], '')

data/lib/remailer/smtp/client.rb

@@ -60,6 +60,8 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
   # Called by AbstractConnection at the end of the initialize procedure
   def after_initialize
     @protocol = :smtp
+    @error = nil
+    @tls_support = nil
 
     if (using_proxy?)
       proxy_connection_initiated!

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,17 +87,17 @@ 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?)
@@ -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

@@ -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,7 +109,7 @@ 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,

data/remailer.gemspec

@@ -1,26 +1,27 @@
-# 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.7.1.2 ruby lib
+# stub: remailer 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "remailer"
-  s.version = "0.7.1.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.require_paths = ["lib"]
-  s.authors = ["Scott Tadman"]
-  s.date = "2015-04-14"
-  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 = [
+    "LICENSE.txt",
     "README.md"
   ]
   s.files = [
     ".document",
-    ".travis.yml",
     "Gemfile",
+    "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -49,7 +50,6 @@ Gem::Specification.new do |s|
     "test/bin/exercise",
     "test/config.example.yml",
     "test/config.rb",
-    "test/config.yml.enc",
     "test/helper.rb",
     "test/unit/remailer_imap_client_interpreter_test.rb",
     "test/unit/remailer_imap_client_test.rb",
@@ -61,29 +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.rubygems_version = "2.2.2"
-  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 = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<minitest-reporters>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<minitest-reporters>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 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<minitest>, [">= 0"])
-    s.add_dependency(%q<minitest-reporters>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 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
 

data/test/helper.rb

@@ -10,7 +10,6 @@ $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'timeout'
-require 'thwait'
 require 'rubygems'
 
 begin
@@ -41,8 +40,6 @@ end
 module TestTriggerHelper
   def self.included(base)
     base.class_eval do
-      attr_reader :triggered
-      
       def triggered
         @triggered ||= Hash.new(false)
       end
@@ -138,12 +135,12 @@ class MiniTest::Test
   end
 
   def assert_mapping(map, &block)
-    result_map = map.inject({ }) do |h, (k,v)|
+    result_map = map.inject({ }) do |h, (k, _v)|
       h[k] = yield(k)
       h
     end
     
-    differences = result_map.inject([ ]) do |a, (k,v)|
+    differences = result_map.inject([ ]) do |a, (k, v)|
       if (v != map[k])
         a << k
       end

data/test/unit/remailer_imap_client_test.rb

@@ -3,14 +3,14 @@ require_relative '../helper'
 class RemailerIMAPClientTest < MiniTest::Test
   def test_connect
     skip
+
+    debug = { }
     
     engine do
-      debug = { }
-      
       client = Remailer::IMAP::Client.open(
         TestConfig.options[:imap_server][:host],
         debug: self.debug_channel, 
-        connect: lambda { |success, host| connected_host = host }
+        connect: lambda { |_success, host| debug[:connected_host] = host }
       )
       
       assert client

data/test/unit/remailer_interpreter_test.rb

@@ -138,7 +138,7 @@ class RemailerInterpreterTest < MiniTest::Test
 
     interpreter = test_interpreter_class.new(delegate: delegate)
     
-    assert_equal nil, delegate.attribute
+    assert_nil delegate.attribute
     assert_equal false, delegate.triggered[:method_no_args]
     assert_equal false, delegate.triggered[:method_with_args]
     
@@ -236,7 +236,7 @@ class RemailerInterpreterTest < MiniTest::Test
     
     interpreter.process(line)
     
-    assert_equal nil, interpreter.lines[-1]
+    assert_nil interpreter.lines[-1]
     assert_equal "TEST", line
     
     line << "\0"
@@ -250,7 +250,7 @@ class RemailerInterpreterTest < MiniTest::Test
   def test_regexp_interpreter
     interpreter = RegexpInterpreter.new
     
-    assert_equal nil, interpreter.received
+    assert_nil interpreter.received
     
     line = "HELO example.com"
     
@@ -277,7 +277,7 @@ class RemailerInterpreterTest < MiniTest::Test
     assert_equal true, interpreter.interpret(:random)
     
     assert_equal :branch, interpreter.state
-    assert_equal nil, interpreter.error
+    assert_nil interpreter.error
     
     assert_equal :random, interpreter.reply
   end
@@ -299,7 +299,7 @@ class RemailerInterpreterTest < MiniTest::Test
   def test_new_with_block
     interpreter = InterpreterWithAccessor.new
     
-    assert_equal nil, interpreter.example
+    assert_nil interpreter.example
 
     interpreter = InterpreterWithAccessor.new do |interpreter|
       interpreter.example = 'example'

data/test/unit/remailer_smtp_client_interpreter_test.rb

@@ -1,13 +1,16 @@
 require_relative '../helper'
 
-class SMTPDelegate
-  attr_accessor :options, :protocol, :active_message
+class TestSMTPDelegate
+  attr_accessor :options, :protocol, :active_message, :auth_support
   attr_accessor :tls_support
   
   def initialize(options = { })
     @sent = [ ]
     @options = options
     @protocol = :smtp
+    @started_tls = false
+    @tls_support = nil
+    @closed = false
   end
   
   def hostname
@@ -57,6 +60,15 @@ class SMTPDelegate
   def read
     @sent.shift
   end
+
+  def auth_support?(type = nil)
+    case (type)
+    when nil
+      !!@auth_support
+    else
+      !!(@auth_support&.include?(type))
+    end
+  end
   
   def method_missing(*args)
   end
@@ -119,27 +131,27 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
   
   def test_delegate_default_state
-    delegate = SMTPDelegate.new
+    delegate = TestSMTPDelegate.new
 
     assert_equal false, delegate.closed?
-    assert_equal nil, delegate.read
+    assert_nil delegate.read
     assert_equal 0, delegate.size
   end
 
   def test_delegate_options
-    delegate = SMTPDelegate.new(use_tls: true)
+    delegate = TestSMTPDelegate.new(use_tls: true)
 
     assert_equal true, delegate.use_tls?
     assert_equal false, delegate.requires_authentication?
 
-    delegate = SMTPDelegate.new(username: 'test@example.com', password: 'tester')
+    delegate = TestSMTPDelegate.new(username: 'test@example.com', password: 'tester')
 
     assert_equal false, delegate.use_tls?
     assert_equal true, delegate.requires_authentication?
   end
 
   def test_standard_smtp_connection
-    delegate = SMTPDelegate.new
+    delegate = TestSMTPDelegate.new
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
@@ -162,7 +174,7 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
 
   def test_standard_smtp_connection_send_email
-    delegate = SMTPDelegate.new
+    delegate = TestSMTPDelegate.new
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
@@ -217,7 +229,7 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
   
   def test_standard_esmtp_connection
-    delegate = SMTPDelegate.new
+    delegate = TestSMTPDelegate.new
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
@@ -254,7 +266,7 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
   
   def test_multi_line_hello_response
-    delegate = SMTPDelegate.new(use_tls: true)
+    delegate = TestSMTPDelegate.new(use_tls: true)
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
@@ -276,7 +288,7 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
 
   def test_tls_connection_with_support
-    delegate = SMTPDelegate.new(use_tls: true)
+    delegate = TestSMTPDelegate.new(use_tls: true)
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
     
     assert_equal true, delegate.use_tls?
@@ -307,7 +319,7 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
 
   def test_tls_connection_without_support
-    delegate = SMTPDelegate.new(use_tls: true)
+    delegate = TestSMTPDelegate.new(use_tls: true)
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
@@ -322,7 +334,7 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
   end
 
   def test_basic_smtp_plaintext_auth_accepted
-    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    delegate = TestSMTPDelegate.new(username: 'tester@example.com', password: 'tester')
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
     
     assert delegate.requires_authentication?
@@ -347,14 +359,15 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
     assert_equal :ready, interpreter.state
   end
 
-  def test_basic_esmtp_plaintext_auth_accepted
-    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+  def test_basic_esmtp_auth_plain_accepted
+    delegate = TestSMTPDelegate.new(username: 'tester@example.com', password: 'tester')
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
     
     interpreter.process("250-mail.example.com Hello\r\n")
+    interpreter.process("250-AUTH PLAIN\r\n")
     interpreter.process("250 HELP\r\n")
     
     assert_equal false, delegate.started_tls?
@@ -367,17 +380,19 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
     assert_equal :ready, interpreter.state
   end
 
-  def test_basic_esmtp_plaintext_auth_rejected
-    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+  def test_basic_esmtp_auth_plain_rejected
+    delegate = TestSMTPDelegate.new(username: 'tester@example.com', password: 'tester')
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("220 mx.google.com ESMTP\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
     
     interpreter.process("250-mx.google.com at your service\r\n")
+    interpreter.process("250-AUTH PLAIN LOGIN\r\n")
     interpreter.process("250 HELP\r\n")
     
     assert_equal false, delegate.started_tls?
+    assert_equal %i[ plain login ], delegate.auth_support.to_a
 
     assert_equal :auth, interpreter.state
     assert_equal "AUTH PLAIN AHRlc3RlckBleGFtcGxlLmNvbQB0ZXN0ZXI=", delegate.read
@@ -395,8 +410,40 @@ class RemailerSMTPClientInterpreterTest < MiniTest::Test
     assert_equal true, delegate.closed?
   end
 
+  def test_basic_esmtp_auth_login_accepted
+    delegate = TestSMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
+
+    interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
+    assert_equal 'EHLO localhost.local', delegate.read
+    
+    interpreter.process("250-mail.example.com Hello\r\n")
+    interpreter.process("250-AUTH NTLM CRAM-MD5 GSSAPI LOGIN\r\n")
+    interpreter.process("250 HELP\r\n")
+    
+    assert_equal false, delegate.started_tls?
+    assert_equal %i[ ntlm cram-md5 gssapi login ], delegate.auth_support.to_a
+
+    assert_equal "AUTH LOGIN", delegate.read
+
+    assert_equal :auth_username, interpreter.state
+    interpreter.process("334 VXNlcm5hbWU6\r\n")
+    assert_equal Base64.strict_encode64('tester@example.com'), delegate.read
+
+    assert_equal :auth_password, interpreter.state
+
+    interpreter.process("334 UGFzc3dvcmQ6\r\n")
+    assert_equal Base64.strict_encode64('tester'), delegate.read
+
+    assert_equal :auth_acknowledge, interpreter.state
+    interpreter.process("235 Sounds good\r\n")
+
+    assert_equal :ready, interpreter.state
+  end
+
+
   def test_unexpected_response
-    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    delegate = TestSMTPDelegate.new(username: 'tester@example.com', password: 'tester')
     interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("530 Go away\r\n")

data/test/unit/remailer_smtp_client_test.rb

@@ -3,7 +3,6 @@ require_relative '../helper'
 class RemailerSMTPClientTest < MiniTest::Test
   def test_connect
     engine do
-      debug = { }
       connected_host = nil
 
       connection = Remailer::SMTP::Client.open(
@@ -31,7 +30,7 @@ class RemailerSMTPClientTest < MiniTest::Test
 
       assert_equal true, after_complete_trigger
 
-      assert_equal 35882577, connection.max_size
+      assert_equal 157286400, connection.max_size
       assert_equal :esmtp, connection.protocol
       assert_equal true, connection.tls_support?
     end
@@ -70,7 +69,7 @@ class RemailerSMTPClientTest < MiniTest::Test
     engine do
       error_received = nil
 
-      connection = Remailer::SMTP::Client.open(
+      Remailer::SMTP::Client.open(
         'invalid-example-domain--x.com',
         debug: self.debug_channel,
         error: lambda { |code, message|
@@ -89,8 +88,6 @@ class RemailerSMTPClientTest < MiniTest::Test
 
   def test_connect_with_auth
     engine do
-      debug = { }
-
       connection = Remailer::SMTP::Client.open(
         TestConfig.options[:smtp_server][:host],
         port: TestConfig.options[:smtp_server][:port] || Remailer::SMTP::Client::SMTP_PORT,
@@ -113,7 +110,7 @@ class RemailerSMTPClientTest < MiniTest::Test
         connection.closed?
       end
 
-      assert_equal TestConfig.options[:public_smtp_server][:identifier], connection.remote
+      assert_equal TestConfig.options[:smtp_server][:identifier], connection.remote
 
       assert_equal true, after_complete_trigger
 
@@ -125,8 +122,6 @@ class RemailerSMTPClientTest < MiniTest::Test
 
   def test_connect_via_proxy
     engine do
-      debug = { }
-
       connection = Remailer::SMTP::Client.open(
         TestConfig.options[:public_smtp_server][:host],
         debug: self.debug_channel,
@@ -154,7 +149,7 @@ class RemailerSMTPClientTest < MiniTest::Test
 
       assert_equal true, after_complete_trigger
 
-      assert_equal 35882577, connection.max_size
+      assert_equal 157286400, connection.max_size
       assert_equal :esmtp, connection.protocol
       assert_equal true, connection.tls_support?
     end

data/test/unit/remailer_smtp_server_test.rb

@@ -24,7 +24,7 @@ class RemailerSMTPServerTest < MiniTest::Test
       remote_ip = nil
     
       server = Remailer::SMTP::Server.bind(
-        nil,
+        '127.0.0.1',
         server_port,
         on_connect: lambda { |_remote_ip| remote_ip = _remote_ip }
       )
@@ -34,11 +34,13 @@ class RemailerSMTPServerTest < MiniTest::Test
       connected_host = nil
 
       client = Remailer::SMTP::Client.open(
-        'localhost',
+        '127.0.0.1',
         port: server_port,
         debug: self.debug_channel, 
         connect: lambda { |success, host| connected_host = host }
       )
+
+      assert client
       
       assert_eventually(30) do
         connected_host
@@ -56,17 +58,15 @@ class RemailerSMTPServerTest < MiniTest::Test
       transaction = nil
     
       server = Remailer::SMTP::Server.bind(
-        nil,
+        '127.0.0.1',
         server_port,
         on_transaction: lambda { |_transaction| transaction = _transaction }
       )
     
       assert server
       
-      connected_host = nil
-
       client = Remailer::SMTP::Client.open(
-        'localhost',
+        '127.0.0.1',
         port: server_port,
         debug: self.debug_channel
       )

data/test/unit/remailer_socks5_client_interpreter_test.rb

@@ -6,6 +6,7 @@ class SOCKS5Delegate
   def initialize(options = nil)
     @sent = [ ]
     @options = (options or { })
+    @closed = false
   end
   
   def resolve_hostname(hostname)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remailer
 version: !ruby/object:Gem::Version
-  version: 0.7.1.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Scott Tadman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,16 +66,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: EventMachine SMTP Mail User Agent
-email: scott@twg.ca
+description: EventMachine Mail Agent for SMTP and IMAP
+email: tadman@postageapp.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE.txt
 - README.md
 files:
 - ".document"
-- ".travis.yml"
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
@@ -104,7 +105,6 @@ files:
 - test/bin/exercise
 - test/config.example.yml
 - test/config.rb
-- test/config.yml.enc
 - test/helper.rb
 - test/unit/remailer_imap_client_interpreter_test.rb
 - test/unit/remailer_imap_client_test.rb
@@ -115,10 +115,10 @@ files:
 - test/unit/remailer_smtp_server_test.rb
 - test/unit/remailer_socks5_client_interpreter_test.rb
 - test/unit/remailer_test.rb
-homepage: http://github.com/twg/remailer
+homepage: http://github.com/postageapp/remailer
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,9 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Reactor-Ready SMTP Mailer
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-before_install:
-- openssl aes-256-cbc -K $encrypted_fdddf752110a_key -iv $encrypted_fdddf752110a_iv
-  -in test/config.yml.enc -out test/config.yml -d
-- gem install bundler
-rvm:
-- 1.9.3-p551
-- 2.0.0-p598
-- 2.1.5
-- 2.2.0