spf 0.0.46 → 0.0.47

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU2NzZlNmViOGYxMWE1Nzg2YzRiMGFiOGM4YjJiYzE5MGRhNDM5Mw==
+    NDRiZjE1NWYxNGNhYTc1N2NjODU5YTA4NmMyZjUxNjliMDIxYjlhZg==
   data.tar.gz: !binary |-
-    ZDA4MDY2YzNhNDNlMjFkMTY4ZTRmOTJmY2E5ZjUyMGNiZTE0ZDU0ZA==
+    MmQ4NGVkMTE2MjdkZDA4NzE1ZGJjY2MzZTljMWE1MGRjYWU5N2FhMQ==
 SHA512:
   metadata.gz: !binary |-
-    YzYxNTFhNGU1MGU3NTAxYjAzMzhiMTgwNDExOWVjYzgyNjgyYjc0Y2JmOWYw
-    NDU2NDUxYTYyYTJjMmE5MDQxYmMwZWE5NDE4Mjc5MDc1M2Q5NmYwNTY5YTg1
-    M2M5ZjNlYzA5NmRiMjkyNjEyMjEzZmEzNmM4NzIzYWM2NDVlYTc=
+    NjY4NWJjNWQ0MjAwN2VlMmNjYTc5ZjVkNmNlYjQxZmNkNzlhNGRjMGYxNDEx
+    M2M1ZGFmZDkyOTQ5NWJlY2QxYmY1NDdlZDIyZmY1Y2UyOWZlYmNmNDBkOWQ2
+    OTE1OTY5OTlhOTQ5MjhiZDVkMjliZWQ1MzY4NzYwMjgzZjVjM2I=
   data.tar.gz: !binary |-
-    OTI4ODQ3NDEyNWMzOWQ5ZmM2MDdmYWJjN2Y4YTg2NTkwODZiMzBlNjk1ODdl
-    MDdiYzJjNDdhZDk1OTE2MTExYTNjNzYwYTRkNmUyMzU1OWUzMTA2MWUxMDhm
-    YTNmMTQzOWI0MWVjNDg5ZGM4YjA4YTczMWQ5YmFiYzY3ZTQ5ODE=
+    MmE5ZDY4OGYzY2IzZWRiMjI5NDQ3YThlOWM5MGViZGNiZmViM2U5YjBiMTVj
+    YjkyZGVhZTI0MGMzMDMzY2NhZTBmZjNhYWNjOWE4MTJlMzU5YTk0N2MwMjBh
+    YmMzYzM2N2I2MWIxNTY2MGFhMmM1NDg0ODE3NThjNDkzZjQyZmU=

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem "rdoc", "~> 3"
   gem "bundler", "~> 1.2"
   gem "jeweler", "~> 1.8"
+  gem "simplecov", :require => false, :group => :test
 end

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     addressable (2.3.7)
     builder (3.2.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
     git (1.2.9.1)
@@ -50,6 +51,11 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.3)
     ruby-ip (0.9.3)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
 
 PLATFORMS
   ruby
@@ -60,3 +66,4 @@ DEPENDENCIES
   rdoc (~> 3)
   rspec (~> 2.9)
   ruby-ip (~> 0.9.1)
+  simplecov

data/lib/spf/ext/resolv.rb

@@ -0,0 +1,161 @@
+require 'resolv'
+
+require 'rubygems'  # Gem.ruby_version / Gem::Version
+
+
+# TCP fallback support, redux.
+# A broken version of this made it into Ruby 1.9.2 in October 2010.
+# <http://bugs.ruby-lang.org/issues/3835>  That version would fail when trying
+# a second TCP nameserver.  This improved version fixes that.
+# Filed upstream as <http://bugs.ruby-lang.org/issues/8285>.
+###############################################################################
+
+class Resolv
+  class DNS
+    def each_resource(name, typeclass, &proc)
+      lazy_initialize
+      protocols  = {}                                                           # PATCH
+      requesters = {}                                                           # PATCH
+      senders    = {}
+      #begin                                                                    # PATCH
+      @config.resolv(name) {|candidate, tout, nameserver, port|
+        msg = Message.new
+        msg.rd = 1
+        msg.add_question(candidate, typeclass)
+        protocol  = protocols[candidate] ||= :udp                               # PATCH
+        requester = requesters[[protocol, nameserver]] ||= case protocol        # PATCH
+          when :udp then make_udp_requester                                     # PATCH
+          when :tcp then make_tcp_requester(nameserver, port)                   # PATCH
+        end                                                                     # PATCH
+        sender    = senders[[candidate, requester, nameserver, port]] ||=       # PATCH
+          requester.sender(msg, candidate, nameserver, port)                    # PATCH
+        reply, reply_name = requester.request(sender, tout)
+        case reply.rcode
+        when RCode::NoError
+          if protocol == :udp and reply.tc == 1                                 # PATCH
+            # Retry via TCP:                                                    # PATCH
+            protocols[candidate] = :tcp                                         # PATCH
+            redo                                                                # PATCH
+          else                                                                  # PATCH
+            extract_resources(reply, reply_name, typeclass, &proc)
+          end                                                                   # PATCH
+          return
+        when RCode::NXDomain
+          raise Config::NXDomain.new(reply_name.to_s)
+        else
+          raise Config::OtherResolvError.new(reply_name.to_s)
+        end
+      }
+    ensure
+      requesters.each_value { |requester| requester.close }                     # PATCH
+      #end                                                                      # PATCH
+    end
+
+    #alias_method :make_udp_requester, :make_requester
+
+    def make_tcp_requester(host, port)
+      return Requester::TCP.new(host, port)
+    rescue Errno::ECONNREFUSED
+      # Treat a refused TCP connection attempt to a nameserver like a timeout,
+      # as Resolv::DNS::Config#resolv considers ResolvTimeout exceptions as a
+      # hint to try the next nameserver:
+      raise ResolvTimeout
+    end
+  end
+end
+
+
+# Fix for (unreported) "nil can't be coerced into Fixnum" TypeError exception
+# caused by truncated (or otherwise malformed) answer packets.
+###############################################################################
+
+class Resolv
+  class DNS
+    class Message
+      class MessageDecoder
+
+        def get_labels(limit=nil)
+          limit = @index if !limit || @index < limit
+          d = []
+          while true
+            case @data[@index] && @data[@index].ord                             # PATCH
+            when nil                                                            # PATCH
+              raise DecodeError.new("truncated or malformed packet")            # PATCH
+            when 0
+              @index += 1
+              return d
+            when 192..255
+              idx = self.get_unpack('n')[0] & 0x3fff
+              if limit <= idx
+                raise DecodeError.new("non-backward name pointer")
+              end
+              save_index = @index
+              @index = idx
+              d += self.get_labels(limit)
+              @index = save_index
+              return d
+            else
+              d << self.get_label
+            end
+          end
+          return d
+        end
+
+      end
+    end
+  end
+end
+
+
+# Patch to expose timeout and NXDOMAIN errors to the ultimate caller of
+# Resolv::DNS rather than swallowing them silently and returning an empty
+# result set.
+###############################################################################
+
+class Resolv
+  class TimeoutError  < ResolvError; end
+  class NXDomainError < ResolvError; end
+
+  class DNS
+    class Config
+      attr_accessor :raise_errors                                               # PATCH
+      def resolv(name)
+        candidates = generate_candidates(name)
+        timeouts = generate_timeouts
+        # Collect errors while making the various lookup attempts:              # PATCH
+        errors = []                                                             # PATCH
+        begin
+          candidates.each {|candidate|
+            begin
+              timeouts.each {|tout|
+                @nameserver_port.each {|nameserver, port|
+                  begin
+                    yield candidate, tout, nameserver, port
+                  rescue ResolvTimeout
+                  end
+                }
+              }
+              # Collect a timeout:                                              # PATCH
+              errors << TimeoutError.new("DNS resolv timeout: #{name}")         # PATCH
+            rescue NXDomain
+              # Collect an NXDOMAIN error:                                      # PATCH
+              errors << NXDomainError.new("DNS name does not exist: #{name}")   # PATCH
+            end
+          }
+        rescue ResolvError
+          # Allow subclasses to set this to override this behavior without      # PATCH
+          # wholesale monkeypatching.                                           # PATCH
+          raise if raise_errors                                                 # PATCH
+          # Ignore other errors like vanilla Resolv::DNS does.                  # PATCH
+          # Perhaps this is not a good idea, though, as it silently swallows    # PATCH
+          # SERVFAILs, etc.                                                     # PATCH
+        end
+        # If one lookup succeeds, we will have returned within "yield" already. # PATCH
+        # Otherwise we now raise the first error that occurred:                 # PATCH
+        raise errors.first if not errors.empty?                                 # PATCH
+      end
+    end
+  end
+end
+
+# vim:sw=2 sts=2

data/lib/spf/model.rb

@@ -571,7 +571,7 @@ class SPF::Mech < SPF::Term
       return nil unless server and request
       authority_domain = self.domain(server, request)
       sub_request = request.new_sub_request({:authority_domain => authority_domain})
-      return @nested_record = server.select_record(sub_request, loose_match)
+      return @nested_record = server.selectrecord(sub_request, loose_match)
     end
 
   end
@@ -786,14 +786,14 @@ class SPF::Mod < SPF::Term
     end
 
     def process(server, request, result)
+
       server.count_dns_interactive_term(request)
 
       # Only perform redirection if no mechanism matched (RFC 4408, 6.1/1):
       return unless SPF::Result::NeutralByDefault === result
 
       # Create sub-request with mutated authorithy domain:
-      authority_domain = @domain_spec.new({:server => server, :request => request})
-      sub_request = request.new_sub_request({:authority_domain => authority_domain})
+      sub_request = request.new_sub_request({:authority_domain => @domain_spec})
 
       # Process sub-request:
       result = server.process(sub_request)
@@ -807,7 +807,7 @@ class SPF::Mod < SPF::Term
       end
 
       # Propagate any other results as-is:
-      result.throw
+      raise result
     end
 
     def nested_record(server=nil, request=nil)
@@ -998,6 +998,8 @@ class SPF::Record
           error(SPF::UnexpectedTermObjectError.new("Unexpected term object '#{term}' encountered."))
         end
       end
+      server.throw_result(:neutral_by_default, request,
+        'Default neutral result due to no mechanism matches')
     rescue SPF::Result => result
       # Process global modifiers in ascending order of precedence:
       global_mods.each do |global_mod|

data/lib/spf/request.rb

@@ -22,19 +22,19 @@ class SPF::Request
   DEFAULT_LOCALPART = 'postmaster'
 
   def initialize(options = {})
-    @opt               = options
-    @state             = {}
-    @versions          = options[:versions]
-    @scope             = options[:scope]             || :mfrom
-    @scope             = @scope.to_sym if String === @scope
-    @authority_domain  = options[:authority_domain]
-    @identity          = options[:identity]
-    @ip_address        = options[:ip_address]
-    @helo_identity     = options[:helo_identity]
-    @root_request      = self
-    @super_request     = self
-    @record            = nil
-    @sub_requests      = []
+    @opt              = options
+    @state            = {}
+    @versions         = options[:versions]
+    @scope            = options[:scope] || :mfrom
+    @scope            = @scope.to_sym if String === @scope
+    @authority_domain = options[:authority_domain]
+    @identity         = options[:identity]
+    @ip_address       = options[:ip_address]
+    @helo_identity    = options[:helo_identity]
+    @root_request     = self
+    @super_request    = self
+    @record           = nil
+    @sub_requests     = []
 
     # Scope:
     versions_for_scope = VERSIONS_FOR_SCOPE[@scope] or
@@ -42,11 +42,11 @@ class SPF::Request
 
     # Versions:
     if @versions
-      if Symbol === @versions
-        # Single version specified as a symbol:
+      if Fixnum === @versions
+        # Single version specified as a Fixnum:
         @versions = [@versions]
       elsif not Array === @versions
-        # Something other than symbol or array specified:
+        # Something other than Fixnum or array specified:
         raise SPF::InvalidOptionValueError.new("'versions' option must be symbol or array")
       end
 
@@ -64,6 +64,14 @@ class SPF::Request
       @versions = versions_for_scope
     end
 
+    versions = @versions.select {|x| versions_for_scope.include?(x)}
+    if versions.empty?
+      raise SPF::InvalidScopeError.new(
+        "Invalid scope '#{@scope}' for record version(s) #{@versions}"
+      )
+    end
+    @versions = versions
+
     # Identity:
     raise SPF::OptionRequiredError.new(
       "Missing required 'identity' option") unless @identity
