maildiode 0.0.5 → 0.1.0

data/bin/maildiode

@@ -72,7 +72,7 @@ module MailDiode
 	def self.load_plugins(settings)
 		plugins = []
 		settings.get_settings('plugin').each do | setting |
-			plugins << create_plugin(setting[0], settings)
+			plugins << create_plugin(setting.key, settings)
 		end
 		return plugins
 	end	
@@ -119,6 +119,23 @@ def uid(user_name)
   return Etc::getpwnam.uid
 end
 
+def apply_debug_settings(settings)
+  available_levels = {
+    'error' => Logger::ERROR,
+    'warn' => Logger::WARN,
+    'info' => Logger::INFO,
+    'debug' => Logger::DEBUG,
+  }
+
+  log_level_string = settings.get_setting('debug', 'level')
+  if(log_level_string)
+    level = available_levels[log_level_string]
+    if(level)
+      MailDiode::set_log_level(level)
+    end
+  end
+end
+
 def drop_privileges(new_user_name)
   gid = Etc::getpwnam(new_user_name).gid
   Process::Sys::setresgid(gid, gid, gid)
@@ -132,17 +149,22 @@ def start
 
   MailDiode::log_to_file($log_filename)
 	MailDiode::set_log_level(Logger::INFO)
+	MailDiode::log_info "----Starting MailDiode"
 
   config_file = MailDiode::Settings.default_file
 	settings = MailDiode::Settings.new(config_file)
+
+  apply_debug_settings(settings)  
+	MailDiode::log_debug "Debug logging enabled"
+	
 	user = settings.get_setting('server', 'user')
 	user.untaint
 
+
 	plugins = MailDiode::load_plugins(settings)
 	factory = MailDiode::EngineFactory.new(plugins, settings)
-	MailDiode::log_info "Starting server..."
-	MailDiode::log_debug "Debug logging enabled"
 	server = MailDiode::Server.new(factory, settings)
+	MailDiode::log_info "Starting server #{server.ip}:#{server.port}..."
 	server.start
 	if(user)
   	drop_privileges(user)

data/lib/maildiode-plugins/alias.rb

@@ -28,19 +28,21 @@ module MailDiode
 				MailDiode::log_debug "alias checking: #{pattern}"
 				re = Regexp.new(pattern, Regexp::IGNORECASE)
 				if(recipient.match(re))
-					MailDiode::log_info "Alias #{recipient} --> #{target}"
+					MailDiode::log_debug "Alias #{recipient} --> #{target}"
 					filterable_data.recipient = target
 					return
 				end
 			end
 			
-			MailDiode::log_info "No alias for #{recipient}"
+			MailDiode::log_debug "No alias for #{recipient}"
 		end
 
 		def load_settings(settings)
 			settings.get_settings('alias').each do | setting |
-				target, pattern = setting
+				pattern = setting.key
+				target = setting.value
 				@aliases << [pattern, target]
+				MailDiode::log_debug "  #{pattern} -> #{target}"
 			end
 		end
 	end

data/lib/maildiode-plugins/blacklist.rb

@@ -37,10 +37,12 @@ module MailDiode
 		
 		def load_settings(settings)
 			settings.get_settings('blacklist').each do | setting |
-				key, value = setting
+				key = setting.key
+				value = setting.value
 				case key
 					when 'to'
 						@blacklisted_recipients << value
+						MailDiode::log_debug "  #{key} X #{value}"
 					else
 						MailDiode::log_warning "Blacklist ignoring unknown: #{key}"
 				end

data/lib/maildiode-plugins/delay.rb

@@ -43,6 +43,7 @@ module MailDiode
 			@delay_helo = settings.get_setting('delay', 'helo').to_i
 			@delay_mail = settings.get_setting('delay', 'mail').to_i
 			@delay_rcpt = settings.get_setting('delay', 'rcpt').to_i
+			MailDiode::log_debug "  HELO #{@delay_helo} MAIL #{@delay_mail} RCPT #{@delay_rcpt} seconds"
 		end
 	end
 end

data/lib/maildir.rb

@@ -55,7 +55,7 @@ module MailDiode
 			raw_dir = get_maildir(recipient)
 			folder = ''
 			dir = "#{raw_dir.chomp('/')}#{folder}/"
