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

@@ -1,31 +1,28 @@
+require "logstop/formatter"
 require "logstop/version"
-require "logger"
 
 module Logstop
-  class Formatter < ::Logger::Formatter
-    FILTERED_STR = "[FILTERED]".freeze
+  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
+  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
+  URL_PASSWORD_REGEX = /(\/\/\S+:)\S+@/
 
-    def initialize(formatter = nil, ip: false)
-      @formatter = formatter || ::Logger::Formatter.new
-      @ip = ip
-    end
+  def self.scrub(msg, ip: false)
+    msg = msg.to_s
 
-    def call(severity, timestamp, progname, msg)
-      output = @formatter.call(severity, timestamp, progname, msg)
-      output = output.gsub(IP_REGEX, FILTERED_STR) if @ip
+    msg = msg.gsub(IP_REGEX, FILTERED_STR) if ip
 
-      # order filters are applied is important
-      output
-        .gsub(CREDIT_CARD_REGEX, FILTERED_STR)
-        .gsub(PHONE_REGEX, FILTERED_STR)
-        .gsub(SSN_REGEX, FILTERED_STR)
-        .gsub(EMAIL_REGEX, FILTERED_STR)
-    end
+    # 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)
   end
 end