credit_card_sanitizer 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8640635e8befbc2048e354e705bd824eda92ddf
-  data.tar.gz: 447736aa16f358f1c470e3fe6ad07307a954debe
+  metadata.gz: 3d2b64979bb9b0c1ca2f9faecfdab2e3f7087210
+  data.tar.gz: 53ed4ff7f20f8d2b9b623bf40855df5a021e02ab
 SHA512:
-  metadata.gz: 8e372b34945a260da35685a148a47dcb1fc4b6e02fa69fa5aab7823e19e4f141d01d3f3a14188b041eca00d62bb37fb18aa43dbea8700a175515a08ea2ec37ec
-  data.tar.gz: 1741723f389d568c9555f5436d812ab47651e6c1a6c4b24979ff1bf6de804869040cd54d29cc32cc54e92ef7e65ed7dddd431a9f9027c9c550998eb5ff7d7626
+  metadata.gz: 0c2f62467f9c15db699fd4df40e1b08775b6de4b7480d71eb765e0feca9d8f69aaa0c9e7bc9ca52a4004181c0a4a3ac0c7da24d224090b121d5d67dc3d8dfeb2
+  data.tar.gz: 144a363a9968daf603b359698545a3632b6023ea54fd8202a048516678ec7de468397f15172caeb0566e31c4e001dd5dd9cc499d86a32ccf89c7ff0fc245d7ba

data/lib/credit_card_sanitizer.rb

@@ -37,6 +37,9 @@ class CreditCardSanitizer
     'laser'              => [[4, 4, 4, 4]]
   }
 
+  ACCEPTED_PREFIX = /(?:cc|card|visa|amex)\z/i
+  ACCEPTED_POSTFIX = /\Aex/i
+  ALPHANUMERIC = /[[:alnum:]]/i
   VALID_COMPANY_PREFIXES = Regexp.union(*CARD_COMPANIES.values)
   EXPIRATION_DATE = /\s(?:0?[1-9]|1[0-2])(?:\/|-)(?:\d{4}|\d{2})(?:\D|$)/
   LINE_NOISE_CHAR = /[^\w\n,()&.\/:;<>]/
@@ -44,8 +47,6 @@ class CreditCardSanitizer
   NONEMPTY_LINE_NOISE = /#{LINE_NOISE_CHAR}{1,5}/
   SCHEME_OR_PLUS = /((?:&#43;|\+)|(?:[a-zA-Z][\-+.a-zA-Z\d]{,9}):[^\s>]+)/
   NUMBERS_WITH_LINE_NOISE = /#{SCHEME_OR_PLUS}?\d(?:#{LINE_NOISE}\d){10,30}/
-  HTML_TAGS = /(<\w+(?:(?:\s+\w+(?:\s*=\s*(?:".*?"|'.*?'|[\^'">\s]+))?)+\s*|\s*)>)/
-  SKIP_HTML_TAGS = Regexp.union(HTML_TAGS, NUMBERS_WITH_LINE_NOISE)
 
   DEFAULT_OPTIONS = {
     replacement_token: '▇',
@@ -53,12 +54,12 @@ class CreditCardSanitizer
     expose_last: 4,
     use_groupings: false,
     exclude_tracking_numbers: false,
-    exclude_html_tags: false
+    parse_flanking: false
   }
 
   attr_reader :settings
 
-  Candidate = Struct.new(:text, :numbers)
+  Candidate = Struct.new(:text, :numbers, :prefix, :postfix)
 
   # Create a new CreditCardSanitizer
   #
@@ -95,15 +96,15 @@ class CreditCardSanitizer
 
     text.force_encoding(Encoding::UTF_8)
     text.scrub!('�')
-    regex = options[:exclude_html_tags] ? SKIP_HTML_TAGS : NUMBERS_WITH_LINE_NOISE
     redacted = nil
+
     without_expiration(text) do
-      text.gsub!(regex) do |match|
-        next match if $1 || $2
+      text.gsub!(NUMBERS_WITH_LINE_NOISE) do |match|
+        next match if $1
 
-        candidate = Candidate.new(match, match.tr('^0-9', ''))
+        candidate = Candidate.new(match, match.tr('^0-9', ''), $`, $')
 
-        if valid_numbers?(candidate, options)
+        if valid_context?(candidate, options) && valid_numbers?(candidate, options)
           redacted = true
           redact_numbers(candidate, options)
         else
@@ -138,7 +139,7 @@ class CreditCardSanitizer
 
   private
 
-  def valid_prefix?(numbers)
+  def valid_company_prefix?(numbers)
     !!(numbers =~ VALID_COMPANY_PREFIXES)
   end
 
@@ -170,7 +171,21 @@ class CreditCardSanitizer
   end
 
   def valid_numbers?(candidate, options)
-    LuhnChecksum.valid?(candidate.numbers) && valid_prefix?(candidate.numbers) && valid_grouping?(candidate, options) && !is_tracking?(candidate, options)
+    LuhnChecksum.valid?(candidate.numbers) && valid_company_prefix?(candidate.numbers) && valid_grouping?(candidate, options) && !is_tracking?(candidate, options)
+  end
+
+  def valid_context?(candidate, options)
+    !options[:parse_flanking] || valid_prefix?(candidate.prefix) && valid_postfix?(candidate.postfix)
+  end
+
+  def valid_prefix?(prefix)
+    return true if prefix.nil? || !!ACCEPTED_PREFIX.match(prefix)
+    !ALPHANUMERIC.match(prefix[-1])
+  end
+
+  def valid_postfix?(postfix)
+    return true if postfix.nil? || !!ACCEPTED_POSTFIX.match(postfix)
+    !ALPHANUMERIC.match(postfix[0])
   end
 
   def redact_numbers(candidate, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credit_card_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Eric Chapweske
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.3
 description: Credit card sanitizer
 email:
 - ggrossman@zendesk.com
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Credit card sanitizer