remailer 0.5.2 → 0.9.1

data/test/unit/remailer_smtp_server_test.rb

@@ -1,9 +1,15 @@
-require File.expand_path('../helper', File.dirname(__FILE__))
+require_relative '../helper'
+
+class RemailerSMTPServerTest < MiniTest::Test
+  def random_server_port
+    @server_port ||= 9000 + rand(4096)
+
+    @server_port += 1
+  end
 
-class RemailerSMTPServerTest < Test::Unit::TestCase
   def test_bind
     engine do
-      server_port = 8025
+      server_port = random_server_port
       
       server = Remailer::SMTP::Server.bind(nil, server_port)
       
@@ -13,14 +19,14 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
 
   def test_connect
     engine do
-      server_port = 8025
+      server_port = random_server_port
 
       remote_ip = nil
     
       server = Remailer::SMTP::Server.bind(
-        nil,
+        '127.0.0.1',
         server_port,
-        :on_connect => lambda { |_remote_ip| remote_ip = _remote_ip }
+        on_connect: lambda { |_remote_ip| remote_ip = _remote_ip }
       )
     
       assert server
@@ -28,11 +34,13 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
       connected_host = nil
 
       client = Remailer::SMTP::Client.open(
-        'localhost',
-        :port => server_port,
-        :debug => STDERR, 
-        :connect => lambda { |success, host| connected_host = host }
+        '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
@@ -45,24 +53,22 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
 
   def test_transaction
     engine do
-      server_port = 8025
+      server_port = random_server_port
 
       transaction = nil
     
       server = Remailer::SMTP::Server.bind(
-        nil,
+        '127.0.0.1',
         server_port,
-        :on_transaction => lambda { |_transaction| transaction = _transaction }
+        on_transaction: lambda { |_transaction| transaction = _transaction }
       )
     
       assert server
       
-      connected_host = nil
-
       client = Remailer::SMTP::Client.open(
-        'localhost',
-        :port => server_port,
-        :debug => STDERR
+        '127.0.0.1',
+        port: server_port,
+        debug: self.debug_channel
       )
       
       sender = 'sender@example.com'.freeze

data/test/unit/remailer_socks5_client_interpreter_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class SOCKS5Delegate
   attr_reader :options
@@ -6,6 +6,7 @@ class SOCKS5Delegate
   def initialize(options = nil)
     @sent = [ ]
     @options = (options or { })
+    @closed = false
   end
   
   def resolve_hostname(hostname)
@@ -52,15 +53,15 @@ class SOCKS5Delegate
   end
 end
 
-class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
+class RemailerSOCKS5ClientInterpreterTest < MiniTest::Test
   def test_defaults
     delegate = SOCKS5Delegate.new(
-      :proxy => {
-        :host => 'example.net'
+      proxy: {
+        host: 'example.net'
       }
     )
 
-    interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: delegate)
     
     assert_equal :initialized, interpreter.state
     assert_equal false, delegate.closed?
@@ -68,13 +69,13 @@ class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
   
   def test_simple_connection
     delegate = SOCKS5Delegate.new(
-      :host => '1.2.3.4',
-      :port => 4321,
-      :proxy => {
-        :host => 'example.net'
+      host: '1.2.3.4',
+      port: 4321,
+      proxy: {
+        host: 'example.net'
       }
     )
-    interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: delegate)
     
     assert_equal :initialized, interpreter.state
     assert_equal false, delegate.closed?
@@ -121,4 +122,64 @@ class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
     
     assert_equal :connected, interpreter.state
   end
+
+  def test_combined_socks5_smtp
+    delegate = SOCKS5Delegate.new(
+      host: '1.2.3.4',
+      port: 4321,
+      proxy: {
+        host: 'example.net'
+      }
+    )
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: delegate)
+    
+    assert_equal :initialized, interpreter.state
+    assert_equal false, delegate.closed?
+    
+    sent = delegate.read
+    
+    assert_equal 2, sent.length
+    
+    assert_equal [ Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION, 0 ], sent.unpack('CC')
+    
+    reply = [
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_METHOD[:no_auth]
+    ].pack('CC')
+    
+    interpreter.process(reply)
+    
+    assert_equal false, interpreter.error?
+    assert_equal :connect_through_proxy, interpreter.state
+    assert_equal '', reply
+    
+    sent = delegate.read
+
+    assert sent, "No data received"
+    assert_equal 10, sent.length
+    
+    assert_equal [
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_COMMAND[:connect],
+      0,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
+      [ 1, 2, 3, 4 ].pack('CCCC'),
+      4321
+    ], sent.unpack('CCCCA4n')
+
+    buffer = [
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      0, # No error
+      0,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
+      [ 1, 2, 3, 4 ].pack('CCCC'),
+      4321
+    ].pack('CCCCA4n') + '421 Welcome to an ESTMP Server'
+
+    interpreter.process(buffer)
+
+    assert_equal '421 Welcome to an ESTMP Server', buffer
+    
+    assert_equal :connected, interpreter.state
+  end
 end

data/test/unit/remailer_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerTest < Test::Unit::TestCase
+class RemailerTest < MiniTest::Test
   def test_module_loaded
     assert Remailer
   end

metadata

@@ -1,41 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: remailer
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - Scott Tadman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: EventMachine SMTP Mail User Agent
-email: scott@twg.ca
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: juwelier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: EventMachine Mail Agent for SMTP and IMAP
+email: tadman@postageapp.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- LICENSE.txt
+- README.md
 files:
-- .document
-- README.rdoc
+- ".document"
+- Gemfile
+- LICENSE.txt
+- README.md
 - Rakefile
 - VERSION
 - lib/remailer.rb
@@ -60,7 +102,9 @@ files:
 - 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
@@ -71,28 +115,26 @@ 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: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.4
+signing_key:
+specification_version: 4
 summary: Reactor-Ready SMTP Mailer
 test_files: []

data/test/config.example.rb

@@ -1,17 +0,0 @@
-TestConfig.smtp_server = {
-  :host => "smtp.example.com",
-  :identifier => "smtp.example.com"
-} 
-
-TestConfig.public_smtp_server = {
-  :host => "smtp.gmail.com",
-  :identifier => "mx.google.com",
-  :username => "--your--username--gmail.com",
-  :password => "--your--password--",
-  :port => 587
-}
-
-TestConfig.proxy_server = "proxy.example.com"
-
-TestConfig.recipient = "--your--email--"
-TestConfig.sender = "--your--email--"