spf 0.0.21 → 0.0.22

data/lib/spf/error.rb

@@ -36,6 +36,7 @@ module SPF
       class DuplicateGlobalMod                < InvalidModError;    end  # Duplicate global modifier
       class InvalidMechError                  < InvalidTermError;   end  # Invalid mechanism
       class InvalidMechQualifierError         < InvalidMechError;   end  # Invalid mechanism qualifier
+      class InvalidMechCIDRError              < InvalidMechError;   end  # Invalid CIDR netblock in mech
       class TermDomainSpecExpectedError     < SyntaxError;          end  # Missing required <domain-spec> in term
       class TermIPv4AddressExpectedError    < SyntaxError;          end  # Missing required <ip4-network> in term
       class TermIPv4PrefixLengthExpected    < SyntaxError;          end  # Missing required <ip4-cidr-length> in term

data/lib/spf/model.rb

@@ -386,7 +386,7 @@ class SPF::Mech < SPF::Term
 
     def match(server, request, want_result = true)
       server.count_dns_interactive_term(request)
-      return self.match_in_domain(server, request)
+      return self.match_in_domain(server, request, request.domain)
     end
 
   end
@@ -440,7 +440,12 @@ class SPF::Mech < SPF::Term
 
     def parse_params(required = true)
       self.parse_ipv4_network(required)
-      @ip_netblocks << @ip_network if IP === @ip_network
+      if IP === @ip_network
+        @ip_netblocks << @ip_network
+        @errors << SPF::InvalidMechCIDRError.new(
+          'Invalid CIDR netblock - bits in host portion of address'
+        ) if @ip_network.offset != 0
+      end
     end
 
     def params
@@ -470,6 +475,9 @@ class SPF::Mech < SPF::Term
     def parse_params(required = true)
       self.parse_ipv6_network(required)
       @ip_netblocks << @ip_network if IP === @ip_network
+      @errors << SPF::InvalidMechCIDRError.new(
+        'Invalid CIDR netblock - bits in host portion of address'
+      ) if @ip_network.offset != 0
     end
 
     def params
@@ -1045,6 +1053,10 @@ class SPF::Record
       'v=spf2.0'
     end
 
+    def scopes
+      [:mfrom, :pra]
+    end
+
     def version_tag_pattern
     "
       spf(2\.0)

data/lib/spf/version.rb

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