eventmachine-email_server 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9618746cec3c86bbed9a6ec20828cc326279246
-  data.tar.gz: 99191abe30a58e83b6a1c764a354c4ec5d4337dd
+  metadata.gz: d9dea5dce0287d7485b0b8462a66bea7afc23c86
+  data.tar.gz: d3bc7ee13bed421cdba2bca4142dabc1286c494f
 SHA512:
-  metadata.gz: 4dd0f0614b1522e4421fe937c22cc064a2f2cb9da4cd231de94b0288d36ae62f28c70dd852c62c3e60b8ada66e7397dbba021d7328b98b9d4d8d07a61c302485
-  data.tar.gz: 461427eb727203f4850c8d2d52d3fdf716df05e23ad316c9621a91de959c0e222006a7c18bbe96cba023c6fc6e46b0849cff58cb7ff9c5404e89c81bce5596e7
+  metadata.gz: 2c988c984b9525db659d0c1c266183ab226a5170d71cc525a7698e42d0a349d56d303b18e6c97634ae0af9fd29b8bd98fc09bd6c93088ff1f036b9400f640ca7
+  data.tar.gz: bdf1b88902363fc6de4fab8190669ae1116bfc083973b4c5241afec2bc4f8dbe453cdecd9f117e37497653cd711a3c07e12b78fc4a35b3caa66cc0287689021c

data/lib/eventmachine/email_server/pop3_server.rb

@@ -5,6 +5,8 @@ module EventMachine
 	module EmailServer
 		class POP3Server < EventMachine::Connection
       @@capabilities = [ "TOP", "USER", "UIDL" ]
+      attr_accessor :debug
+
       def initialize(hostname, userstore, emailstore)
         @hostname = hostname
         @userstore = userstore
@@ -12,7 +14,7 @@ module EventMachine
         @state = 'auth' # 'trans' and 'data'
         @auth_attempts = 0
         @apop_challenge = "<#{rand(10**4 - 1)}.#{rand(10**9 - 1)}@#{@hostname}>"
-        @debug = true
+        @debug = false
         @emails = Array.new
       end
       
@@ -31,7 +33,8 @@ module EventMachine
       def send(data, close=false)
         puts "<< #{data}" if @debug
         send_data("#{data}\r\n")
-        close_connection if close
+        puts "++ closing connection" if @debug and close
+        close_connection(true) if close
       end
       
       def unbind(reason=nil)
@@ -183,6 +186,23 @@ module EventMachine
   					msg += "#{msgid} #{Digest::MD5.new.update(e.body).hexdigest}\r\n"
   				end
   				send("+OK\r\n#{msg}.")
+        when /^UIDL (\d+)$/
+          mid = $1
+  				msgid = 0
+          msg = ''
+  				@emails.each do |e|
+  					msgid += 1
+  					next if e.marked
+            if mid == msgid
+              msg += "#{msgid} #{Digest::MD5.new.update(e.body).hexdigest}\r\n"
+              last
+            end
+  				end
+          if msg.length > 0
+            send("+OK\r\n#{msg}.")
+          else
+            send("-ERR no such message, only #{msgid} messages in maildrop")
+          end
         else
           send("-ERR unknown command")
   			end

data/lib/eventmachine/email_server/smtp_server.rb

@@ -20,7 +20,7 @@ module EventMachine
         @@reverse_ptr_check = false
         @@spf_check = false
         @@reject_filters = Array.new
-        @classifier = nil
+        @@classifier = nil
       end
       
       def self.reverse_ptr_check(ptr=nil)
@@ -72,11 +72,13 @@ module EventMachine
         @@classifier
       end
 
+      attr_accessor :debug
+      
       def initialize(hostname, userstore, emailstore)
         @hostname = hostname
         @userstore = userstore
         @emailstore = emailstore
-        @debug = true
+        @debug = false
         @data_mode = false
         @email_body = ""
         @ptr_ok = true
@@ -243,7 +245,7 @@ module EventMachine
           check_reject
           check_classifier
           @pending_checks -= [:content]
-          p @pending_checks
+          p @pending_checks if @debug
           if @pending_checks.length == 0
             send_answer
           end
@@ -261,14 +263,14 @@ module EventMachine
           send("221 #{@hostname} ESMTP server closing connection")
           self.close_connection
     		elsif (line =~ /^MAIL FROM\:/)
-    			@mail_from = (/^MAIL FROM\:<(.+)>.*$/).match(line)[1]
+    			@mail_from = (/^MAIL FROM\:\s*<(.+)>.*$/).match(line)[1]
           if @@spf_check
             port, ip = Socket.unpack_sockaddr_in(get_peername)
             check_spf(helo, ip, @mail_from)
           end
           send("250 OK")
     		elsif (line =~ /^RCPT TO\:/)
-    			rcpt_to = (/^RCPT TO\:<(.+)>.*$/).match(line)[1]
+    			rcpt_to = (/^RCPT TO\:\s*<(.+)>.*$/).match(line)[1]
     			if @userstore.user_by_emailaddress(rcpt_to.strip)
     				@rcpt_to = rcpt_to
             send("250 OK")
@@ -290,10 +292,10 @@ module EventMachine
       
     	def save
     		begin
-    			subject = @email_body.match(/Subject\: (.*?)[\r\n]/i)[1]
+    			subject = @email_body.match(/Subject\:\s*(.*?)[\r\n]/i)[1]
     			u = @userstore.user_by_emailaddress(@rcpt_to.strip)
     		rescue Exception => err
-    			puts err
+    			puts err if @debug
     			return
     		end
     		if u and @mail_from and @rcpt_to

data/lib/eventmachine/email_server/version.rb

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

data/test/test_email_server.rb

@@ -11,6 +11,7 @@ include EventMachine::EmailServer
 require 'net/pop'
 require 'net/smtp'
 require 'ratelimit/bucketbased'
+require 'fileutils'
 
 $dns_port = 53
 
@@ -32,7 +33,7 @@ class TestEmailServer < Minitest::Test
 To: chris@example.org
 Subject: What to do when you're not doing.
 
-Could I interest you in some cialis?
+Could I interest you in some cialis or levitra?
 ")
     @ham_email = EmailTemplate.new("friend@example.org", "chris@example.org", "From: friend@example.org
 To: chris@example.org
@@ -53,6 +54,7 @@ Looks like we had fun!
   end
 
   def remove_scraps
+    FileUtils.remove_dir("test/test.classifier", true)
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-email_server
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: EventMachine-based implementations of a POP3 and SMTP server