maildiode 0.2.3 → 0.2.5

data/lib/engine.rb

@@ -83,6 +83,9 @@ module MailDiode
   # State machine that handles incoming SMTP commands
   class Engine
     attr_reader :envelope
+    attr_accessor :max_data_lines
+
+    MAX_ALLOWED_REJECTS = 1
     
     def initialize(hostname, max_recipients)
       @hostname = hostname
@@ -90,6 +93,8 @@ module MailDiode
       @helo_response = "250 #{hostname}"
       @filters = []
       @max_recipients = max_recipients
+      @rejected_count = 0
+      @max_data_lines = 1000000
     end
     
     def set_mail_handler(handler)
@@ -112,11 +117,14 @@ module MailDiode
         end
         
         command, args = extract_args(line)
-            result = process_command(command, args)
-            MailDiode::log_success(command, args, result)
-            return result
+        result = process_command(command, args)
+        MailDiode::log_success(command, args, result)
+        return result
       rescue SMTPError => error
     		MailDiode.log_info(error.text)
+    		if(error.text.index(SMTPError::TOO_MANY_REJECTS) == 0)
+    		  @should_terminate = true
+    		end
         return error.text
       end
 
@@ -201,6 +209,10 @@ module MailDiode
       end
       filterable_data = apply_filters(@envelope.sender, recipient)
       if !@mail_handler.valid_recipient?(filterable_data.recipient)
+        if @rejected_count >= MAX_ALLOWED_REJECTS
+          raise_smtp_error(SMTPError::TOO_MANY_REJECTS)
+        end
+        @rejected_count += 1
         raise_smtp_error(SMTPError::UNKNOWN_RECIPIENT + ": " + recipient)
       end
       @envelope.add_recipient(recipient)
@@ -244,6 +256,9 @@ module MailDiode
         line = line[1..-1]
       end
       
+      if @message_text.size >= max_data_lines
+        raise_smtp_error(SMTPError::MESSAGE_TOO_LONG)
+      end
       @message_text << line
       return nil
     end
@@ -342,8 +357,10 @@ module MailDiode
     SYNTAX_DATA = "501 Syntax: DATA"
     BAD_COMMAND = '502 Error: command not implemented'
     TOO_MANY_RECIPIENTS = '552 Error: Too many recipients'
+    TOO_MANY_REJECTS = '552 Error: Too many illegal recipients'
     NEED_MAIL_BEFORE_RCPT = '503 Error: need MAIL before RCPT'
     NEED_RCPT_BEFORE_DATA = '503 Error: need RCPT before DATA'
     UNKNOWN_RECIPIENT = "550 Error: No such recipient here"
+    MESSAGE_TOO_LONG = "552 Error: Message too long"
   end
 end

data/lib/maildiode-plugins/blacklist.rb

@@ -30,7 +30,7 @@ module MailDiode
 			@blacklisted_recipients.each do | pattern |
 				re = Regexp.new(pattern, Regexp::IGNORECASE)
 				if(recipient.match(re))
-					raise MailDiode::SMTPError.new(MailDiode::SMTPError::UNKNOWN_RECIPIENT + ": " + recipient)
+					raise MailDiode::SMTPError.new(MailDiode::SMTPError::TOO_MANY_REJECTS + ": " + recipient)
 				end
 			end
 		end

data/lib/server.rb

@@ -33,7 +33,7 @@ module MailDiode
 
     def serve(client)
       begin
-        MailDiode::log_debug("serve")
+        MailDiode::log_debug("##{client_id(client)}: serve")
         client.binmode
         engine = @factory.create_engine(@hostname, @max_recipients)
         family, port, hostname, ip = client.addr
@@ -41,47 +41,47 @@ module MailDiode
         MailDiode::log_debug("Greeting: #{greeting}")
         client << response(greeting)
         while !engine.terminate?
-          line = get_line(client, TIMEOUT_SECONDS)
+          MailDiode::log_debug("##{client_id(client)}: calling get_line")
+          line = get_line(client, @timeout_seconds)
+          MailDiode::log_debug("##{client_id(client)}: returned from get_line")
           if(!line)
-            MailDiode::log_debug "Client disconnected"
-            return
+            break
           end
           line.chomp!(NEWLINE)
+          MailDiode::log_debug("##{client_id(client)}: calling process_line")
           result = engine.process_line(line)
+          MailDiode::log_debug("##{client_id(client)}: returned from process_line")
           if(result)
+            MailDiode::log_debug("##{client_id(client)}: calling discard_early_input")
             discard_early_input(client)
+            MailDiode::log_debug("##{client_id(client)}: returned from discard_early_input")
             client << response(result)
           end
         end
+        MailDiode::log_debug "##{client_id(client)}: engine terminated"
       rescue Errno::ECONNRESET
-        MailDiode::log_debug "Client reset connection"
+        MailDiode::log_info "##{client_id(client)}: Client reset connection"
       rescue Errno::ETIMEDOUT
-        MailDiode::log_info "Client input timeout"
+        MailDiode::log_info "##{client_id(client)}: Client input timeout"
       rescue Errno::ENOTCONN
-        MailDiode::log_info "Client dropped connection"
+        MailDiode::log_info "##{client_id(client)}: Client dropped connection"
       rescue Exception => e
-        MailDiode::log_error("Exception #{e.class}: #{e}")
+        MailDiode::log_error("##{client_id(client)}: Exception #{e.class}: #{e}")
         e.backtrace.each do | line |
           MailDiode::log_error(line)
         end
         client << response("451 Internal Server Error")
       end
-
+      MailDiode::log_debug "##{client_id(client)}: serve exiting"
     end
 
     def connecting(client)
-      log_new_connection(client)
+      MailDiode::log_debug("##{client_id(client)}: connecting #{client.peeraddr[2]} -> #{client.peeraddr[3]}")
       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})")
+    def disconnecting(client_port)
+      MailDiode::log_debug("##{client_port}: disconnecting (#{connections})")
     end
     
     def get_line(input, timeout_seconds)
@@ -93,7 +93,7 @@ module MailDiode
 
     def discard_early_input(client)
       t = Thread.new { consume_all_input(client) }
-      t.join(TIMEOUT_SECONDS)
+      t.join(@timeout_seconds)
     end
 
     def consume_all_input(input)
@@ -114,11 +114,17 @@ module MailDiode
       @port.untaint
       @max_connections = settings.get_int('server', 'maxconnections', DEFAULT_MAX_CONNECTIONS)
       @max_recipients = settings.get_int('server', 'maxrecipients', DEFAULT_MAX_RECIPIENTS)
+      @timeout_seconds = settings.get_int('server', 'timeoutseconds', DEFAULT_TIMEOUT_SECONDS)
+		end
+
+		def client_id(client)
+      addr = client.peeraddr
+      return "#{addr[1]}"
 		end
 
     DEFAULT_PORT = 10025
 		DEFAULT_MAX_CONNECTIONS = 20
 		DEFAULT_MAX_RECIPIENTS = 5
-		TIMEOUT_SECONDS = 1200 # djb recommends 1200
+		DEFAULT_TIMEOUT_SECONDS = 120 # djb recommends 1200
 	end
 end

data/maildiode.conf.sample

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

data/test/engine_spec.rb

@@ -88,6 +88,12 @@ class DummyMailHandler < MailDiode::MailHandler
 	end
 end
 
+class RejectAllHandler < MailDiode::MailHandler
+  def valid_recipient?(to_address)
+    return false
+  end
+end
+
 describe MailDiode::Engine do
   before(:each) do
     MailDiode::set_log_level(Logger::WARN)
@@ -323,6 +329,14 @@ describe MailDiode::Engine do
         @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
+
+      it "should fail if there are too many rejected recipients" do
+        @engine.set_mail_handler(RejectAllHandler.new)
+        @engine.process_line("rcpt To:#{@valid_recipient}").index(MailDiode::SMTPError::UNKNOWN_RECIPIENT).should == 0
+        @engine.process_line("rcpt To:#{@valid_recipient}").should == MailDiode::SMTPError::TOO_MANY_REJECTS
+        @engine.terminate?.should == true
+      end
+
     end
 
     describe "DATA before RCPT" do
@@ -361,6 +375,15 @@ describe MailDiode::Engine do
         @engine.process_line('.')
         @engine.process_line('data').should == MailDiode::SMTPError::NEED_RCPT_BEFORE_DATA
       end
+
+      it "should give error for message too long" do
+        @engine.max_data_lines = 10
+        @engine.process_line('data').should == MailDiode::RESULT_DATA_OK
+        @engine.max_data_lines.times do |n|
+          @engine.process_line('#n').should == nil
+        end
+        @engine.process_line('#n').should == MailDiode::SMTPError::MESSAGE_TOO_LONG
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maildiode
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors: 
 - Kevin Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -04:00
+date: 2009-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency