eventmachine-email_server 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e73cc7eef3bcb21a34c103138939f1f9f216cf
-  data.tar.gz: 03f42527251cde1a286b920f1ee50c84a1318596
+  metadata.gz: f9618746cec3c86bbed9a6ec20828cc326279246
+  data.tar.gz: 99191abe30a58e83b6a1c764a354c4ec5d4337dd
 SHA512:
-  metadata.gz: 59518897af038bd1fb86ff14cda06f4ec6cd3c4363b2730af532611d8aab3c16123be073973aa08a253dd7c271112efcb613e70aeabed5bd5112f07ce6d86725
-  data.tar.gz: 40f009d49032f6bba06e0a7b4ba215530c788687f648e49e4e1d89f1075a9d60649ef56d62b35262f09852850dab56c46d6ef5a7284c44948ef8873bf9bbf6ec
+  metadata.gz: 4dd0f0614b1522e4421fe937c22cc064a2f2cb9da4cd231de94b0288d36ae62f28c70dd852c62c3e60b8ada66e7397dbba021d7328b98b9d4d8d07a61c302485
+  data.tar.gz: 461427eb727203f4850c8d2d52d3fdf716df05e23ad316c9621a91de959c0e222006a7c18bbe96cba023c6fc6e46b0849cff58cb7ff9c5404e89c81bce5596e7

data/README.md

@@ -39,6 +39,7 @@ Or install it yourself as:
 
 Simple usage:
 
+	require 'eventmachine'
 	require 'eventmachine/email_server'
 	include EventMachine::EmailServer
     EM.run {
@@ -48,38 +49,39 @@ Simple usage:
 
 Everything turned on:
 
+    require 'eventmachine'
     require 'eventmachine/email_server'
     include EventMachine::EmailServer
     require 'ratelimit/bucketbased'
-    require 'dnsbl/client'
-    require 'sqlite3'
 	
-    s = SQLite3::Database.new("email_server.sqlite3")
-    userstore = Sqlite3UserStore.new(s)
-    emailstore = Sqlite3EmailStore.new(s)
-    userstore << User.new(1, "chris", "password", "chris@example.org")
-    
+    userstore = MemoryUserStore.new()
+    emailstore = MemoryEmailStore.new()
+    userstore << User.new(1, "chris", "chris", "chris@example.org")
+	
     config = {
       'default' => RateLimit::Config.new('default', 2, 2, -2, 1, 1, 1),
     }
     storage = RateLimit::Memory.new
     rl = RateLimit::BucketBased.new(storage, config, 'default')
-    
+	
     classifier = EventMachine::EmailServer::Classifier.new("test/test.classifier", [:spam, :ham], [:spam])
     classifier.train(:spam, "Amazing pillz viagra cialis levitra staxyn")
     classifier.train(:ham, "Big pigs make great bacon")
-    
+	
     SMTPServer.reverse_ptr_check(true)
     SMTPServer.graylist(Hash.new)
     SMTPServer.ratelimiter(rl)
-    SMTPServer.dnsbl_check(true)  
+    SMTPServer.dnsbl_check(true)
     SMTPServer.spf_check(true)
     SMTPServer.reject_filters << /viagra/i
     SMTPServer.classifier(classifier)
-    
+	
     EM.run {
       pop3 = EventMachine::start_server "0.0.0.0", 2110, POP3Server, "example.org", userstore, emailstore
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
+      timer = EventMachine::Timer.new(0.1) do
+        EM.stop
+      end
     }
 
 

data/lib/eventmachine/email_server/pop3_server.rb

@@ -23,13 +23,17 @@ module EventMachine
       
 			def receive_data(data)
         puts ">> #{data}" if @debug
-        ok, op = process_line(data)
-        if ok
-          puts "<< #{op}" if @debug
-          send_data(op+"\r\n")
+        data.split(/[\r\n]+/).each do |line|
+          process_line(line)
         end
       end
       
+      def send(data, close=false)
+        puts "<< #{data}" if @debug
+        send_data("#{data}\r\n")
+        close_connection if close
+      end
+      
       def unbind(reason=nil)
         @emails.find_all {|e| e.marked}.each do |email|
           @emailstore.delete_email(email)
@@ -38,107 +42,124 @@ module EventMachine
       end
       
     	def process_line(line)
-    		line.chomp!
-    		case @state 
+    		case @state
     		when 'auth'
-    			case line
-    			when /^QUIT$/
-    				return false, "+OK dewey POP3 server signing off"
-          when /^CAPA$/
-            return true, "+OK Capability list follows\r\n"+@@capabilities.join("\r\n")+"\r\n."
-    			when /^USER (.+)$/
-    				user($1)
-    				if @user
-    					return true, "+OK #{@user.username} is most welcome here"
-    				else
-    					@failed += 1
-    					if @failed > 2
-    						return false, "-ERR you're out!"
-    					end
-    					return true, "-ERR sorry, no mailbox for #{$1} here"
-    				end
-    			when /^PASS (.+)$/
-    				if pass($1)
-    					@state = 'trans'
-    					emails
-    					msgs, bytes = stat
-    					return true, "+OK #{@user.username}'s maildrop has #{msgs} messages (#{bytes} octets)"
-    				else
-    					@failed += 1
-    					if @failed > 2
-    						return false, "-ERR you're out!"
-    					end
-    					return true, "-ERR no dope."
-    				end
-    			when /^APOP ([^\s]+) (.+)$/
-    				if apop($1,$2)
-    					@state = 'trans'
-    					emails
-    					return true, "+OK #{@user.username} is most welcome here"
-    				else
-    					@failed += 1
-    					if @failed > 2
-    						return false, "-ERR you're out!"
-    					end
-    					return true, "-ERR sorry, no mailbox for #{$1} here"
-    				end
-    			end
+          auth_state(line)
     		when 'trans'
-    			case line
-    			when /^NOOP$/
-    				return true, "+OK"
-    			when /^STAT$/
-    				msgs, bytes = stat
-    				return true, "+OK #{msgs} #{bytes}"
-    			when /^LIST$/
-    				msgs, bytes = stat
-    				msg = "+OK #{msgs} messages (#{bytes} octets)\r\n"
-    				list.each do |num, bytes|
-    					msg += "#{num} #{bytes}\r\n"
-    				end
-    				msg += "."
-    				return true, msg
-    			when /^LIST (\d+)$/
-    				msgs, bytes = stat
-    				num, bytes = list($1)
-    				if num
-    					return true, "+OK #{num} #{bytes}"
-    				else
-    					return true, "-ERR no such message, only #{msgs} messages in maildrop"
-    				end
-    			when /^RETR (\d+)$/
-    				msg = retr($1)
-    				if msg
-    					msg = "+OK #{msg.length} octets\r\n" + msg + "\r\n."
-    				else
-    					msg = "-ERR no such message"
-    				end
-    				return true, msg
-    			when /^DELE (\d+)$/
-    				if dele($1)
-    					return true, "+OK message #{$1} marked"
-    				else
-    					return true, "-ERR message #{$1} already marked"
-    				end
-    			when /^RSET$/
-    				rset
-    				msgs, bytes = stat
-    				return true, "+OK maildrop has #{msgs} messages (#{bytes} octets)"
-    			when /^QUIT$/
-    				@state = 'update'
-    				quit
-    				msgs, bytes = stat
-    				if msgs > 0
-    					return true, "+OK dewey POP3 server signing off (#{msgs} messages left)"
-    				else
-    					return true, "+OK dewey POP3 server signing off (maildrop empty)"
-    				end
-    			when /^TOP (\d+) (\d+)$/
-    				lines = $2
-    				msg = retr($1)
-    				unless msg
-    					return true, "-ERR no such message"
-    				end
+          trans_state(line)
+    		when 'update'
+          update_state(line)
+        else
+      		send("-ERR unknown command")
+    		end
+    	end
+      
+      def auth_state(line)
+  			case line
+  			when /^QUIT$/
+  				send("+OK dewey POP3 server signing off", true)
+        when /^CAPA$/
+          send("+OK Capability list follows\r\n"+@@capabilities.join("\r\n")+"\r\n.")
+  			when /^USER (.+)$/
+  				user($1)
+  				if @user
+  					send("+OK #{@user.username} is most welcome here")
+  				else
+  					@failed += 1
+  					if @failed > 2
+  						send("-ERR you're out!", true)
+            else
+    					send("-ERR sorry, no mailbox for #{$1} here")
+  					end
+  				end
+  			when /^PASS (.+)$/
+  				if pass($1)
+  					@state = 'trans'
+  					emails
+  					msgs, bytes = stat
+  					send("+OK #{@user.username}'s maildrop has #{msgs} messages (#{bytes} octets)")
+  				else
+  					@failed += 1
+  					if @failed > 2
+  						send("-ERR you're out!", true)
+            else
+              send("-ERR no dope.")
+            end
+  				end
+  			when /^APOP ([^\s]+) (.+)$/
+  				if apop($1,$2)
+  					@state = 'trans'
+  					emails
+  					send("+OK #{@user.username} is most welcome here")
+  				else
+  					@failed += 1
+  					if @failed > 2
+  						send("-ERR you're out!", true)
+            else
+  					  send("-ERR sorry, no mailbox for #{$1} here")
+            end
+  				end
+        else
+          send("-ERR unknown command")
+  			end
+      end
+      
+      def trans_state(line)
+  			case line
+  			when /^NOOP$/
+  				send("+OK")
+  			when /^STAT$/
+  				msgs, bytes = stat
+  				send("+OK #{msgs} #{bytes}")
+  			when /^LIST$/
+  				msgs, bytes = stat
+  				msg = "+OK #{msgs} messages (#{bytes} octets)\r\n"
+  				list.each do |num, bytes|
+  					msg += "#{num} #{bytes}\r\n"
+  				end
+  				msg += "."
+  				send(msg)
+  			when /^LIST (\d+)$/
+  				msgs, bytes = stat
+  				num, bytes = list($1)
+  				if num
+  					send("+OK #{num} #{bytes}")
+  				else
+  					send("-ERR no such message, only #{msgs} messages in maildrop")
+  				end
+  			when /^RETR (\d+)$/
+  				msg = retr($1)
+  				if msg
+  					msg = "+OK #{msg.length} octets\r\n" + msg + "\r\n."
+  				else
+  					msg = "-ERR no such message"
+  				end
+  				send(msg)
+  			when /^DELE (\d+)$/
+  				if dele($1)
+  					send("+OK message #{$1} marked")
+  				else
+  					send("-ERR message #{$1} already marked")
+  				end
+  			when /^RSET$/
+  				rset
+  				msgs, bytes = stat
+  				send("+OK maildrop has #{msgs} messages (#{bytes} octets)")
+  			when /^QUIT$/
+  				@state = 'update'
+  				quit
+  				msgs, bytes = stat
+  				if msgs > 0
+  					send("+OK dewey POP3 server signing off (#{msgs} messages left)", true)
+  				else
+  					send("+OK dewey POP3 server signing off (maildrop empty)", true)
+  				end
+  			when /^TOP (\d+) (\d+)$/
+  				lines = $2
+  				msg = retr($1)
+  				unless msg
+  					send("-ERR no such message")
+          else
     				cnt = nil
     				final = ""
     				msg.split(/\n/).each do |l|
@@ -151,26 +172,31 @@ module EventMachine
     						cnt = 0
     					end
     				end
-    				return true, "+OK\r\n"+final+"\r\n."
-    			when /^UIDL$/
-    				msgid = 0
-    				msg = ''
-    				@emails.each do |e|
-    					msgid += 1
-    					next if e.marked
-    					msg += "#{msgid} #{Digest::MD5.new.update(msg).hexdigest}"
-    				end
-    				return true, "+OK\r\n#{msg}\r\n.";
-    			end
-    		when 'update'
-    			case line
-    			when /^QUIT$/
-    				return true, "+OK dewey POP3 server signing off"
-    			end
-    		end
-    		return true, "-ERR unknown command"
-    	end
-
+    				send("+OK\r\n"+final+"\r\n.")
+          end
+  			when /^UIDL$/
+  				msgid = 0
+  				msg = ''
+  				@emails.each do |e|
+  					msgid += 1
+  					next if e.marked
+  					msg += "#{msgid} #{Digest::MD5.new.update(e.body).hexdigest}\r\n"
+  				end
+  				send("+OK\r\n#{msg}.")
+        else
+          send("-ERR unknown command")
+  			end
+      end
+      
+      def update_state(line)
+  			case line
+  			when /^QUIT$/
+  				send("+OK dewey POP3 server signing off", true)
+        else
+          send("-ERR unknown command")
+  			end
+      end
+      
     	def user(username)
     		@user = @userstore.user_by_username(username)
     	end

data/lib/eventmachine/email_server/smtp_server.rb

@@ -90,8 +90,7 @@ module EventMachine
       end
       
       def post_init
-        puts ">> 220 hello" if @debug
-        send_data "220 #{@hostname} ESMTP Service ready\n"
+        send "220 #{@hostname} ESMTP Service ready"
       end
       
 			def receive_data(data)
@@ -102,7 +101,9 @@ module EventMachine
       end
       
       def check_ptr(helo, ip)
-        if @@reverse_ptr_check
+        if helo =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ and helo == ip
+          @ptr_ok = true
+        elsif @@reverse_ptr_check
           @ptr_ok = false
           @pending_checks << :ptr
           d = EM::DNS::Resolver.resolve helo
@@ -175,7 +176,9 @@ module EventMachine
 
           pool.perform do |dispatcher|
             completion = dispatcher.dispatch do |spf_server|
-
+              if helo =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ and helo == ip
+                helo = nil
+              end
               request = SPF::Request.new(
                 versions:      [1, 2],             # optional
                 scope:         'mfrom',            # or 'helo', 'pra'
@@ -235,18 +238,19 @@ module EventMachine
       end
       
      	def process_line(line)
-    		if (@data_mode) && (line.chomp =~ /^\.$/)
+    		if (@data_mode) && (line.chomp == '.')
     			@data_mode = false
           check_reject
           check_classifier
           @pending_checks -= [:content]
+          p @pending_checks
           if @pending_checks.length == 0
             send_answer
           end
     		elsif @data_mode
     			@email_body += line
     		elsif (line =~ /^(HELO|EHLO) (.*)/)
-          helo = $2.chomp
+          helo = $2.chomp.gsub(/^\[/,'').gsub(/\]$/,'')
           port, ip = Socket.unpack_sockaddr_in(get_peername)
           check_ptr(helo, ip)
           check_dnsbl(ip)

data/lib/eventmachine/email_server/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module EmailServer
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/test_email_server.rb

@@ -49,14 +49,10 @@ Looks like we had fun!
     @pool = EM::Pool.new
     SMTPServer.reset
     remove_scraps
+    $dns_port = 53
   end
 
   def remove_scraps
-    ["test.sqlite3", "email_server.sqlite3"].each do |f|
-      if File.exist?("test/#{f}")
-        File.unlink("test/#{f}")
-      end
-    end
   end
 
   def teardown
@@ -313,7 +309,6 @@ Looks like we had fun!
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
     setup_user(userstore)
-    $dns_port = 53
 
     SMTPServer.spf_check(true)
     EM.run {
@@ -360,10 +355,10 @@ Looks like we had fun!
 
   def test_example
     return unless @test_vector.call(__method__)
+    #require 'eventmachine'
     #require 'eventmachine/email_server'
     #include EventMachine::EmailServer
     #require 'ratelimit/bucketbased'
-    #require 'dnsbl/client'
 
     userstore = MemoryUserStore.new()
     emailstore = MemoryEmailStore.new()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-email_server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine