lib/logstop.rb in logstop-0.2.0 vs lib/logstop.rb in logstop-0.2.1

- old
+ new

@@ -1,17 +1,18 @@ require "logstop/formatter" +require "logstop/railtie" if defined?(Rails) require "logstop/version" module Logstop FILTERED_STR = "[FILTERED]".freeze FILTERED_URL_STR = "\\1[FILTERED]@".freeze CREDIT_CARD_REGEX = /\b\d{4}[\s-]?\d{4}[\s-]?\d{4}[\s-]?\d{4}\b/ EMAIL_REGEX = /\b[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\b/i IP_REGEX = /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/ - PHONE_REGEX = /\b(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}\b/i - SSN_REGEX = /\b\d{3}[\s-]\d{2}[\s-]\d{4}\b/i + PHONE_REGEX = /\b(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]\d{3}[\s.-]\d{4}\b/ + SSN_REGEX = /\b\d{3}[\s-]\d{2}[\s-]\d{4}\b/ URL_PASSWORD_REGEX = /(\/\/\S+:)\S+@/ def self.scrub(msg, ip: false) msg = msg.to_s @@ -20,9 +21,9 @@ # order filters are applied is important msg .gsub(CREDIT_CARD_REGEX, FILTERED_STR) .gsub(PHONE_REGEX, FILTERED_STR) .gsub(SSN_REGEX, FILTERED_STR) - .gsub(EMAIL_REGEX, FILTERED_STR) .gsub(URL_PASSWORD_REGEX, FILTERED_URL_STR) + .gsub(EMAIL_REGEX, FILTERED_STR) end end