coppertone 0.0.7 → 0.0.12

data/lib/coppertone/mechanism/cidr_parser.rb

@@ -4,10 +4,10 @@ module Coppertone
     class CidrParser
       def self.parse(raw_length, max_val)
         return if raw_length.blank?
+
         length_as_i = raw_length.to_i
-        if length_as_i < 0 || length_as_i > max_val
-          raise Coppertone::InvalidMechanismError
-        end
+        raise Coppertone::InvalidMechanismError if length_as_i.negative? || length_as_i > max_val
+
         length_as_i
       end
     end

data/lib/coppertone/mechanism/domain_spec_mechanism.rb

@@ -5,14 +5,17 @@ module Coppertone
       attr_reader :domain_spec
 
       def target_name_from_domain_spec(macro_context, request_context)
-        domain =
-          domain_spec.expand(macro_context, request_context) if domain_spec
+        if domain_spec
+          domain =
+            domain_spec.expand(macro_context, request_context)
+        end
         Coppertone::Utils::DomainUtils.macro_expanded_domain(domain)
       end
 
       def trim_domain_spec(raw_domain_spec)
         return nil if raw_domain_spec.blank?
-        raw_domain_spec[1..-1]
+
+        raw_domain_spec[1..]
       end
 
       def self.dns_lookup_term?
@@ -21,21 +24,25 @@ module Coppertone
 
       def context_dependent?
         return true unless domain_spec
+
         domain_spec.context_dependent?
       end
 
       def includes_ptr?
         return false unless domain_spec
+
         domain_spec.includes_ptr?
       end
 
       def target_domain
         raise Coppertone::NeedsContextError if context_dependent?
+
         domain_spec.to_s
       end
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         domain_spec == other.domain_spec
       end
       alias eql? ==

data/lib/coppertone/mechanism/domain_spec_optional.rb

@@ -11,6 +11,7 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         return if attributes.blank?
+
         raw_domain_spec = trim_domain_spec(attributes)
         @domain_spec = Coppertone::DomainSpec.new(raw_domain_spec)
       rescue Coppertone::MacroStringParsingError

data/lib/coppertone/mechanism/domain_spec_required.rb

@@ -10,6 +10,7 @@ module Coppertone
         super(attributes)
         raw_domain_spec = trim_domain_spec(attributes)
         raise InvalidMechanismError if raw_domain_spec.blank?
+
         @domain_spec = Coppertone::DomainSpec.new(raw_domain_spec)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidMechanismError

data/lib/coppertone/mechanism/domain_spec_with_dual_cidr.rb

@@ -14,6 +14,7 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         return if attributes.blank?
+
         parse_argument(attributes)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidMechanismError
@@ -37,11 +38,13 @@ module Coppertone
         end
       end
 
-      CIDR_REGEXP = %r{(/(\d*))?(//(\d*))?\z}
+      CIDR_REGEXP = %r{(/(\d*))?(//(\d*))?\z}.freeze
       def parse_argument(attributes)
         raise InvalidMechanismError if attributes.blank?
+
         cidr_matches = CIDR_REGEXP.match(attributes)
         raise InvalidMechanismError unless cidr_matches
+
         macro_string, raw_ip_v4_cidr_length, raw_ip_v6_cidr_length =
           clean_matches(attributes, cidr_matches)
         process_matches(macro_string, raw_ip_v4_cidr_length,
@@ -50,12 +53,15 @@ module Coppertone
 
       def parse_domain_spec(attributes, domain_spec_end)
         return nil if attributes.blank?
+
         cand = attributes[0..domain_spec_end]
         return nil if cand.blank?
+
         cand = trim_domain_spec(cand)
         # At this point we've ascertained that there is
         # a body to the domain spec
         raise InvalidMechanismError if cand.blank?
+
         cand
       end
 
@@ -97,6 +103,7 @@ module Coppertone
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         domain_spec == other.domain_spec &&
           ip_v4_cidr_length == other.ip_v4_cidr_length &&
           ip_v6_cidr_length == other.ip_v6_cidr_length

data/lib/coppertone/mechanism/include_matcher.rb

@@ -13,17 +13,20 @@ module Coppertone
         def evaluate_none_result(result, m, r)
           new_result = super
           return new_result unless new_result.none?
+
           raise Coppertone::NoneIncludeResultError
         end
       end
 
       attr_reader :record
+
       def initialize(record)
         @record = record
       end
 
       def match?(macro_context, request_context)
         raise Coppertone::NoneIncludeResultError if record.nil?
+
         record_result =
           IncludeRecordEvaluator.new(record)
                                 .evaluate(macro_context, request_context)

data/lib/coppertone/mechanism/ip_mechanism.rb

@@ -2,7 +2,8 @@ module Coppertone
   class Mechanism
     # Implements the ip4 mechanism.
     class IPMechanism < Mechanism
-      attr_reader :netblock
+      attr_reader :netblock, :cidr_length
+
       def self.create(attributes)
         new(attributes)
       end
@@ -10,15 +11,16 @@ module Coppertone
       def initialize(attributes)
         super(attributes)
         unless attributes.blank?
-          attributes = attributes[1..-1] if attributes[0] == ':'
-          @netblock = parse_netblock(attributes)
+          attributes = attributes[1..] if attributes[0] == ':'
+          @netblock, @cidr_length = parse_netblock(attributes)
         end
         raise Coppertone::InvalidMechanismError if @netblock.nil?
       end
 
-      LEADING_ZEROES_IN_CIDR_REGEXP = %r{\/0\d}
+      LEADING_ZEROES_IN_CIDR_REGEXP = %r{/0\d}.freeze
       def validate_no_leading_zeroes_in_cidr(ip_as_s)
-        return unless LEADING_ZEROES_IN_CIDR_REGEXP.match(ip_as_s)
+        return unless LEADING_ZEROES_IN_CIDR_REGEXP.match?(ip_as_s)
+
         raise Coppertone::InvalidMechanismError
       end
 
@@ -31,24 +33,32 @@ module Coppertone
 
       def parse_netblock(ip_as_s)
         validate_no_leading_zeroes_in_cidr(ip_as_s)
-        addr, cidr_length, dual = ip_as_s.split('/')
-        return nil if dual
+        addr, cidr_length_as_s, dual = ip_as_s.split('/')
+        return [nil, nil] if dual
+
         network = IPAddr.new(addr)
-        network = network.mask(cidr_length.to_i) unless cidr_length.blank?
-        network
+        network = network.mask(cidr_length_as_s.to_i) unless cidr_length_as_s.blank?
+        cidr_length = cidr_length_as_s.blank? ? default_cidr(network) : cidr_length_as_s.to_i
+        [network, cidr_length]
       rescue IP_PARSE_ERROR
-        nil
+        [nil, nil]
+      end
+
+      def default_cidr(network)
+        network.ipv6? ? 128 : 32
       end
 
       def match?(macro_context, _request_context)
         ip = ip_for_match(macro_context)
         return false unless ip
         return false unless ip.ipv4? == @netblock.ipv4?
+
         @netblock.include?(ip)
       end
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         netblock == other.netblock
       end
     end

data/lib/coppertone/mechanism/mx.rb

@@ -32,6 +32,7 @@ module Coppertone
       def check_a_record_limit(request_context, count)
         limit = request_context.dns_lookups_per_mx_mechanism_limit
         return unless limit && count > limit
+
         raise Coppertone::MXLimitExceededError
       end
 

data/lib/coppertone/modifier.rb

@@ -14,10 +14,11 @@ module Coppertone
       class_builder.register(klass.label, klass)
     end
 
-    MODIFIER_REGEXP = /\A([a-zA-Z]+[a-zA-Z0-9\-\_\.]*)=(\S*)\z/
+    MODIFIER_REGEXP = /\A([a-zA-Z]+[a-zA-Z0-9\-_.]*)=(\S*)\z/.freeze
     def self.matching_term(text)
       matches = MODIFIER_REGEXP.match(text)
       return nil unless matches
+
       type = matches[1]
       attributes = matches[2]
       build(type, attributes) || build_unknown(type, attributes)
@@ -28,6 +29,7 @@ module Coppertone
     end
 
     attr_reader :arguments
+
     def initialize(arguments)
       @arguments = arguments
     end

data/lib/coppertone/modifier/base.rb

@@ -3,17 +3,21 @@ module Coppertone
     # Base class including logic common to modifiers
     class Base < Modifier
       attr_reader :domain_spec
+
       def initialize(attributes)
         super(attributes)
         raise InvalidModifierError if attributes.blank?
+
         @domain_spec = Coppertone::DomainSpec.new(attributes)
       rescue Coppertone::MacroStringParsingError
         raise Coppertone::InvalidModifierError
       end
 
       def target_name_from_domain_spec(macro_context, request_context)
-        domain =
-          domain_spec.expand(macro_context, request_context) if domain_spec
+        if domain_spec
+          domain =
+            domain_spec.expand(macro_context, request_context)
+        end
         Coppertone::Utils::DomainUtils.macro_expanded_domain(domain)
       end
 
@@ -27,6 +31,7 @@ module Coppertone
 
       def ==(other)
         return false unless other.instance_of? self.class
+
         domain_spec == other.domain_spec
       end
     end

data/lib/coppertone/modifier/exp.rb

@@ -8,15 +8,18 @@ module Coppertone
         new(attributes)
       end
 
-      ASCII_REGEXP = /\A[[:ascii:]]*\z/
+      ASCII_REGEXP = /\A[[:ascii:]]*\z/.freeze
       def evaluate(macro_context, request_context)
         target_name =
           target_name_from_domain_spec(macro_context, request_context)
         return nil unless target_name
+
         macro_string = lookup_macro_string(target_name, request_context)
         return nil unless macro_string
+
         expanded = macro_string.expand(macro_context, request_context)
-        return nil unless ASCII_REGEXP.match(expanded)
+        return nil unless ASCII_REGEXP.match?(expanded)
+
         expanded
       rescue DNSAdapter::Error
         nil
@@ -27,6 +30,7 @@ module Coppertone
           request_context.dns_client.fetch_txt_records(target_name)
         return nil if records.empty?
         return nil if records.size > 1
+
         MacroString.new(records.first[:text])
       end
 

data/lib/coppertone/modifier/redirect.rb

@@ -19,6 +19,7 @@ module Coppertone
 
       def target_domain
         raise NeedsContextError if context_dependent?
+
         arguments
       end
 

data/lib/coppertone/modifier/unknown.rb

@@ -4,6 +4,7 @@ module Coppertone
     # defined by the SPF spec
     class Unknown < Modifier
       attr_reader :label
+
       def initialize(label, attributes)
         super(attributes)
         @label = label

data/lib/coppertone/null_macro_context.rb

@@ -3,7 +3,7 @@ module Coppertone
   # do not have contextual dependence.
   class NullMacroContext
     RESERVED_REGEXP = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
-    %w(s l o d i p v h c r t).each do |m|
+    %w[s l o d i p v h c r t].each do |m|
       define_method(m.upcase) do
         raise ArgumentError
       end

data/lib/coppertone/qualifier.rb

@@ -22,6 +22,7 @@ module Coppertone
     end
 
     attr_reader :text, :result_code
+
     def initialize(text, result_code)
       @text = text
       @result_code = result_code

data/lib/coppertone/record.rb

@@ -3,6 +3,7 @@ module Coppertone
   # record from a text string.
   class Record
     attr_reader :text
+
     def initialize(raw_text)
       @terms = Coppertone::RecordTermParser.new(raw_text).terms
       normalize_terms
@@ -67,6 +68,7 @@ module Coppertone
 
     def netblocks_only?
       return false if redirect
+
       directives.reject(&:all?).reject do |d|
         d.mechanism.is_a?(Coppertone::Mechanism::IPMechanism)
       end.empty?
@@ -74,7 +76,8 @@ module Coppertone
 
     def context_dependent_evaluation?
       return true if directives.any?(&:context_dependent?)
-      redirect && redirect.context_dependent?
+
+      redirect&.context_dependent?
     end
 
     def exp
@@ -82,7 +85,7 @@ module Coppertone
     end
 
     def context_dependent_explanation?
-      exp && exp.context_dependent?
+      exp&.context_dependent?
     end
 
     KNOWN_MODS =
@@ -95,6 +98,7 @@ module Coppertone
     def find_modifier(klass)
       arr = modifiers.select { |m| m.is_a?(klass) }
       raise DuplicateModifierError if arr.size > 1
+
       arr.first
     end
 

data/lib/coppertone/record_evaluator.rb

@@ -2,6 +2,7 @@ module Coppertone
   # A helper class for finding SPF records for a domain.
   class RecordEvaluator
     attr_reader :record
+
     def initialize(record)
       @record = record
     end
@@ -9,6 +10,7 @@ module Coppertone
     def evaluate(macro_context, request_context)
       result = directive_result(macro_context, request_context)
       return result unless result.none? || result.fail?
+
       if result.fail?
         evaluate_fail_result(result, macro_context, request_context)
       else
@@ -30,6 +32,7 @@ module Coppertone
     def add_exp_to_result(result, macro_context, request_context)
       result = add_default_exp(result)
       return result unless record.exp
+
       computed_exp = record.exp.evaluate(macro_context, request_context)
       result.explanation = computed_exp if computed_exp
       result
@@ -50,10 +53,12 @@ module Coppertone
 
     def evaluate_none_result(result, macro_context, request_context)
       return result unless follow_redirect?
+
       finder =
         Coppertone::RedirectRecordFinder.new(record.redirect, macro_context,
                                              request_context)
       raise InvalidRedirectError unless finder.target && finder.record
+
       rc = macro_context.with_domain(finder.target)
       RecordEvaluator.new(finder.record).evaluate(rc, request_context)
     end

data/lib/coppertone/record_finder.rb

@@ -2,6 +2,7 @@ module Coppertone
   # A helper class for finding SPF records for a domain.
   class RecordFinder
     attr_reader :dns_client, :domain
+
     def initialize(dns_client, domain)
       @dns_client = dns_client
       @domain = domain
@@ -12,8 +13,7 @@ module Coppertone
         begin
           validate_txt_records
           spf_dns_record = txt_records.first
-          return nil unless spf_dns_record
-          Record.new(spf_dns_record)
+          spf_dns_record ? Record.new(spf_dns_record) : nil
         end
     end
 

data/lib/coppertone/record_term_parser.rb

@@ -2,24 +2,28 @@ module Coppertone
   # Parses a record into terms
   class RecordTermParser
     VERSION_STR = 'v=spf1'.freeze
-    RECORD_REGEXP = /\A#{VERSION_STR}(\s|\z)/i
-    ALLOWED_CHARACTERS = /\A([\x21-\x7e ]+)\z/
+    RECORD_REGEXP = /\A#{VERSION_STR}(\s|\z)/i.freeze
+    ALLOWED_CHARACTERS = /\A([\x21-\x7e ]+)\z/.freeze
 
     def self.record?(text)
       return false if text.blank?
-      RECORD_REGEXP.match(text.strip) ? true : false
+      return true if RECORD_REGEXP.match?(text.strip)
+
+      false
     end
 
     attr_reader :text, :terms
+
     def initialize(text)
       raise RecordParsingError unless self.class.record?(text)
-      raise RecordParsingError unless ALLOWED_CHARACTERS.match(text)
+      raise RecordParsingError unless ALLOWED_CHARACTERS.match?(text)
+
       @text = text
       @terms = Coppertone::TermsParser.new(terms_segment).terms
     end
 
     def terms_segment
-      text[VERSION_STR.length..-1].strip
+      text[VERSION_STR.length..].strip
     end
   end
 end