-			MailDiode::log_info "Delivering to #{dir}"
+			MailDiode::log_info "Delivering to #{dir} for #{recipient}"
 			if !File.exist?(dir)
 				MailDiode::log_error "ERROR: Missing maildir folder: #{dir}"
 				raise FolderMissingError.new(File.basename(dir))
@@ -100,12 +100,15 @@ module MailDiode
 
 		def load_settings(settings)
 			settings.get_settings('maildir').each do | setting |
-				name, maildir = setting
+				name = setting.key
+				maildir = setting.value
 				if(maildir.index('/') != 0)
 					raise "Maildir must start with slash (/): #{maildir}"
 				end
 				maildir.untaint
 				@maildirs[name] = maildir
+				#Disabled because this is called per-connection
+				#MailDiode::log_debug "  #{name} -> #{maildir}"
 			end
 		end
 	end

data/lib/server.rb

@@ -19,6 +19,10 @@ require 'io/wait'
 
 module MailDiode
 	class Server < GServer
+
+	  attr_reader :ip
+	  attr_reader :port
+	  
     def initialize(engine_factory, settings)
       load_settings(settings)
 
@@ -41,7 +45,7 @@ module MailDiode
         while !engine.terminate?
           line = get_line(client, TIMEOUT_SECONDS)
           if(!line)
-            MailDiode::log_info("---client disconnected")
+            MailDiode::log_info("Client disconnected")
             return
           end
           line.chomp!(NEWLINE)
@@ -52,7 +56,7 @@ module MailDiode
           end
         end
       rescue Errno::ECONNRESET
-        MailDiode::log_info "---client dropped connection"
+        MailDiode::log_info "Client dropped connection"
       rescue Exception => e
         MailDiode::log_error("Exception #{e.class}: #{e}")
         e.backtrace.each do | line |

data/lib/settings.rb

@@ -15,7 +15,41 @@
 
 
 module MailDiode
+  class SingleSetting
+    attr_reader :key
+    attr_reader :value
+    
+    def initialize(key, value)
+      @key = key
+      @value = value
+    end
+  end
 
+  class ComponentSettings
+    def initialize
+      @settings = []
+    end
+
+    def add(new_setting)
+      @settings << new_setting
+    end
+
+    def each
+      @settings.each do | setting |
+        yield setting
+      end
+    end
+
+    def get_setting(key)
+      each do | setting |
+        if(setting.key == key)
+          return setting
+        end
+      end
+      return nil
+    end
+  end
+  
 	class Settings
 		def initialize(config_file)
 			@settings = {}
@@ -30,13 +64,13 @@ module MailDiode
 		
 		def load_setting(component, keyword, args)
 			component_settings = get_settings(component)
-			component_settings[keyword] = args
+			component_settings.add(SingleSetting.new(keyword, args))
 		end
 		
 		def get_settings(component)
 			component_settings = @settings[component]
 			if(!component_settings)
-				component_settings = {}
+				component_settings = ComponentSettings.new
 				@settings[component] = component_settings
 			end
 			return component_settings
@@ -47,7 +81,11 @@ module MailDiode
 			if(!component_settings)
 				return nil
 			end
-			return component_settings[keyword]
+			setting = component_settings.get_setting(keyword)
+			if(!setting)
+			  return nil
+      end
+      return setting.value
 		end
 		
 		def get_int(component, keyword, default_value)

data/maildiode.conf.sample

@@ -1,4 +1,4 @@
-#debug warn # error warn info debug
+#debug level warn # error warn info debug
 
 # Basic server info
 server hostname localhost
@@ -12,13 +12,13 @@ maildir bob@example.com /home/bob/mail
 maildir kevin           /home/kevins/TestMail/main/
 maildir catchall        /home/kevins/TestMail/other/
 
-# Aliases have maildir name and matching regexp
+# Aliases define a regexp and its corresponding maildir name
 # (Stops as soon as the first match is hit, so put catchall last)
 plugin alias
-alias kevin     ^kevin@qualitycode.com$
-alias kevin     ^kevins@qualitycode.com$
-alias catchall 	@qualitycode.com$
-alias catchall  @example.com$
+alias ^kevin@qualitycode.com$     kevin
+alias ^kevins@qualitycode.com$    kevin
+alias @qualitycode.com$           catchall
+alias @example.com$               catchall
 
 # Blacklist only supports filtering on "to" for now
 # (handy to limit catchall spam)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maildiode
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Kevin Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -05:00
+date: 2008-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency