spf 0.0.26 → 0.0.27

data/lib/spf/error.rb

@@ -14,15 +14,15 @@ module SPF
 
     class DNSError                        < Error;                  end  # DNS error
       class DNSTimeoutError                 < DNSError;             end  # DNS timeout
-    class RecordSelectionError            < Error;                  end  # Record selection error
-      class NoAcceptableRecordError         < RecordSelectionError; end  # No acceptable record found
-      class RedundantAcceptableRecordsError < RecordSelectionError       # Redundant acceptable records found
-        attr_accessor :records
-        def initialize(message, records=[])
-          @records = records
-          super(message)
-        end
+    class RecordSelectionError            < Error                        # Record selection error
+      attr_accessor :records
+      def initialize(message, records=[])
+        @records = records
+        super(message)
       end
+    end
+      class NoAcceptableRecordError         < RecordSelectionError; end  # No acceptable record found
+      class RedundantAcceptableRecordsError < RecordSelectionError; end  # Redundant acceptable records found
     class NoUnparsedTextError             < Error;                  end  # No unparsed text available
     class UnexpectedTermObjectError       < Error;                  end  # Unexpected term object encountered
     class ProcessingLimitExceededError    < Error;                  end  # Processing limit exceeded
@@ -33,7 +33,7 @@ module SPF
 
     class NothingToParseError             < Error;                  end  # Nothing to parse
     class SyntaxError                     < Error                        # Generic syntax error
-      attr_accessor :text, :parse_text
+      attr_accessor :text, :parse_text, :domain
       def initialize(message, text=nil, parse_text=nil)
         @text = text
         @parse_text = parse_text

data/lib/spf/eval.rb

@@ -44,6 +44,8 @@ class SPF::Server
   DEFAULT_MAX_NAME_LOOKUPS_PER_PTR_MECH = DEFAULT_MAX_NAME_LOOKUPS_PER_TERM
   DEFAULT_MAX_VOID_DNS_LOOKUPS          = 2
 
+  LOOSE_SPF_MATCH_PATTERN = 'v=spf'
+
   def initialize(options = {})
     @default_authority_explanation = options[:default_authority_explanation] ||
       DEFAULT_DEFAULT_AUTHORITY_EXPLANATION
@@ -159,7 +161,7 @@ class SPF::Server
     return packet
   end
 
-  def select_record(request)
+  def select_record(request, loose_match = false)
     domain   = request.authority_domain
     versions = request.versions
     scope    = request.scope
@@ -169,9 +171,10 @@ class SPF::Server
     # in future revisions of SPF):
     # Query for SPF type records first, then fall back to TXT type records.
 
-    records     = []
-    query_count = 0
-    dns_errors  = []
+    records       = []
+    loose_records = []
+    query_count   = 0
+    dns_errors    = []
 
     # Query for SPF-type RRs first:
     if (@query_rr_types == QUERY_RR_TYPE_ALL or
@@ -179,8 +182,10 @@ class SPF::Server
       begin
         query_count += 1
         packet = self.dns_lookup(domain, 'SPF')
-        records << self.get_acceptable_records_from_packet(
-          packet, 'SPF', versions, scope, domain)
+        matches = self.get_acceptable_records_from_packet(
+          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
@@ -205,8 +210,10 @@ class SPF::Server
       begin
         query_count += 1
         packet = self.dns_lookup(domain, 'TXT')
-        records << self.get_acceptable_records_from_packet(
-          packet, 'TXT', versions, scope, domain)
+        matches = self.get_acceptable_records_from_packet(
+          packet, 'TXT', versions, scope, domain, loose_match)
+        records << matches[0]
+        loose_records << matches[1]
       rescue SPF::DNSError => e
         dns_errors << e
       end
@@ -215,10 +222,12 @@ class SPF::Server
       raise dns_errors[0] unless dns_errors.length < query_count
 
       records.flatten!
+      loose_records.flatten!
 
       if records.empty?
         # RFC 4408, 4.5/7
-        raise SPF::NoAcceptableRecordError.new('No applicable sender policy available')
+        raise SPF::NoAcceptableRecordError.new('No applicable sender policy available',
+                                               loose_records)
       end
 
       # Discard all records but the highest acceptable version:
@@ -238,7 +247,7 @@ class SPF::Server
     end
   end
 
-  def get_acceptable_records_from_packet(packet, rr_type, versions, scope, domain)
+  def get_acceptable_records_from_packet(packet, rr_type, versions, scope, domain, loose_match)
 
     # Try higher record versions first.
     # (This may be too simplistic for future revisions of SPF.)
@@ -246,6 +255,7 @@ class SPF::Server
 
     rr_type = resource_typeclass_for_rr_type(rr_type)
     records = []
+    possible_matches = []
     packet.each do |rr|
       next unless rr_type === rr
       text = rr.strings.join('')
@@ -255,6 +265,9 @@ class SPF::Server
         begin
           record = klass.new_from_string(text, {:raise_exceptions => @raise_exceptions})
         rescue SPF::InvalidRecordVersionError => error
+          if text =~ /#{LOOSE_SPF_MATCH_PATTERN}/
+            possible_matches << text
+          end
           # Ignore non-SPF and unknown-version records.
           # Propagate other errors (including syntax errors), though.
         end
@@ -266,7 +279,7 @@ class SPF::Server
         end
       end
     end
-    return records
+    return records, possible_matches
   end
 
   def count_dns_interactive_term(request)

data/lib/spf/model.rb

@@ -551,12 +551,12 @@ class SPF::Mech < SPF::Term
       raise result
     end
 
-    def nested_record(server=nil, request=nil)
+    def nested_record(server=nil, request=nil, loose_match = false)
       return @nested_record if @nested_record
       authority_domain = self.domain(server, request)
       return nil unless request
       sub_request = request.new_sub_request({:authority_domain => authority_domain})
-      return @nested_record = server.select_record(sub_request)
+      return @nested_record = server.select_record(sub_request, loose_match)
     end
 
   end

data/lib/spf/version.rb

@@ -1,5 +1,5 @@
 module SPF
-  VERSION = '0.0.26'
+  VERSION = '0.0.27'
 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.26"
+  s.version = "0.0.27"
 
   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.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors: