eventmachine-email_server 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45064a738c416e1fce2c8726b3bab01c10f55860
-  data.tar.gz: 25c163465275237d7caf9f48d257d20348a812c9
+  metadata.gz: 7f8d810ad36c8d3b8515f5f209afaadbb9038391
+  data.tar.gz: d6f036b47bd9fedf1e566ad576ed02e6f8a02b71
 SHA512:
-  metadata.gz: cecf95b16f4d4e38cf83a65c2f4f9a69c5d4807b71a31a37fbc1cf4f723eb7476c95b7450adef582e8939019c5b4d6b96e8449a4070cb2ff0b78fa5b5bab4aa0
-  data.tar.gz: 3cb06186363faef276e41cd92ea2127938d1d1bd3109a2bcf50f343a3d844b021e8969bd4213d3e01976547b8e8b8292482d8157bbf440cc27e45380b38a2e93
+  metadata.gz: bc9f85702c714eca052dd7b5ee52c66f84d35866df288494917e4039c29c5b533e1edd118a65f2815b4208962ef3331796808fb3da16e8ec50d45c1f311b7abf
+  data.tar.gz: dcc7d410bdd476b78db32533a507f8812d10b97c57bb2c7b177f752c95770a972ccbd111af44b416e2e06521b3be342719e0b425e6af58df9a7a3ee9c9677698

data/eventmachine-email_server.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "sqlite3", ">= 1.3.6"
   spec.add_runtime_dependency "ratelimit-bucketbased", ">= 0.0.1"
   spec.add_runtime_dependency "eventmachine-dnsbl", ">= 0.0.2"
+  spec.add_runtime_dependency "spf", ">= 0.0.44"
   spec.add_development_dependency "minitest", "~> 5.5"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/eventmachine/email_server/smtp_server.rb

@@ -1,5 +1,6 @@
 require 'eventmachine'
 require 'eventmachine/dnsbl'
+require 'spf'
 
 module EventMachine
 	module EmailServer
@@ -11,6 +12,15 @@ module EventMachine
       @@spf_check = false
       @@reject_filters = Array.new
       
+      def self.reset
+        @@graylist = nil
+        @@dnsbl_check = nil
+        @@ratelimiter = nil
+        @@reverse_ptr_check = false
+        @@spf_check = false
+        @@reject_filters = Array.new
+      end
+      
       def self.reverse_ptr_check(ptr=nil)
         if not ptr.nil?
           @@reverse_ptr_check = ptr
@@ -135,36 +145,53 @@ module EventMachine
         end
       end
       
-      def check_spf(from_domain)
+      def check_spf(helo, client_ip, identity)
         if @@spf_check
           @spf_ok = false
           @pending_checks << :spf
-          d = EM::DNS::Resolver.resolve(from_domain, Resolv::DNS::Resource::IN::TXT)
-          d.errback { |r|
-            # fail open?
-            @spf_ok = true
-            @pending_checks -= [:spf]
-            if @pending_checks.length == 0
-              send_answer
+          
+          spf_dispatcher = EventMachine::ThreadedResource.new do
+            spf_server = SPF::Server.new
+          end
+
+          pool = EM::Pool.new
+
+          pool.add spf_dispatcher
+
+          pool.perform do |dispatcher|
+            completion = dispatcher.dispatch do |spf_server|
+
+              request = SPF::Request.new(
+                versions:      [1, 2],             # optional
+                scope:         'mfrom',            # or 'helo', 'pra'
+                identity:      identity,
+                ip_address:    client_ip,
+                helo_identity: helo   # optional
+              )
+
+              result = spf_server.process(request)
             end
-          }
-          d.callback { |r|
-            r.each do |rec|
-              #pp rec
-              if rec.start_with?('v=spf1')
-                if rec == "v=spf1 -all"
-                  @spf_ok = false
-                else
-                  # I need to create an SPF checker now :(
-                  @spf_ok = true
-                end
+  
+            completion.callback do |result|
+              if result.code == :pass
+                @spf_ok = true
+              elsif result.code == :fail
+                @spf_ok = false
+              elsif result.code == :softfail
+                @spf_ok = true
+              elsif result.code == :neutral
+                @spf_ok = true
+              else
+                @spf_ok = false
+              end
+              @pending_checks -= [:spf]
+              if @pending_checks.length == 0
+                send_answer
               end
             end
-            @pending_checks -= [:spf]
-            if @pending_checks.length == 0
-              send_answer
-            end
-          }
+  
+            completion
+          end          
         end
       end
       
@@ -202,7 +229,8 @@ module EventMachine
     		elsif (line =~ /^MAIL FROM\:/)
     			@mail_from = (/^MAIL FROM\:<(.+)>.*$/).match(line)[1]
           if @@spf_check
-            check_spf(@mail_from.split(/@/,2)[1])
+            port, ip = Socket.unpack_sockaddr_in(get_peername)
+            check_spf(helo, ip, @mail_from)
           end
     			return true, "250 OK"
     		elsif (line =~ /^RCPT TO\:/)

data/lib/eventmachine/email_server/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module EmailServer
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/test_email_server.rb

@@ -133,6 +133,7 @@ Looks like we had fun!
   
   def test_graylisting
     return unless @test_vector.call(__method__)
+    SMTPServer.reset
     SMTPServer.graylist(Hash.new)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
@@ -161,6 +162,7 @@ Looks like we had fun!
     }
     storage = RateLimit::Memory.new
     rl = RateLimit::BucketBased.new(storage, config, 'default')
+    SMTPServer.reset
     SMTPServer.ratelimiter(rl)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
@@ -220,6 +222,7 @@ Looks like we had fun!
         "127.0.0.2" => "Blacklisted as an example"
       }
     })
+    SMTPServer.reset
     SMTPServer.dnsbl_check(true)
     
     userstore = MemoryUserStore.new
@@ -255,32 +258,13 @@ Looks like we had fun!
     }
   end
   
-  def test_spf_resolution
-    return unless @test_vector.call(__method__)
-    EM.run {
-      d = EventMachine::DNS::Resolver.resolve("example.com", Resolv::DNS::Resource::IN::TXT)
-      d.errback do |r|
-        fail "dns resolution failed"
-        EM.stop
-      end
-      d.callback do |r|
-        refute_nil(r)
-        assert_equal(2, r.length)
-        refute_nil(r.index("v=spf1 -all"))
-        EM.stop
-      end
-      timer = EventMachine::Timer.new(10) do
-        EM.stop
-      end
-    }
-  end
-
   def test_spf
     return unless @test_vector.call(__method__)
     userstore = MemoryUserStore.new
     emailstore = MemoryEmailStore.new
     setup_user(userstore)
     
+    SMTPServer.reset
     SMTPServer.spf_check(true)
     EM.run {
       smtp = EventMachine::start_server "0.0.0.0", 2025, SMTPServer, "example.org", userstore, emailstore
@@ -314,6 +298,7 @@ Looks like we had fun!
     rl = RateLimit::BucketBased.new(storage, config, 'default')
   
   
+    SMTPServer.reset
     SMTPServer.reverse_ptr_check(true)
     SMTPServer.graylist(Hash.new)
     SMTPServer.ratelimiter(rl)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-email_server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - chrislee35
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: spf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.44
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.44
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement