spf 0.0.51 → 0.0.54

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODUyYWMzZjg2M2M5NjRkNjVjOWY1MDE2NDQ3ODE4OWJlYmZkZDk0YQ==
-  data.tar.gz: !binary |-
-    ZmZjZjhkNGU3NTNjNTUwNTdjZDFiOWRlNzEzM2I5Y2QzZTYwZjQ3Nw==
+SHA1:
+  metadata.gz: 8e8afc8e375d137af56775cbd41cfd3d3105cf45
+  data.tar.gz: 75a7ca24ee85ebf0a4e1986a0b5af7c4ee263bde
 SHA512:
-  metadata.gz: !binary |-
-    NGI0Yjg3ZTRlNzk0ZjA4MTUzMzEwMjE0YThmMzIyMTQ5ZWUyNTI3NjQwNDEy
-    NWE2ODc1ZDA2OTRlNzQ5YjYzZjUzNDY2MmJjMTZhMWNlMmQ5ODdjOWMzYTIx
-    N2YzYWFhMjAyZjQyMzBkZmUyMDc0YjUxMzIyM2ZkY2IwYzhhOGI=
-  data.tar.gz: !binary |-
-    YzBjYTc5ZDA5MzRlMjQ2N2RlNDQ4ZjlhZmU2YzQ1ODYwMWJhMjY4NGU0MDVk
-    Yjg0N2RiNDNiMmQ4NTBkNjExN2NjYjRiZTI1Zjk1M2M3NjBkZmMwOTNmNGE1
-    Y2M0M2MyNzJhMWNmZThmOTg2ZGNhNTBjMzNmY2M4MWFhNDc1Y2Y=
+  metadata.gz: 1d67198fa465bafabb7e1de1d929c75d92ae12f422c815762456758cbea43f99f40c903c4b07c25109a21c7f0247f6a9a8dce4e9b2e75829b92dfdc58bb42fdd
+  data.tar.gz: 8e1d403dd518403d70bed335c2c19fb03bb026d226db073b095b54dc0fe90aa26c2705426a646ad14d7603ef5877ff940068dfd845b4100ab71e6ea7ac53cd82

data/Gemfile

@@ -9,8 +9,8 @@ gem "ruby-ip", "~> 0.9.1"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.9"
-  gem "rdoc", "~> 3"
+  gem "rdoc", "~> 4.3"
   gem "bundler", "~> 1.2"
-  gem "jeweler", "~> 1.8"
+  gem "jeweler", "~> 2.3", ">= 2.3.9"
   gem "simplecov", :require => false, :group => :test
 end

data/Gemfile.lock

@@ -1,47 +1,55 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.7)
-    builder (3.2.2)
+    addressable (2.4.0)
+    builder (3.2.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.9.1)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (3.4.0)
-    highline (1.7.1)
-    jeweler (1.8.8)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    jeweler (2.3.9)
       builder
-      bundler (~> 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.2)
-    jwt (1.3.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      semver2
+    jwt (2.2.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.4.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.2)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      rack (>= 1.2, < 3)
+    psych (3.1.0)
+    rack (2.2.3)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rdoc (4.3.0)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -51,19 +59,24 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.3)
     ruby-ip (0.9.3)
+    semver2 (3.4.2)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
+    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.2)
-  jeweler (~> 1.8)
-  rdoc (~> 3)
+  jeweler (~> 2.3, >= 2.3.9)
+  rdoc (~> 4.3)
   rspec (~> 2.9)
   ruby-ip (~> 0.9.1)
   simplecov
+
+BUNDLED WITH
+   1.17.3

data/lib/spf/eval.rb

@@ -188,75 +188,62 @@ class SPF::Server
     query_count   = 0
     dns_errors    = []
 
-    # Query for SPF-type RRs first:
-    if (@query_rr_types == QUERY_RR_TYPE_ALL or
-        @query_rr_types & QUERY_RR_TYPE_SPF)
+    # Query for TXT-type RRs first:
+    if @query_rr_types != QUERY_RR_TYPE_SPF
       begin
         query_count += 1
-        packet = self.dns_lookup(domain, 'SPF')
+        packet = self.dns_lookup(domain, 'TXT')
         matches = self.get_acceptable_records_from_packet(
-          packet, 'SPF', versions, scope, domain, loose_match)
+          packet, 'TXT', versions, scope, domain, loose_match)
         records << matches[0]
         loose_records << matches[1]
       rescue SPF::DNSError => e
         dns_errors << e
-      #rescue SPF::DNSTimeout => e
-      #  # FIXME: Ignore DNS timeouts on SPF type lookups?
-      #  # Apparently some brain-dead DNS servers time out on SPF-type queries.
       end
     end
 
-    if (not records.flatten.any? and
-        @query_rr_types == QUERY_RR_TYPE_ALL or
-        @query_rr_types & QUERY_RR_TYPE_TXT)
-      # NOTE:
-      #   This deliberately violates RFC 4406 (Sender ID), 4.4/3 (4.4.1):
-      #   TXT-type RRs are still tried if there _are_ SPF-type RRs but all
-      #   of them are inapplicable (e.g. "Hi!", or even "spf2/pra" for an
-      #   'mfrom' scope request).  This conforms to the spirit of the more
-      #   sensible algorithm in RFC 4408 (SPF), 4.5.
-      #   Implication:  Sender ID processing may make use of existing TXT-
-      #   type records where a result of "None" would normally be returned
-      #   under a strict interpretation of RFC 4406.
-
+    if records.flatten.empty? && @query_rr_types != QUERY_RR_TYPE_TXT
       begin
         query_count += 1
-        packet = self.dns_lookup(domain, 'TXT')
+        packet = self.dns_lookup(domain, 'SPF')
         matches = self.get_acceptable_records_from_packet(
-          packet, 'TXT', versions, scope, domain, loose_match)
+          packet, 'SPF', versions, scope, domain, loose_match)
         records << matches[0]
         loose_records << matches[1]
       rescue SPF::DNSError => e
         dns_errors << e
+      #rescue SPF::DNSTimeout => e
+      #  # FIXME: Ignore DNS timeouts on SPF type lookups?
+      #  # Apparently some brain-dead DNS servers time out on SPF-type queries.
       end
+    end
 
-      # Unless at least one query succeeded, re-raise the first DNS error that occured.
-      raise dns_errors[0] unless dns_errors.length < query_count
+    # Unless at least one query succeeded, re-raise the first DNS error that occured.
+    raise dns_errors[0] unless dns_errors.length < query_count
 
-      records.flatten!
-      loose_records.flatten!
+    records.flatten!
+    loose_records.flatten!
 
-      if records.empty?
-        # RFC 4408, 4.5/7
-        raise SPF::NoAcceptableRecordError.new('No applicable sender policy available',
-                                               loose_records)
-      end
-
-      # Discard all records but the highest acceptable version:
-      preferred_record_class = records[0].class
+    if records.empty?
+      # RFC 4408, 4.5/7
+      raise SPF::NoAcceptableRecordError.new('No applicable sender policy available',
+                                              loose_records)
+    end
 
-      records = records.select { |record| preferred_record_class === record }
+    # Discard all records but the highest acceptable version:
+    preferred_record_class = records[0].class
 
-      if records.length != 1
-        # RFC 4408, 4.5/6
-        raise SPF::RedundantAcceptableRecordsError.new(
-          "Redundant applicable '#{preferred_record_class.version_tag}' sender policies found",
-          records
-        )
-      end
+    records = records.select { |record| preferred_record_class === record }
 
-      return records[0]
+    if records.length != 1
+      # RFC 4408, 4.5/6
+      raise SPF::RedundantAcceptableRecordsError.new(
+        "Redundant applicable '#{preferred_record_class.version_tag}' sender policies found",
+        records
+      )
     end
+
+    return records[0]
   end
 
   def get_acceptable_records_from_packet(packet, rr_type, versions, scope, domain, loose_match)
@@ -275,7 +262,13 @@ class SPF::Server
       versions.each do |version|
         klass = RECORD_CLASSES_BY_VERSION[version]
         begin
-          record = klass.new_from_string(text, {:raise_exceptions => @raise_exceptions})
+          options = {:raise_exceptions => @raise_exceptions}
+          # A MacroString object for domain indicates this is a nested record.
+          # Storing the domain.text maintains an association to the include domain.
+          if domain.class == SPF::MacroString
+            options[:record_domain] = domain.text
+          end
+          record = klass.new_from_string(text, options)
         rescue SPF::InvalidRecordVersionError => error
           if text =~ /#{LOOSE_SPF_MATCH_PATTERN}/
             possible_matches << text

data/lib/spf/model.rb

@@ -86,7 +86,7 @@ class SPF::Term
  ::
   "
 
-  attr_reader :errors, :ip_netblocks, :ip_address, :ip_network, :ipv4_prefix_length, :ipv6_prefix_length, :domain_spec, :raw_params
+  attr_reader :errors, :ip_netblocks, :ip_address, :ip_network, :ipv4_prefix_length, :ipv6_prefix_length, :domain_spec, :raw_params, :record_domain
 
   def initialize(options = {})
     @ip_address         = nil
@@ -97,6 +97,7 @@ class SPF::Term
     @errors             = []
     @ip_netblocks       = []
     @text               = options[:text]
+    @record_domain      = options[:record_domain]
     @raise_exceptions   = options.has_key?(:raise_exceptions) ? options[:raise_exceptions] : true
   end
 
@@ -117,6 +118,8 @@ class SPF::Term
       domain_spec = $1
       domain_spec.sub!(/^(.*?)\.?$/, $1)
       @domain_spec = SPF::MacroString.new({:text => domain_spec})
+    elsif record_domain
+      @domain_spec = SPF::MacroString.new({:text => record_domain})
     elsif required
       error(SPF::TermDomainSpecExpectedError.new(
         "Missing required domain-spec in '#{@text}'"))
@@ -844,6 +847,7 @@ class SPF::Record
     @global_mods    ||= {}
     @errors           = []
     @ip_netblocks     = []
+    @record_domain    = options[:record_domain]
     @raise_exceptions = options.has_key?(:raise_exceptions) ? options[:raise_exceptions] : true
   end
 
@@ -914,7 +918,11 @@ class SPF::Record
         error(exception)
         mech_class = SPF::Mech
       end
-      term = mech = mech_class.new_from_string(mech_text, {:raise_exceptions => @raise_exceptions})
+      options = {:raise_exceptions => @raise_exceptions}
+      if instance_variable_defined?("@record_domain")
+        options[:record_domain] = @record_domain
+      end
+      term = mech = mech_class.new_from_string(mech_text, options)
       term.errors << exception if exception
       @ip_netblocks << mech.ip_netblocks if mech.ip_netblocks
       @terms << mech
@@ -987,7 +995,7 @@ class SPF::Record
           if mech.match(server, request, request.ip_address != nil)
             result_name = RESULTS_BY_QUALIFIER[mech.qualifier]
             result_class = server.result_class(result_name)
-            result = result_class.new([server, request, "Mechanism '#{term}' matched"])
+            result = result_class.new([server, request, "Mechanism '#{term.text}' matched"])
             mech.explain(server, request, result)
             raise result if want_result
           end

data/lib/spf/version.rb

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

data/spf.gemspec

@@ -3,10 +3,12 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 # stub: spf 0.0.48 ruby lib
+$:.unshift File.expand_path("../lib", __FILE__)
+require 'spf/version'
 
 Gem::Specification.new do |s|
   s.name = "spf"
-  s.version = "0.0.51"
+  s.version = SPF::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spf
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.54
 platform: ruby
 authors:
 - Andrew Flury
 - Julian Mehnle
 - Jacob Rideout
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-04-29 00:00:00.000000000 Z
@@ -16,74 +16,75 @@ dependencies:
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-description: ! "    An object-oriented Ruby implementation of the Sender Policy Framework
-  (SPF)\n    e-mail sender authentication system, fully compliant with RFC 4408.\n"
+description: |2
+      An object-oriented Ruby implementation of the Sender Policy Framework (SPF)
+      e-mail sender authentication system, fully compliant with RFC 4408.
 email:
 - code@agari.com
 - aflury@agari.com
@@ -94,8 +95,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -117,24 +118,24 @@ homepage: https://github.com/agaridata/spf-ruby
 licenses:
 - none (all rights reserved)
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.1
+signing_key:
 specification_version: 4
 summary: Implementation of the Sender Policy Framework
 test_files: []