credit_card_sanitizer 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 006b623e0a5d6f3ce1a9c4d51a31e271592f1e4f
-  data.tar.gz: 79a2c6ae31ce9a9ce0481a0ed29bf50515bc8aab
+  metadata.gz: 931e6e4a5625866a098125ac6b7d19b48107f6ee
+  data.tar.gz: 95736bfd3c27a5807f3ae2527b5580e0f399f875
 SHA512:
-  metadata.gz: 5c04220031bba7cf26fd2a061ef6a5f773286e862a194e292c1d22f086119679d4579a35cbb452919afbf806878dce925269f31c705c041172e7984e20c4a0e6
-  data.tar.gz: b7204bb4ab4699a447dd215edd2ed1d7c19120a35d36ebcb7841e9a8c7e4560a8249f99b020052e3d43bd6e378c42f30ec962289a07ee8b174b8253cc02b533c
+  metadata.gz: 46b52b3e0a9906cef8969498fba3341a0e130407f21eb40d90b9e6e7edea2864fe7bddcc1e0f94638d856d7e9d8b7bffb84bd7a737f4bb32c7611672db429ebe
+  data.tar.gz: 06be394926ce1bd28c494669f85c0e577800d61d8bd3ebd442bf9739697aa789855f28fafbd4bcd542a0ba30fd7488a6d5d3bb977ea12025912742adbfda250d

data/lib/credit_card_sanitizer.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'luhn_checksum'
+require 'securerandom'
 
 class CreditCardSanitizer
 
@@ -20,9 +21,10 @@ class CreditCardSanitizer
     'laser'              => /^(6304|6706|6709|6771(?!89))\d{8}(\d{4}|\d{6,7})?$/
   }
   VALID_COMPANY_PREFIXES = Regexp.union(*CARD_COMPANIES.values)
+  EXPIRATION_DATE = /\s(?:0?[1-9]|1[0-2])(?:\/|-)(?:\d{4}|\d{2})(?:\s|$)/
   LINE_NOISE = /[^\w_\n,()\/:]{,5}/
-  SCHEME = /((?:[a-zA-Z][\-+.a-zA-Z\d]{,9}):\S+)/
-  NUMBERS_WITH_LINE_NOISE = /#{SCHEME}?\d(?:#{LINE_NOISE}\d#{LINE_NOISE}){10,17}\d/
+  SCHEME_OR_PLUS = /(\+|(?:[a-zA-Z][\-+.a-zA-Z\d]{,9}):\S+)/
+  NUMBERS_WITH_LINE_NOISE = /#{SCHEME_OR_PLUS}?\d(?:#{LINE_NOISE}\d#{LINE_NOISE}){10,17}\d/
 
   attr_reader :replacement_token, :expose_first, :expose_last
 
@@ -60,16 +62,19 @@ class CreditCardSanitizer
     to_utf8!(text)
 
     redacted = nil
-    text.gsub!(NUMBERS_WITH_LINE_NOISE) do |match|
-      next match if $1
-      @numbers = match.tr('^0-9', '')
 
-      if valid_numbers?
-        redacted = true
-        redact_numbers!(match)
-      end
+    without_expiration(text) do
+      text.gsub!(NUMBERS_WITH_LINE_NOISE) do |match|
+        next match if $1
+        @numbers = match.tr('^0-9', '')
+
+        if valid_numbers?
+          redacted = true
+          redact_numbers!(match)
+        end
 
-      match
+        match
+      end
     end
 
     redacted && text
@@ -84,12 +89,12 @@ class CreditCardSanitizer
   #  Rails.app.config.filter_parameters = [:password, CreditCardSanitizer.parameter_filter]
   #
   #  env = {
-  #    "action_dispatch.request.parameters" => {"credit_card_number" => "123 4512 3451 2348", "password" => "123"},
-  #   "action_dispatch.parameter_filter" => Rails.app.config.filter_parameters
+  #    "action_dispatch.request.parameters" => {"credit_card_number" => "4111 1111 1111 1111", "password" => "123"},
+  #    "action_dispatch.parameter_filter" => Rails.app.config.filter_parameters
   #  }
   #
   #  >> ActionDispatch::Request.new(env).filtered_parameters
-  #  => {"credit_card_number" => "123 451X XXXX 2348", "password" => "[FILTERED]"}
+  #  => {"credit_card_number" => "4111 11▇▇ ▇▇▇▇ 1111", "password" => "[FILTERED]"}
   #
   # Returns a Proc that takes the key/value of the request parameter.
   def self.parameter_filter
@@ -107,10 +112,8 @@ class CreditCardSanitizer
   end
 
   def redact_numbers!(text)
-    digit_index = 0
-
-    text.gsub!(/\d/) do |number|
-      if within_redaction_range?(digit_index += 1)
+    text.gsub!(/\d/).with_index do |number, digit_index|
+      if within_redaction_range?(digit_index)
         replacement_token
       else
         number
@@ -119,7 +122,14 @@ class CreditCardSanitizer
   end
 
   def within_redaction_range?(digit_index)
-    digit_index > expose_first && digit_index <= @numbers.size - expose_last
+    digit_index >= expose_first && digit_index < @numbers.size - expose_last
+  end
+
+  def without_expiration(text)
+    expiration_date_boundary = SecureRandom.hex.tr('0123456789', 'ABCDEFGHIJ')
+    text.gsub!(EXPIRATION_DATE) { |expiration_date| "#{expiration_date_boundary}#{expiration_date}#{expiration_date_boundary}"  }
+    yield
+    text.gsub!(expiration_date_boundary, '')
   end
 
   if ''.respond_to?(:scrub)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credit_card_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eric Chapweske
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal