remailer 0.4.19 → 0.4.20

data/VERSION

@@ -1 +1 @@
-0.4.19
+0.4.20

data/lib/remailer/connection/smtp_interpreter.rb

@@ -27,7 +27,7 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
 
   # Encodes a string in Base64 as a single line
   def self.base64(string)
-    [ string.to_s ].pack('m').chomp
+    [ string.to_s ].pack('m').gsub(/\n/, '')
   end
   
   # == State Mapping ========================================================
@@ -102,7 +102,7 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
       end
 
       unless (continues)
-        if (delegate.use_tls? and delegate.tls_support?)
+        if (delegate.use_tls? and delegate.tls_support? and !@tls)
           enter_state(:starttls)
         elsif (delegate.requires_authentication?)
           enter_state(:auth)
@@ -111,6 +111,13 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
         end
       end
     end
+    
+    interpret(500..599) do |result_code|
+      # RFC1869 suggests trying HELO if EHLO results in some kind of error,
+      # typically 5xx, but the actual code varies wildly depending on server.
+      delegate.protocol = :smtp
+      enter_state(:helo)
+    end
   end
   
   state :starttls do
@@ -120,8 +127,14 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
     
     interpret(220) do
       delegate.start_tls
+      @tls = true
       
-      enter_state(:re_helo)
+      case (delegate.protocol)
+      when :esmtp
+        enter_state(:ehlo)
+      else
+        enter_state(:helo)
+      end
     end
   end
 
@@ -195,9 +208,10 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
     end
     
     interpret(220) do
-      # "HELO/EHLO command already issued"
       if (delegate.requires_authentication?)
         enter_state(:auth)
+      elsif (delegate.active_message)
+        enter_state(:mail_from)
       else
         enter_state(:established)
       end
@@ -290,6 +304,11 @@ class Remailer::Connection::SmtpInterpreter < Remailer::Interpreter
     interpret(221) do
       enter_state(:terminated)
     end
+    
+    interpret(502) do
+      # "502 5.5.2 Error: command not recognized"
+      enter_state(:terminated)
+    end
   end
   
   state :terminated do

data/remailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "remailer"
-  s.version = "0.4.19"
+  s.version = "0.4.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = "2011-10-19"
+  s.date = "2011-11-02"
   s.description = "EventMachine SMTP Mail User Agent"
   s.email = "scott@twg.ca"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remailer
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.4.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2154425060 !ruby/object:Gem::Requirement
+  requirement: &2153998580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154425060
+  version_requirements: *2153998580
 description: EventMachine SMTP Mail User Agent
 email: scott@twg.ca
 executables: []