maildiode 0.2.1 → 0.2.3

data/README

@@ -22,7 +22,7 @@ FEATURES:
 4. Full unit test suite
 5. Runs in ruby SAFE mode for security
 
-NON-FEATURES:
+INTENTIONAL NON-FEATURES:
 1. No outgoing mail
 2. No TLS/SSL
 3. No filtering, greylisting, aliases, etc. in the core
@@ -71,11 +71,24 @@ INSTALLATION AND CONFIGURATION
 
   
 TODO
-- Allow integrating milters and/or other external filters
+- Replace generic plugin system with:
+    alias - given a recipient, returns a recipient; called for RCPT
+      (probably doesn't need to be a plugin)
+    envelope_rejector - can reject based on envelope; called
+      for HELO/EHLO, MAIL, and RCPT
+    header_rejector - can reject message delivery based on envelope
+      plus email headers
+    message_modifier - given an envelope and entire message,
+      returns an entire message
+    delivery - given a recipient an entire message, delivers it or
+      rejects it
+- Add rspec tests for each filter/plugin
 - Blacklist: Should allow filtering on from, subject, etc
 - Add debounce filter to reject bounces for mail we didn't send
 - Greylist: Implement greylisting IP exemptions
 - Greylist: Periodically clear out old database entries
+- Allow integrating milters and/or other external filters
+- Remove gurgitate dependency
 - Properly handle multiple recipients where some work and some fail
    (Reply OK but send bounces to the failures)
 - Add a return path header?

data/bin/maildiode

@@ -28,9 +28,9 @@ module MailDiode
 			@settings = settings
 		end
 		
-		def create_engine(hostname)
+		def create_engine(hostname, max_recipients)
 		
-			engine = Engine.new(hostname)
+			engine = Engine.new(hostname, max_recipients)
 			
 			engine.set_mail_handler(MaildirMessageHandler.new(@settings))
 			@plugins.each do | plugin |

data/lib/engine.rb

@@ -41,6 +41,7 @@ module MailDiode
     attr_accessor :helo
     attr_accessor :sender
     attr_accessor :recipient
+    attr_accessor :original_recipient
   end
   
   class Filter
@@ -81,11 +82,14 @@ module MailDiode
 
   # State machine that handles incoming SMTP commands
   class Engine
-    def initialize(hostname)
+    attr_reader :envelope
+    
+    def initialize(hostname, max_recipients)
       @hostname = hostname
       @greeting = "220 #{hostname} ESMTP"
       @helo_response = "250 #{hostname}"
       @filters = []
+      @max_recipients = max_recipients
     end
     
     def set_mail_handler(handler)
@@ -186,7 +190,7 @@ module MailDiode
       if(! @envelope)
         raise_smtp_error(SMTPError::NEED_MAIL_BEFORE_RCPT)
       end
-      if(@envelope.recipients.size >= 100)
+      if(@envelope.recipients.size >= @max_recipients)
         raise_smtp_error(SMTPError::TOO_MANY_RECIPIENTS)
       end
       recipient = enforce_address_arg(args, 'to', SMTPError::SYNTAX_RCPT)
@@ -222,6 +226,7 @@ module MailDiode
       filterable_data.helo = @helo
       filterable_data.sender = sender
       filterable_data.recipient = recipient
+      filterable_data.original_recipient = recipient
       @filters.each do | filter |
         if filter.respond_to? :process
           filter.process(filterable_data)

data/lib/server.rb

@@ -28,16 +28,14 @@ module MailDiode
 
       @factory = engine_factory
       super(@port, @ip, @max_connections)
+      @audit = true
     end
 
     def serve(client)
       begin
-        MailDiode::log_debug("Accepting client")
-        if(connections > 1)
-          MailDiode::log_info("Connections: #{connections}")
-        end
+        MailDiode::log_debug("serve")
         client.binmode
-        engine = @factory.create_engine(@hostname)
+        engine = @factory.create_engine(@hostname, @max_recipients)
         family, port, hostname, ip = client.addr
         greeting = engine.start(ip)
         MailDiode::log_debug("Greeting: #{greeting}")
@@ -56,9 +54,11 @@ module MailDiode
           end
         end
       rescue Errno::ECONNRESET
-        MailDiode::log_debug "Client dropped connection"
+        MailDiode::log_debug "Client reset connection"
       rescue Errno::ETIMEDOUT
         MailDiode::log_info "Client input timeout"
+      rescue Errno::ENOTCONN
+        MailDiode::log_info "Client dropped connection"
       rescue Exception => e
         MailDiode::log_error("Exception #{e.class}: #{e}")
         e.backtrace.each do | line |
@@ -66,8 +66,24 @@ module MailDiode
         end
         client << response("451 Internal Server Error")
       end
+
     end
-	  
+
+    def connecting(client)
+      log_new_connection(client)
+      true
+    end
+
+    def log_new_connection(client)
+      addr = client.peeraddr
+      show = "#{addr[1]} #{addr[2]}<#{addr[3]}>"
+      MailDiode::log_info("connecting: #{show} (#{connections})")
+    end
+
+    def disconnecting(clientPort)
+      MailDiode::log_info("disconnecting: #{clientPort} (#{connections})")
+    end
+    
     def get_line(input, timeout_seconds)
       line = nil
       t = Thread.new { line = input.gets(NEWLINE) }
@@ -76,11 +92,16 @@ module MailDiode
     end
 
     def discard_early_input(client)
-      while(client.ready?)
-        client.getc
+      t = Thread.new { consume_all_input(client) }
+      t.join(TIMEOUT_SECONDS)
+    end
+
+    def consume_all_input(input)
+      while(input.ready?)
+        input.getc
       end
     end
-      
+    
     def response(text)
       return "#{text}#{NEWLINE}"
     end
@@ -92,10 +113,12 @@ module MailDiode
       @port = settings.get_int('server', 'port', DEFAULT_PORT)
       @port.untaint
       @max_connections = settings.get_int('server', 'maxconnections', DEFAULT_MAX_CONNECTIONS)
+      @max_recipients = settings.get_int('server', 'maxrecipients', DEFAULT_MAX_RECIPIENTS)
 		end
 
     DEFAULT_PORT = 10025
-		DEFAULT_MAX_CONNECTIONS = 20 
+		DEFAULT_MAX_CONNECTIONS = 20
+		DEFAULT_MAX_RECIPIENTS = 5
 		TIMEOUT_SECONDS = 1200 # djb recommends 1200
 	end
 end

data/lib/settings.rb

@@ -51,15 +51,17 @@ module MailDiode
   end
   
 	class Settings
-		def initialize(config_file)
-			@settings = {}
-			File.foreach(config_file) do | line |
-				line = line.gsub(/#.*/, '').strip
-				if !line.empty?
-					component, keyword, args = line.split(' ', 3)
-					load_setting(component.downcase, keyword.downcase, args)
-				end
-			end
+		def initialize(config_file = nil)
+ 			@settings = {}
+ 			if(config_file)
+        File.foreach(config_file) do | line |
+          line = line.gsub(/#.*/, '').strip
+          if !line.empty?
+            component, keyword, args = line.split(' ', 3)
+            load_setting(component.downcase, keyword.downcase, args)
+          end
+        end
+      end
 		end
 		
 		def load_setting(component, keyword, args)

data/maildiode.conf.sample

@@ -5,6 +5,7 @@ server hostname localhost
 server ip 0.0.0.0
 server port 10025
 server maxconnections 20
+server maxrecipients 5
 #server user maildiode
 
 # Define some maildirs: name and location

data/test/alias_spec.rb

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+# Copyright 2007-2008 Kevin B. Smith
+# This file is part of MailDiode.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as 
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'spec'
+
+require 'util'
+require 'engine'
+require 'maildiode-plugins/alias'
+require 'settings'
+
+describe MailDiode::AliasFilter do
+  describe "Basic Settings" do
+    before(:each) do
+      settings = MailDiode::Settings.new
+      settings.load_setting('alias', 'from', 'to')
+      settings.load_setting('alias', 'alsofrom', 'to')
+      settings.load_setting('alias', '\d\d', 'digits')
+      @filter = MailDiode::AliasFilter.new(settings)
+      @filterable = MailDiode::FilterableData.new
+    end
+
+    it "should perform a simple alias replacement" do
+      @filterable.recipient = 'from'
+      @filter.process(@filterable)
+      @filterable.recipient.should == 'to'
+    end
+
+    it "should allow a second alias to the same destination" do
+      @filterable = MailDiode::FilterableData.new
+      @filterable.recipient = 'alsofrom'
+      @filter.process(@filterable)
+      @filterable.recipient.should == 'to'
+    end
+
+    it "should ignore case" do
+      @filterable.recipient = 'FROM'
+      @filter.process(@filterable)
+      @filterable.recipient.should == 'to'
+    end
+
+    it "should allow REGEXP aliases" do
+      @filterable = MailDiode::FilterableData.new
+      @filterable.recipient = '27'
+      @filter.process(@filterable)
+      @filterable.recipient.should == 'digits'
+    end
+
+    it "should not affect original_recipient" do
+      @filterable = MailDiode::FilterableData.new
+      @filterable.original_recipient = 'untouched'
+      @filterable.recipient = 'from'
+      @filter.process(@filterable)
+      @filterable.original_recipient.should == 'untouched'
+    end
+  end
+
+end

data/test/engine_spec.rb

@@ -0,0 +1,458 @@
+#!/usr/bin/env ruby
+
+# Copyright 2007-2008 Kevin B. Smith
+# This file is part of MailDiode.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as 
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'spec'
+
+require 'util'
+require 'engine'
+
+FAKE_IP = '10.10.10.10'
+FAKE_HOSTNAME = 'woohoo'
+MAX_RECIPIENTS = 7
+
+class DummyFilter < MailDiode::Filter
+	attr_accessor :reject
+	attr_accessor :reject_process
+	attr_accessor :alias
+	attr_reader :data
+	attr_reader :helo_text
+	attr_reader :mail_text
+	attr_reader :rcpt_text
+
+	def helo(host)
+		if(reject)
+			raise MailDiode::SMTPError.new(reject)
+		end
+    @helo_text = host
+	end
+
+	def mail(sender)
+		if(reject)
+			raise MailDiode::SMTPError.new(reject)
+		end
+    @mail_text = sender
+	end
+
+	def rcpt(recipient)
+		if(reject)
+			raise MailDiode::SMTPError.new(reject)
+		end
+    @rcpt_text = recipient
+	end
+	
+	def process(filterable_data)
+		if(reject_process)
+			raise MailDiode::SMTPError.new(reject_process)
+		end
+		filterable_data.recipient = @alias
+		@data = filterable_data
+	end
+end
+
+$SAMPLE_MAIL_ID = '12345'
+
+class DummyMailHandler < MailDiode::MailHandler
+	attr_reader :message_text
+	attr_accessor :reject
+	
+	def initialize
+		@to = []
+		valid = true
+	end
+	
+	def valid_recipient?(to_address)
+		return !reject
+	end
+	
+	def process_message(original_recipient, recipient, text_lines)
+		@message_text = text_lines
+		return $SAMPLE_MAIL_ID
+	end
+	
+	def message_without_first_line
+		return message_text.split("\r\n")[1..-1].join("\r\n")
+	end
+end
+
+describe MailDiode::Engine do
+  before(:each) do
+    MailDiode::set_log_level(Logger::WARN)
+    MailDiode::log_to_console
+    
+    @engine = MailDiode::Engine.new(FAKE_HOSTNAME, MAX_RECIPIENTS)
+    @handler = DummyMailHandler.new
+    @engine.set_mail_handler(@handler)
+    
+    @greeting = @engine.start(FAKE_IP)
+  end
+
+  describe "Normal Logging" do
+    it "should log nothing for a valid command" do
+      MailDiode::log_to_string
+      @engine.process_line('noop')
+      MailDiode::get_log.should == ''
+    end
+
+    it "should log nothing for a bad command" do
+      MailDiode::log_to_string
+      @engine.process_line('xxx')
+      MailDiode::get_log.should == ''
+    end
+  end
+
+  describe "Verbose Logging" do
+    it "should log every command when verbose" do
+      MailDiode::set_log_level(Logger::DEBUG)
+      MailDiode::log_to_string
+      @engine.process_line('noop')
+      (MailDiode::get_log.index('DEBUG')>0).should == true
+    end
+  end
+
+  describe "Greeting" do
+    it "should start its greeting with 220" do
+      @greeting.should == "220 #{FAKE_HOSTNAME} ESMTP"
+    end
+
+    it "should include hostname in its greeting" do
+      @greeting.index(FAKE_HOSTNAME).should_not == nil
+    end
+  end
+
+  describe "Unknown commands" do
+    it "should reject a blank command" do
+      @engine.process_line('').index(MailDiode::SMTPError::BAD_COMMAND).should == 0
+    end
+
+    it "should reject an unknown command" do
+      @engine.process_line('xxx').index(MailDiode::SMTPError::BAD_COMMAND).should == 0
+    end
+  end
+
+  describe "Commands" do
+    describe "NOOP" do
+      it "should allow NOOP in upper or mixed or lower case" do
+        @engine.process_line('NOOP').should == MailDiode::RESULT_OK
+        @engine.process_line('Noop').should == MailDiode::RESULT_OK
+        @engine.process_line('noop').should == MailDiode::RESULT_OK
+      end
+
+      it "should allow trailing space" do
+        @engine.process_line('noop ').should == MailDiode::RESULT_OK
+      end
+
+      it "should disallow a parameter for NOOP" do
+        @engine.process_line('noop x').should == MailDiode::SMTPError::SYNTAX_NOOP
+      end
+    end
+
+    describe "QUIT" do
+      it "should say BYE in response to QUIT" do
+        @engine.process_line('quit').should == MailDiode::RESULT_BYE
+      end
+      
+      it "should terminate after getting a QUIT" do
+        @engine.should_not be_terminate
+        @engine.process_line('quit')
+        @engine.should be_terminate
+      end
+      
+      it "should disallow a parameter for QUIT" do
+        @engine.process_line('quit x').should == MailDiode::SMTPError::SYNTAX_QUIT
+      end
+    end
+
+    describe "HELO without parameters" do
+      it "should disallow HELO and EHLO without a parameter" do
+        @engine.process_line('helo').should == MailDiode::SMTPError::SYNTAX_HELO
+        @engine.process_line('ehlo').should == MailDiode::SMTPError::SYNTAX_HELO
+      end
+    end
+    
+    describe "HELO" do
+      it "should reply with 250 to a simple HELO" do
+         @engine.process_line('helo localhost').index('250').should == 0
+      end
+
+      it "should reply the same for each HELO or EHLO" do
+        reply = @engine.process_line('helo localhost')
+        @engine.process_line('helo other').should == reply
+        @engine.process_line('ehlo 1.2.3.4').should == reply
+        @engine.process_line('helo some.domain.name').should == reply
+      end
+
+      it "should allow tab before parameter" do
+        @engine.process_line("helo\tx").index('250').should == 0
+      end
+  
+    end
+
+    describe "RSET" do
+      it "should allow a simple initial RSET" do
+        @engine.process_line('rset').should == MailDiode::RESULT_OK
+      end
+
+      it "should disallow a parameter for RSET" do
+        @engine.process_line('rset x').should == MailDiode::SMTPError::SYNTAX_RSET
+      end
+
+      it "should clear FROM when it gets a RSET" do
+        @engine.process_line('mail From:<sender@example.com>')
+        @engine.process_line('rset')
+        result = @engine.process_line('rcpt To:<recipient@example.com>')
+        result.should == MailDiode::SMTPError::NEED_MAIL_BEFORE_RCPT
+      end
+    end
+
+    describe "VRFY" do
+      it "should disallow VRFY without a parameter" do
+        @engine.process_line('vrfy').should == MailDiode::SMTPError::SYNTAX_VRFY
+      end
+
+      it "should respond with UNSURE for any VRFY request" do
+        @engine.process_line('vrfy anything').should == MailDiode::RESULT_UNSURE
+      end
+    end
+
+    describe "MAIL" do
+      before(:each) do
+        @valid_sender = "correct@example.com"
+      end
+      
+      it "should disallow MAIL with no parameters" do
+        @engine.process_line('mail').should == MailDiode::SMTPError::SYNTAX_MAIL
+      end
+      it "should disallow MAIL without from:" do
+        @engine.process_line('mail foo').should == MailDiode::SMTPError::SYNTAX_MAIL
+      end
+      it "should disallow MAIL that doesn't specify an address after from:" do
+        @engine.process_line('mail from:').should == MailDiode::SMTPError::SYNTAX_MAIL
+      end
+
+      it "should allow mail from:address" do
+        result = @engine.process_line("mail From:#{@valid_sender}")
+        result.should == MailDiode::RESULT_OK
+        @engine.envelope.sender.should == @valid_sender
+      end
+
+      it "should strip < > from around sender email" do
+        @engine.process_line("mail From:<#{@valid_sender}>")
+        @engine.envelope.sender.should == @valid_sender
+      end
+      
+      it "should allow space between from: and the sender" do
+        @engine.process_line("mail From: #{@valid_sender}").should == MailDiode::RESULT_OK
+      end
+
+      it "should allow a second MAIL command in a row" do
+        @engine.process_line('mail From:Someone')
+        result = @engine.process_line("mail From:#{@valid_sender}")
+        result.should == MailDiode::RESULT_OK
+        @engine.envelope.sender.should == @valid_sender
+      end
+    end
+
+    describe "RCPT before MAIL" do
+      it "should disallow RCPT if no sender has been specified" do
+        @engine.process_line('rcpt To:<correct@example.com>').should == MailDiode::SMTPError::NEED_MAIL_BEFORE_RCPT
+      end
+    end
+
+    describe "RCPT" do
+      before(:each) do
+        @valid_recipient = 'correct@example.com'
+        @engine.process_line('mail From:Someone')
+        @engine.envelope.recipients.size.should == 0
+      end
+          
+      it "should disallow RCPT with no parameters" do
+        @engine.process_line('rcpt').should == MailDiode::SMTPError::SYNTAX_RCPT
+      end
+      it "should disallow RCPT without to:" do
+        @engine.process_line('rcpt foo').should == MailDiode::SMTPError::SYNTAX_RCPT
+      end
+      it "should disallow RCPT that doesn't specify an address after to:" do
+        @engine.process_line('rcpt to:').should == MailDiode::SMTPError::SYNTAX_RCPT
+      end
+
+      it "should allow RCPT to:address" do
+        result = @engine.process_line("rcpt To:#{@valid_recipient}")
+        result.should == MailDiode::RESULT_OK
+        @engine.envelope.recipients.size.should == 1
+        @engine.envelope.recipients[0].should == @valid_recipient
+      end
+      
+      it "should allow space after to: in RCPT" do
+        result = @engine.process_line("rcpt To: #{@valid_recipient}")
+        result.should == MailDiode::RESULT_OK
+        @engine.envelope.recipients.size.should == 1
+        @engine.envelope.recipients[0].should == @valid_recipient
+      end
+
+      it "should remove < > from recipient address" do
+        result = @engine.process_line("rcpt To:<#{@valid_recipient}>")
+        result.should == MailDiode::RESULT_OK
+        @engine.envelope.recipients.size.should == 1
+        @engine.envelope.recipients[0].should == @valid_recipient
+      end
+
+      it "should clear recipients when a second FROM is processed" do
+        @engine.process_line("rcpt To:#{@valid_recipient}")
+        @engine.process_line('mail From:Someone')
+        @engine.envelope.recipients.size.should == 0
+      end
+
+      it "should fail if there are too many recipients" do
+        (MAX_RECIPIENTS-1).times do
+          @engine.process_line("rcpt To:#{@valid_recipient}")
+        end
+        @engine.process_line("rcpt To:#{@valid_recipient}").should == MailDiode::RESULT_OK
+        @engine.process_line("rcpt To:#{@valid_recipient}").should == MailDiode::SMTPError::TOO_MANY_RECIPIENTS
+      end
+    end
+
+    describe "DATA before RCPT" do
+      it "should disallow DATA before RCPT" do
+        @engine.process_line('data').should == MailDiode::SMTPError::NEED_RCPT_BEFORE_DATA
+      end
+    end
+
+    describe "DATA" do
+      before(:each) do
+        @engine.process_line('mail From:Someone')
+        @engine.process_line("rcpt To:Someone")
+      end
+
+      it "should disallow DATA with a parameter" do
+        @engine.process_line('data xxx').should == MailDiode::SMTPError::SYNTAX_DATA
+      end
+
+      it "should allow lines of message text after DATA" do
+        @engine.process_line('data').should == MailDiode::RESULT_DATA_OK
+        @engine.process_line('This is message data').should == nil
+        @engine.process_line('Second line').should == nil
+        @engine.process_line('.').should == "#{MailDiode::RESULT_OK} #{$SAMPLE_MAIL_ID}"
+      end
+
+      it "should allow escaped dot at start of message text line" do
+        @engine.process_line('data')
+        line_with_dot = '..Line with a dot'
+        @engine.process_line(line_with_dot)
+        @engine.process_line('.')
+        @handler.message_without_first_line.should == line_with_dot[1..-1]
+      end
+
+      it "should reset sender after data" do
+        @engine.process_line('data')
+        @engine.process_line('.')
+        @engine.process_line('data').should == MailDiode::SMTPError::NEED_RCPT_BEFORE_DATA
+      end
+    end
+  end
+
+  describe "Filter" do
+    before(:each) do
+      @filter = DummyFilter.new
+      @engine.add_filter(@filter)
+    end
+
+    it "should call filter#helo for HELO/EHLO" do
+      host = 'test'
+      @engine.process_line("helo #{host}")
+      @filter.helo_text.should == host
+      host = 'another'
+      @engine.process_line("ehlo #{host}")
+      @filter.helo_text.should == host
+    end
+
+    it "should allow filter to reject HELO" do
+      @filter.reject = "450 Try Later"
+      @engine.process_line('helo test').should == @filter.reject
+    end
+
+    it "should call filter#mail for MAIL" do
+      sender = 'someone'
+      @engine.process_line("mail from:#{sender}")
+      @filter.mail_text.should == sender
+    end
+
+    it "should allow filter to reject MAIL" do
+      @filter.reject = "450 Try Later"
+      @engine.process_line('mail from: test').should == @filter.reject
+    end
+
+    it "should not call filter#process for MAIL command" do
+      @engine.process_line('mail From:<sender@example.com>')
+      @filter.data.should == nil
+    end
+
+    it "should call filter#rcpt for RCPT" do
+      recipient = 'whoever'
+      @engine.process_line("mail from:someone")
+      @engine.process_line("rcpt to:#{recipient}").should == MailDiode::RESULT_OK
+      @filter.rcpt_text.should == recipient
+    end
+
+    it "should allow filter to reject RCPT" do
+      @engine.process_line('mail From:<sender@example.com>')
+      @filter.reject = "450 Try Later"
+      @engine.process_line('rcpt To:<recipient@example.com>').should == @filter.reject
+    end
+
+    it "should call filter#process for RCPT command" do
+      sender = 'sender@example.com'
+      @filter.alias = 'real_recipient'
+      recipient = 'recipient@example.com'
+      @engine.process_line("mail From:#{sender}")
+      @engine.process_line("rcpt To:#{recipient}")
+      @filter.data.sender_ip == FAKE_IP
+      @filter.data.helo == FAKE_HOSTNAME
+      @filter.data.sender.should == sender
+      @filter.data.recipient.should == @filter.alias
+      @filter.data.original_recipient.should == recipient
+    end
+
+    it "should allow filter#process to reject" do
+      @engine.process_line('mail From:<sender@example.com>')
+      @filter.reject_process = "450 Try process Later"
+      @engine.process_line('rcpt To:<recipient@example.com>').should == @filter.reject_process
+    end
+  end
+
+  describe "Mail Handler" do
+    it "should pass the message to the handler" do
+      @engine.process_line('mail From:<sender@example.com>')
+      @engine.process_line('rcpt To:<recipient@example.com>')
+
+      sample_text = ['First line', 'Second', '', ' . not a dot line', 'After blank']
+      @engine.process_line('DATA')
+      sample_text.each do | line |
+        @engine.process_line(line)
+      end
+      @engine.process_line('.').index(MailDiode::RESULT_OK).should == 0
+      @handler.message_without_first_line.should == sample_text.join("\r\n")
+    end
+
+    it "should allow message handler to reject RCPT" do
+      address = 'sender@example.com'
+      @handler.reject = true
+      @engine.process_line("mail From:Someone")
+      error = "#{MailDiode::SMTPError::UNKNOWN_RECIPIENT}: #{address}"
+      @engine.process_line("rcpt To:#{address}").should == error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maildiode
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Kevin Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 -05:00
+date: 2009-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,8 +52,8 @@ files:
 - lib/maildiode-plugins/alias.rb
 - lib/maildiode-plugins/blacklist.rb
 - lib/maildiode-plugins/delay.rb
-- test/test_engine.rb
-- test/test_suite.rb
+- test/alias_spec.rb
+- test/engine_spec.rb
 - maildiode.conf.sample
 - README
 - COPYING
@@ -85,4 +85,5 @@ signing_key:
 specification_version: 2
 summary: MailDiode is a simple incoming SMTP server daemon.
 test_files: 
-- test/test_suite.rb
+- test/engine_spec.rb
+- test/alias_spec.rb

data/test/test_engine.rb

@@ -1,239 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright 2007-2008 Kevin B. Smith
-# This file is part of MailDiode.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3, as 
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require 'test/unit'
-require 'stringio'
-
-require 'util'
-require 'engine'
-
-FAKE_IP = '10.10.10.10'
-
-class DummyFilter < MailDiode::Filter
-	attr_accessor :reject
-	attr_reader :data
-	
-	def process(filterable_data)
-		if(reject)
-			raise MailDiode::SMTPError.new(reject)
-		end
-		@data = filterable_data
-	end
-end
-
-class DummyMailHandler < MailDiode::MailHandler
-	attr_reader :message_text
-	attr_accessor :reject
-	
-	SAMPLE_ID = '12345'
-	
-	def initialize
-		@to = []
-		valid = true
-	end
-	
-	def valid_recipient?(to_address)
-		return !reject
-	end
-	
-	def process_message(recipient, text_lines)
-		@message_text = text_lines
-		return SAMPLE_ID
-	end
-	
-	def message_without_first_line
-		return message_text.split("\r\n")[1..-1].join("\r\n")
-	end
-end
-	
-class TestEngine < Test::Unit::TestCase
-  def setup
-    MailDiode::set_log_level(Logger::WARN)
-    MailDiode::log_to_console
-    
-    @engine = MailDiode::Engine.new('woohoo')
-    @handler = DummyMailHandler.new
-    @engine.set_mail_handler(@handler)
-    
-    @greeting = @engine.start(FAKE_IP)
-  end
-
-  def teardown
-  end
-  
-  def test_greeting
-    assert_equal(0, @greeting.index('220 '), "Missing 220?")
-    assert_match('woohoo', @greeting, "missing hostname?")
-  end
-
-  def test_unknown_commands
-    assert_equal(0, @engine.process_line('').index(MailDiode::SMTPError::BAD_COMMAND), "Blank cmd accepted?")
-    assert_equal(0, @engine.process_line('xxx').index(MailDiode::SMTPError::BAD_COMMAND), "Bogus cmd accepted?")
-  end
-  
-  def test_noop
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('noop'), "noop failed?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_NOOP, @engine.process_line('noop x'), "noop allowed a parameter?")
-  end
-  
-  def test_quit
-    assert(!@engine.terminate?, 'terminating before QUIT?')
-    assert_equal(MailDiode::RESULT_BYE, @engine.process_line('quit'), "didn't say bye?")
-    assert(@engine.terminate?, 'not terminating after QUIT?')
-    assert_equal(MailDiode::SMTPError::SYNTAX_QUIT, @engine.process_line('quit x'), "quit allowed a parameter?")
-  end
-  
-  def test_helo
-    assert_equal(MailDiode::SMTPError::SYNTAX_HELO, @engine.process_line('helo'), "helo without arg worked?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_HELO, @engine.process_line('ehlo'), "ehlo without arg worked?")
-
-  	helo_result = @engine.process_line('helo localhost')
-    assert_equal(0, helo_result.index('250'), "helo failed?")
-    assert_equal(helo_result, @engine.process_line('helo localhost'), "second helo failed?")
-    assert_equal(helo_result, @engine.process_line('ehlo localhost'), "ehlo failed?")
-    assert_equal(helo_result, @engine.process_line('ehlo [1.2.3.4]'), "ehlo failed?")
-    assert_equal(helo_result, @engine.process_line('ehlo winnie.the.poo'), "ehlo failed?")
-  end
-  
-  def test_rset
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('rset'), "rset failed?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_RSET, @engine.process_line('rset x'), "rset allowed a parameter?")
-
-    @engine.process_line('mail From:<sender@example.com>')
-    @engine.process_line('rset')
-    assert_equal(MailDiode::SMTPError::NEED_MAIL_BEFORE_RCPT, @engine.process_line('rcpt To:<recipient@example.com>'), "rset didn't clear from?")
-  end
-  
-  def test_vrfy
-    assert_equal(MailDiode::SMTPError::SYNTAX_VRFY, @engine.process_line('vrfy'), "vrfy without arg worked?")
-
-    assert_equal(MailDiode::RESULT_UNSURE, @engine.process_line('vrfy anything'), "vrfy failed?")
-  end
-
-  def test_mail
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('mail From:<correct@example.com>'), "mail rejected good from?")
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('mail From: <correct@example.com>'), "mail rejected because of space after from?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_MAIL, @engine.process_line('mail'), "mail without arg worked?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_MAIL, @engine.process_line('mail foo'), "mail without From: worked?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_MAIL, @engine.process_line('mail from:'), "mail without from arg worked?")
-  end
-
-  def test_rcpt
-    assert_equal(MailDiode::SMTPError::NEED_MAIL_BEFORE_RCPT, @engine.process_line('rcpt To:<correct@example.com>'), "rcpt before mail worked?")
-
-    @engine.process_line('mail From:<correct@example.com>')
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('rcpt To:<correct@example.com>'), "mail rejected good from?")
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('rcpt To: <correct@example.com>'), "mail rejected because of space after to?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_RCPT, @engine.process_line('rcpt'), "mail without arg worked?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_RCPT, @engine.process_line('rcpt foo'), "mail without To: worked?")
-    assert_equal(MailDiode::SMTPError::SYNTAX_RCPT, @engine.process_line('rcpt to:'), "mail without to arg worked?")
-    
-    @engine.process_line('mail From:<correct@example.com>')
-    99.times do
-      @engine.process_line('rcpt To:<correct@example.com>')
-    end
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('rcpt To:<correct@example.com>'), "100th recipient rejected?")
-    assert_equal(MailDiode::SMTPError::TOO_MANY_RECIPIENTS, @engine.process_line('rcpt To:<correct@example.com>'), "101st recipient not rejected?")
-  end
-  
-  def test_data
-    assert_equal(MailDiode::SMTPError::NEED_RCPT_BEFORE_DATA, @engine.process_line('data'), "data before rcpt worked?")
-
-    @engine.process_line('mail From:<sender@example.com>')
-    @engine.process_line('rcpt To:<recipient@example.com>')
-    assert_equal(MailDiode::SMTPError::SYNTAX_DATA, @engine.process_line('data xxx'), "data with arg accepted?")
-    assert_equal(MailDiode::RESULT_DATA_OK, @engine.process_line('data'), "data rejected?")
-    assert_equal(nil, @engine.process_line('This is message data'), "responded to message data?")
-    @engine.process_line('Second line')
-    assert_equal(0, @engine.process_line('.').index(MailDiode::RESULT_OK), "didn't pretend to save?")
-  end
-
-
-
-
-
-  def test_filter
-    filter = DummyFilter.new
-    @engine.add_filter(filter)
-    @engine.process_line('mail From:<sender@example.com>')
-    @engine.process_line('rcpt To:<recipient@example.com>')
-    assert_equal('sender@example.com', filter.data.sender, "didn't call handler validate_sender?")
-    assert_equal('recipient@example.com', filter.data.recipient, "didn't call handler validate_recipient?")
-
-    filter.reject = "450 Try Later"
-    assert_equal(filter.reject, @engine.process_line('rcpt To:<recipient@example.com>'), "filter rejection not propagated?")
-  end
-  
-  def test_mail_handler
-    @engine.process_line('mail From:<sender@example.com>')
-    @engine.process_line('rcpt To:<recipient@example.com>')
-
-    sample_text = ['First line', 'Second', '', ' . not a dot line', 'After blank']
-    @engine.process_line('DATA')
-    sample_text.each do | line |
-      @engine.process_line(line)
-    end
-    assert_equal(0, @engine.process_line('.').index(MailDiode::RESULT_OK), "handler didn't accept?")
-    assert_equal(sample_text.join("\r\n"), @handler.message_without_first_line, "bad message data?")
-    
-    assert_equal(MailDiode::SMTPError::NEED_RCPT_BEFORE_DATA, @engine.process_line('data'), "didn't reset after .?")
-
-    MailDiode::set_log_level(Logger::INFO)
-    MailDiode::log_to_string
-	
-    @handler.reject = true
-    @engine.process_line('mail From:<sender@example.com>')
-    assert_equal(MailDiode::SMTPError::UNKNOWN_RECIPIENT, @engine.process_line('rcpt To:<recipient@example.com>'), "reject to not propagated?")
-  end
-  
-  def test_dot_in_data
-    @engine.process_line('mail From:<sender@example.com>')
-    @engine.process_line('rcpt To:<recipient@example.com>')
-    @engine.process_line('data')
-    line_with_dot = '..Line with a dot'
-    @engine.process_line(line_with_dot)
-    @engine.process_line('.')
-    assert_equal(line_with_dot[1..-1], @handler.message_without_first_line, "didn't unescape the dot?")
-  end
-  
-  def test_args
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('noop '), "choked on trailing space?")
-    assert_equal(0, @engine.process_line("helo\tx").index('250'), "choked on tab?")
-  end
-  
-  def test_case_insensitive_commands
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('noop'), "lower case failed?")
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('NOOP'), "upper case failed?")
-    assert_equal(MailDiode::RESULT_OK, @engine.process_line('nOOp'), "mixed case failed?")
-  end
-
-  def test_normal_logging
-    MailDiode::log_to_string
-    @engine.process_line('noop')
-    assert_equal('', MailDiode::get_log)
-    MailDiode::clear_log
-    @engine.process_line('xxx')
-    assert_equal('', MailDiode::get_log)
-  end
-  
-  def test_verbose_logging
-    MailDiode::set_log_level(Logger::INFO)
-    MailDiode::log_to_string
-    @engine.process_line('noop')
-    assert(MailDiode::get_log.index('INFO'))
-  end  
-end

data/test/test_suite.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright 2007-2008 Kevin B. Smith
-# This file is part of MailDiode.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3, as 
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require 'test/unit'
-
-require 'test_engine.rb'