@@ -128,11 +136,15 @@ class SPF::Request
     unless field
       raise SPF::OptionRequiredError.new('Field name required')
     end
-    if value and Fixnum === value
-      @state[field] = 0 unless @state[field]
-      @state[field] += value
+    if value
+      if Fixnum === value
+        @state[field] = 0 unless @state[field]
+        return (@state[field] += value)
+      else
+        return (@state[field] = value)
+      end
     else
-      @state[field] = value
+      return @state[field]
     end
   end
 end

data/lib/spf/result.rb

@@ -4,7 +4,7 @@ require 'spf/util'
 
 class SPF::Result < Exception
 
-  attr_reader :server, :request
+  attr_reader :server, :request, :result_text
 
   class SPF::Result::Pass < SPF::Result
     def code
@@ -63,9 +63,6 @@ class SPF::Result < Exception
     # This is a special-case of the Neutral result that is thrown as a default
     # when "falling off" the end of the record.  See SPF::Record.eval().
     NAME = :neutral_by_default
-    def code
-      :neutral_by_default
-    end
   end
 
   class SPF::Result::None < SPF::Result
@@ -133,6 +130,7 @@ class SPF::Result < Exception
     unless self.instance_variable_defined?(:@request)
       raise SPF::OptionRequiredError.new('Request object required')
     end
+    @result_text = args.shift if args.any?
   end
 
   def name
@@ -142,20 +140,20 @@ class SPF::Result < Exception
   def klass(name=nil)
     if name
       name = name.to_sym if String === name
-      return self.RESULT_CLASSES[name]
+      return RESULT_CLASSES[name]
     else
       return name
     end
   end
 
   def isa_by_name(name)
-    suspect_class = self.klass(name)
+    suspect_class = self.klass(name.downcase)
     return false unless suspect_class
     return suspect_class === self
   end
   
   def is_code(code)
-    return self.isa_by_name(code)
+    return self.isa_by_name(code.downcase)
   end
 
   def to_s

data/lib/spf/version.rb

@@ -1,6 +1,6 @@
 # encoding: ASCII-8BIT
 module SPF
-  VERSION = '0.0.46'
+  VERSION = '0.0.47'
 end
 
 # vim:sw=2 sts=2

data/lib/spf.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+require 'spf/ext/resolv'
 require 'spf/version'
 require 'spf/error'
 require 'spf/model'

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
@@ -8,5 +11,4 @@ require 'spf'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
 end

data/spec/spf_spec.rb

@@ -1,7 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "SPF" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
+describe 'SPF' do
 end

data/spf.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: spf 0.0.47 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "spf"
-  s.version = "0.0.46"
+  s.version = "0.0.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Andrew Flury", "Julian Mehnle", "Jacob Rideout"]
-  s.date = "2015-03-04"
+  s.date = "2015-04-29"
   s.description = "    An object-oriented Ruby implementation of the Sender Policy Framework (SPF)\n    e-mail sender authentication system, fully compliant with RFC 4408.\n"
   s.email = ["code@agari.com", "aflury@agari.com", "jmehnle@agari.com", "jrideout@agari.com"]
   s.extra_rdoc_files = [
@@ -31,18 +33,18 @@ Gem::Specification.new do |s|
     "lib/spf/result.rb",
     "lib/spf/util.rb",
     "lib/spf/version.rb",
+    "lib/spf/ext/resolv.rb",
     "spec/spec_helper.rb",
     "spec/spf_spec.rb",
     "spf.gemspec"
   ]
   s.homepage = "https://github.com/agaridata/spf-ruby"
   s.licenses = ["none (all rights reserved)"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "Implementation of the Sender Policy Framework"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-ip>, ["~> 0.9.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spf
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - Andrew Flury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ip
@@ -103,6 +103,7 @@ files:
 - lib/spf.rb
 - lib/spf/error.rb
 - lib/spf/eval.rb
+- lib/spf/ext/resolv.rb
 - lib/spf/macro_string.rb
 - lib/spf/model.rb
 - lib/spf/request.rb
@@ -134,7 +135,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Implementation of the Sender Policy Framework
 test_files: []
 has_rdoc: