spf 0.0.53 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9b5b96521a48a4f0b0a78397d6e21ff99d03b9d144df182bfd68b0369046d73e
-  data.tar.gz: 17025632b91737a607a5035b9dfd2405bb080eeaee3e8091cd5e71dc4729cd4d
+SHA1:
+  metadata.gz: 8e8afc8e375d137af56775cbd41cfd3d3105cf45
+  data.tar.gz: 75a7ca24ee85ebf0a4e1986a0b5af7c4ee263bde
 SHA512:
-  metadata.gz: aea5c665821e18e2724d0d0e92ca02a89347eabc53226135944b9de65b7b20d25f64401128606f49367a718e637b2d425fa6bb2fdb0999b3cbecae72c5698852
-  data.tar.gz: f4f74a840d9fbe744d5b2fbf52abb5011f5c75672b648e6d0512450d7261997ee4006a83f707ec50300639972a235b0d261e11ac976bddf5a2eea13db8944150
+  metadata.gz: 1d67198fa465bafabb7e1de1d929c75d92ae12f422c815762456758cbea43f99f40c903c4b07c25109a21c7f0247f6a9a8dce4e9b2e75829b92dfdc58bb42fdd
+  data.tar.gz: 8e1d403dd518403d70bed335c2c19fb03bb026d226db073b095b54dc0fe90aa26c2705426a646ad14d7603ef5877ff940068dfd845b4100ab71e6ea7ac53cd82

data/Gemfile.lock

@@ -45,7 +45,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.2.0)
+    psych (3.1.0)
     rack (2.2.3)
     rake (13.0.1)
     rchardet (1.8.0)

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
-
-      records.flatten!
-      loose_records.flatten!
+    # Unless at least one query succeeded, re-raise the first DNS error that occured.
+    raise dns_errors[0] unless dns_errors.length < query_count
 
-      if records.empty?
-        # RFC 4408, 4.5/7
-        raise SPF::NoAcceptableRecordError.new('No applicable sender policy available',
-                                               loose_records)
-      end
+    records.flatten!
+    loose_records.flatten!
 
-      # 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)

data/lib/spf/model.rb

@@ -995,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.53'
+  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.53"
+  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.53
+  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
@@ -118,7 +118,7 @@ homepage: https://github.com/agaridata/spf-ruby
 licenses:
 - none (all rights reserved)
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.1
+signing_key:
 specification_version: 4
 summary: Implementation of the Sender Policy Framework
 test_files: []