coppertone 0.0.1 → 0.0.2

data/spec/rfc7208-tests.yml

@@ -128,6 +128,14 @@ tests:
     host: 192.0.2.3
     mailfrom: "foobar@ctrl.example.com"
     result: permerror
+  two-spaces:
+    description: >-
+      ABNF for term separation is one or more spaces, not just one.
+    spec: 4.6.1
+    helo: hosed
+    host: 1.2.3.4
+    mailfrom: "actually@fine.example.com"
+    result: fail
 zonedata:
   example.com:
     - TIMEOUT
@@ -151,6 +159,8 @@ zonedata:
   ctrl.example.com:
     - TXT:  "v=spf1 a:ctrl.example.com\x0dptr -all"
     - A: 192.0.2.3
+  fine.example.com:
+    - TXT: "v=spf1 a  -all"
 ---
 description: Record lookup
 tests:

metadata

@@ -1,124 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: coppertone
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter M. Goldstein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: dns_adapter
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: i18n
+  prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: addressable
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  name: activesupport
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Coppertone includes tools for parsing SPF DNS records, evaluating the
-  result of SPF checks for received emails, and creating appropriate email headers
-  from SPF results.
+description: Coppertone includes tools for parsing SPF DNS records, evaluating the result of SPF checks for received emails, and creating appropriate email headers from SPF results.
 email:
 - peter.m.goldstein@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -127,10 +139,6 @@ files:
 - lib/coppertone.rb
 - lib/coppertone/class_builder.rb
 - lib/coppertone/directive.rb
-- lib/coppertone/dns.rb
-- lib/coppertone/dns/error.rb
-- lib/coppertone/dns/mock_client.rb
-- lib/coppertone/dns/resolv_client.rb
 - lib/coppertone/domain_spec.rb
 - lib/coppertone/error.rb
 - lib/coppertone/ip_address_wrapper.rb
@@ -161,10 +169,12 @@ files:
 - lib/coppertone/modifier/exp.rb
 - lib/coppertone/modifier/redirect.rb
 - lib/coppertone/modifier/unknown.rb
+- lib/coppertone/null_macro_context.rb
 - lib/coppertone/qualifier.rb
 - lib/coppertone/record.rb
 - lib/coppertone/record_evaluator.rb
 - lib/coppertone/record_finder.rb
+- lib/coppertone/record_term_parser.rb
 - lib/coppertone/request.rb
 - lib/coppertone/request_context.rb
 - lib/coppertone/request_count_limiter.rb
@@ -178,9 +188,7 @@ files:
 - lib/coppertone/utils/ip_in_domain_checker.rb
 - lib/coppertone/utils/validated_domain_finder.rb
 - lib/coppertone/version.rb
-- lib/resolv/dns/resource/in/spf.rb
 - spec/directive_spec.rb
-- spec/dns/resolv_client_spec.rb
 - spec/domain_spec_spec.rb
 - spec/ip_address_wrapper_spec.rb
 - spec/macro_context_spec.rb
@@ -197,6 +205,8 @@ files:
 - spec/mechanism/mx_spec.rb
 - spec/mechanism/ptr_spec.rb
 - spec/mechanism_spec.rb
+- spec/modifier/exp_spec.rb
+- spec/modifier/redirect_spec.rb
 - spec/modifier_spec.rb
 - spec/open_spf/ALL_mechanism_syntax_spec.rb
 - spec/open_spf/A_mechanism_syntax_spec.rb
@@ -233,29 +243,28 @@ homepage: https://github.com/petergoldstein/coppertone
 licenses:
 - Apache
 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.4.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: A Sender Policy Framework (SPF) toolkit
 test_files:
 - spec/directive_spec.rb
-- spec/dns/resolv_client_spec.rb
 - spec/domain_spec_spec.rb
 - spec/ip_address_wrapper_spec.rb
 - spec/macro_context_spec.rb
@@ -272,6 +281,8 @@ test_files:
 - spec/mechanism/mx_spec.rb
 - spec/mechanism/ptr_spec.rb
 - spec/mechanism_spec.rb
+- spec/modifier/exp_spec.rb
+- spec/modifier/redirect_spec.rb
 - spec/modifier_spec.rb
 - spec/open_spf/ALL_mechanism_syntax_spec.rb
 - spec/open_spf/A_mechanism_syntax_spec.rb

data/lib/coppertone/dns/error.rb

@@ -1,9 +0,0 @@
-require 'coppertone/error'
-
-module Coppertone
-  module DNS
-    class Error < ::Coppertone::TemperrorError; end
-    class TimeoutError < Error; end
-    class NXDomainError < Error; end
-  end
-end

data/lib/coppertone/dns/mock_client.rb

@@ -1,106 +0,0 @@
-require 'coppertone/error'
-
-module Coppertone
-  module DNS
-    # A mock client for use in tests.
-    class MockClient
-      def initialize(zone_data)
-        @zone_data = {}
-        zone_data.each do |k, v|
-          @zone_data[k.downcase] = v.dup
-        end
-      end
-
-      def fetch_a_records(domain)
-        fetch_records(domain, 'A')
-      end
-
-      def fetch_aaaa_records(domain)
-        fetch_records(domain, 'AAAA')
-      end
-
-      def fetch_mx_records(domain)
-        fetch_records(domain, 'MX')
-      end
-
-      def fetch_ptr_records(arpa_address)
-        fetch_records(arpa_address, 'PTR')
-      end
-
-      def fetch_txt_records(domain)
-        fetch_records(domain, 'TXT')
-      end
-
-      def fetch_spf_records(domain)
-        fetch_records(domain, 'SPF')
-      end
-
-      def fetch_records(domain, type)
-        record_set = find_records_for_domain(domain)
-        return [] if record_set.empty?
-        records = records_for_type(record_set, type)
-        if records.empty?
-          check_for_timeout(record_set)
-        else
-          formatted_records(records, type)
-        end
-      end
-
-      private
-
-      def normalize_domain(domain)
-        return if domain.blank?
-        domain = domain[0...-1] if domain[domain.length - 1] == '.'
-        domain.downcase
-      end
-
-      def find_records_for_domain(domain)
-        return [] if domain.blank?
-        @zone_data[normalize_domain(domain)] || []
-      end
-
-      def records_for_type(record_set, type)
-        record_set.select do |r|
-          r.is_a?(Hash) && r[type] && r[type] != 'NONE'
-        end
-      end
-
-      TIMEOUT = 'TIMEOUT'
-      def check_for_timeout(record_set)
-        return [] if record_set.select { |r| r == TIMEOUT }.empty?
-        fail Coppertone::DNS::TimeoutError
-      end
-
-      RECORD_TYPE_TO_ATTR_NAME_MAP = {
-        'A' => :address,
-        'AAAA' => :address,
-        'MX' => :exchange,
-        'PTR' => :name,
-        'SPF' => :text,
-        'TXT' => :text
-      }
-
-      def formatted_records(records, type)
-        records.map do |r|
-          val = r[type]
-          fail Coppertone::DNS::TimeoutError if val == TIMEOUT
-          val = normalize_value(val, type)
-          {
-            type: type,
-            RECORD_TYPE_TO_ATTR_NAME_MAP[type] => val
-          }
-        end
-      end
-
-      def normalize_value(value, type)
-        if type == 'MX' && value.is_a?(Array)
-          value.last
-        elsif (type == 'TXT' || type == 'SPF') && value.is_a?(Array)
-          value.join('')
-        else
-          value
-        end
-      end
-    end
-  end
-end

data/lib/coppertone/dns/resolv_client.rb

@@ -1,110 +0,0 @@
-require 'resolv'
-require 'resolv/dns/resource/in/spf'
-
-module Coppertone
-  module DNS
-    # An adapter client for the internal Resolv DNS client.
-    class ResolvClient
-      def fetch_a_records(domain)
-        fetch_a_type_records(domain, 'A')
-      end
-
-      def fetch_aaaa_records(domain)
-        fetch_a_type_records(domain, 'AAAA')
-      end
-
-      def fetch_mx_records(domain)
-        fetch_records(domain, 'MX') do |record|
-          {
-            type: 'MX',
-            exchange: record.exchange.to_s
-          }
-        end
-      end
-
-      def fetch_ptr_records(arpa_address)
-        fetch_records(arpa_address, 'PTR') do |record|
-          {
-            type: 'PTR',
-            name: record.name.to_s
-          }
-        end
-      end
-
-      def fetch_txt_records(domain)
-        fetch_txt_type_records(domain, 'TXT')
-      end
-
-      def fetch_spf_records(domain)
-        fetch_txt_type_records(domain, 'SPF')
-      end
-
-      private
-
-      def fetch_a_type_records(domain, type)
-        fetch_records(domain, type) do |record|
-          {
-            type: type,
-            address: record.address.to_s
-          }
-        end
-      end
-
-      def fetch_txt_type_records(domain, type)
-        fetch_records(domain, type) do |record|
-          {
-            type: type,
-            # Use strings.join('') to avoid JRuby issue where
-            # data only returns the first string
-            text: record.strings.join('')
-          }
-        end
-      end
-
-      def fetch_records(domain, type, &block)
-        records = dns_lookup(domain, type)
-        records.map(&block)
-      end
-
-      TRAILING_DOT_REGEXP = /\.\z/
-      def normalize_domain(domain)
-        (domain.sub(TRAILING_DOT_REGEXP, '') || domain).downcase
-      end
-
-      def dns_lookup(domain, rr_type)
-        domain = normalize_domain(domain)
-        resources = getresources(domain, rr_type)
-
-        unless resources
-          fail Coppertone::DNS::Error,
-               "Unknown error on DNS '#{rr_type}' lookup of '#{domain}'"
-        end
-
-        resources
-      end
-
-      def getresources(domain, rr_type)
-        rr_class = self.class.type_class(rr_type)
-        dns_resolver.getresources(domain, rr_class)
-      rescue Resolv::ResolvTimeout
-        raise Coppertone::DNS::TimeoutError,
-              "Time-out on DNS '#{rr_type}' lookup of '#{domain}'"
-      rescue Resolv::ResolvError
-        raise Coppertone::DNS::Error, "Error on DNS lookup of '#{domain}'"
-      end
-
-      SUPPORTED_RR_TYPES = %w(A AAAA MX PTR TXT SPF)
-      def self.type_class(rr_type)
-        if SUPPORTED_RR_TYPES.include?(rr_type)
-          Resolv::DNS::Resource::IN.const_get(rr_type)
-        else
-          fail ArgumentError, "Unknown RR type: #{rr_type}"
-        end
-      end
-
-      def dns_resolver
-        @dns_resolver ||= Resolv::DNS.new
-      end
-    end
-  end
-end

data/lib/coppertone/dns.rb

@@ -1,3 +0,0 @@
-require 'coppertone/dns/error'
-require 'coppertone/dns/resolv_client'
-require 'coppertone/dns/mock_client'

data/lib/resolv/dns/resource/in/spf.rb

@@ -1,15 +0,0 @@
-require 'resolv'
-
-class Resolv
-  class DNS
-    class Resource
-      module IN
-        # DNS record type for SPF records
-        class SPF < Resolv::DNS::Resource::IN::TXT
-          # resolv.rb doesn't define an SPF resource type.
-          TypeValue = 99 # rubocop:disable Style/ConstantName
-        end
-      end
-    end
-  end
-end