spf-query 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aaee47c91c92d11223cae3ab6c1be8d72fe2a1a
-  data.tar.gz: 6e46d9c6fad3583d82060eeb25fdcfcc4e256f0e
+  metadata.gz: 5821a96acdc66745d783eaf3e0bb03653892b421
+  data.tar.gz: 74c7214b71a9d14616290e4126a721b0a026734a
 SHA512:
-  metadata.gz: 3e6b33218b3dcfdf66df6d96257a9a95dd75540950cbb2db636c93f8a558c4afd24ca7b3f1c5df329bc3c75905accb3924d5febf6ad49c1144ca3cefb16fa497
-  data.tar.gz: 46bf3af116a0483d330b04dc0d5cd8f837dba90e14b8128f9d406f37b42eae517a51da4dd7d74911de0b7c1ebfd2dca771d400b53f997b87d3814ab0d7038fae
+  metadata.gz: 71780740178980f74a8ea65be8767e4ce35c3a6158f5c27bff47e1f7bf93a39775914348cb57d84f0f4035190f53a220e362ee020c40e1cd5f73190d85503eeb
+  data.tar.gz: 76f120cbca0b71028519ccbb20aeb32eb50e707c8f82ac707d272be5ac3593005bd295cb675c25f28e2c910d5a95bdcd51bdd63a2861e66c633f259a62ca0ede

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.1.4 / 2015-12-10
+
+* Prioritize TXT records on `_spf.example.com` and `example.com` over a SPF
+  record on `example.com`. [RFC 7208] deprecated SPF-type records.
+  (@nandosousafr)
+
 ### 0.1.3 / 2015-10-19
 
 * Join multi-part DNS responses together with a `' '` instead of nothing.
@@ -20,3 +26,4 @@
   * Queries and parses SPF records.
   * Supports querying both TXT and SPF records.
 
+[RFC 7208]: https://tools.ietf.org/html/rfc7208#section-3.1

data/lib/spf/query/query.rb

@@ -18,14 +18,6 @@ module SPF
     # @api semipublic
     #
     def self.query(domain,resolver=Resolv::DNS.new)
-      # check for an SPF record on the domain
-      begin
-        record = resolver.getresource(domain, Resolv::DNS::Resource::IN::SPF)
-
-        return record.strings.join(' ')
-      rescue Resolv::ResolvError
-      end
-
       # check for SPF in the TXT records
       ["_spf.#{domain}", domain].each do |host|
         begin
@@ -42,6 +34,14 @@ module SPF
         end
       end
 
+      # check for an SPF record on the domain
+      begin
+        record = resolver.getresource(domain, Resolv::DNS::Resource::IN::SPF)
+
+        return record.strings.join(' ')
+      rescue Resolv::ResolvError
+      end
+
       return nil
     end
   end

data/lib/spf/query/version.rb

@@ -1,5 +1,5 @@
 module SPF
   module Query
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/spec/query_spec.rb

@@ -22,7 +22,11 @@ describe SPF::Query do
     context "when the domain has a SPF type record" do
       let(:domain) { 'getlua.com' }
 
-      it "should prefer the SPF type record over other TXT records" do
+      it "should prefer the TXT type record over other SPF records" do
+        expect_any_instance_of(Resolv::DNS).to_not receive(:getresource).with("getlua.com", Resolv::DNS::Resource::IN::SPF)
+        expect_any_instance_of(Resolv::DNS).to receive(:getresources).with("getlua.com", Resolv::DNS::Resource::IN::TXT).at_least(:once).and_call_original
+        expect_any_instance_of(Resolv::DNS).to receive(:getresources).with("_spf.getlua.com", Resolv::DNS::Resource::IN::TXT).at_least(:once).and_call_original
+
         expect(subject.query(domain)).to be == %{v=spf1 include:_spf.google.com include:mail.zendesk.com include:servers.mcsv.net -all}
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spf-query
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - nicktitle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet