spf 0.0.32 → 0.0.33

data/lib/spf/error.rb

@@ -14,6 +14,7 @@ module SPF
 
     class DNSError                        < Error;                  end  # DNS error
       class DNSTimeoutError                 < DNSError;             end  # DNS timeout
+      class DNSNXDomainError                < DNSError;             end  # DNS NXDomain
     class RecordSelectionError            < Error                        # Record selection error
       attr_accessor :records
       def initialize(message, records=[])

data/lib/spf/eval.rb

@@ -140,7 +140,18 @@ class SPF::Server
     
     domain = domain.sub(/\.$/, '').downcase
 
-    packet = @dns_resolver.getresources(domain, rr_type)
+    packet = nil
+    begin
+      packet = @dns_resolver.getresources(domain, rr_type)
+    rescue Resolv::TimeoutError => e
+      raise SPF::DNSTimeoutError.new(
+        "Time-out on DNS '#{rr_type}' lookup of '#{domain}'")
+    rescue Resolv::NXDomainError => e
+      raise SPF::DNSError.new("NXDomain for '#{domain}'")
+    rescue Resolv::ResolvError => e
+      raise SPF::DNSError.new(
+        "Unknown error on DNS '#{rr_type}' lookup of '#{domain}'")
+    end
 
     # Raise DNS exception unless an answer packet with RCODE 0 or 3 (NXDOMAIN)
     # was received (thereby treating NXDOMAIN as an acceptable but empty answer packet):

data/lib/spf/model.rb

@@ -326,7 +326,12 @@ class SPF::Mech < SPF::Term
 
     ipv4_prefix_length = @ipv4_prefix_length || self.default_ipv4_prefix_length
     ipv6_prefix_length = @ipv6_prefix_length || self.default_ipv6_prefix_length
-    packet             = server.dns_lookup(domain.to_s, 'ANY')
+    begin
+      packet           = server.dns_lookup(domain.to_s, 'ANY')
+    rescue SPF::DNSError => e
+      @errors << e
+      return false
+    end
     server.count_void_dns_lookup(request) unless (rrs = packet)
 
     rrs.each do |rr|

data/lib/spf/version.rb

@@ -1,5 +1,5 @@
 module SPF
-  VERSION = '0.0.32'
+  VERSION = '0.0.33'
 end
 
 # vim:sw=2 sts=2

data/spf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spf"
-  s.version = "0.0.32"
+  s.version = "0.0.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Flury", "Julian Mehnle"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spf
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
   prerelease: 
 platform: ruby
 authors:
@@ -127,8 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Implementation of the Sender Policy Framework
 test_files: []
+has_rdoc: