redacting-logger 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 103a53e496f8efc3d6d21fa37c07a773f9f36c2f879a6a07fd0cb8daa3e0db90
-  data.tar.gz: 5494118743b74310aae14aab0d3c3b8ba6a2b963f88eff7a60171d4a663af436
+  metadata.gz: 78c93baa4550a4f20001837396543c6571e9da65db5494b28b30c91cc203ebfd
+  data.tar.gz: c273eec893c8fdcf35436e21798ac7eaae74cb636056ab65af58a644cb6185e3
 SHA512:
-  metadata.gz: 44f56e1658d46788b23124064d30d7efba075c000757494a1e6f4710fe1b278be22c51a99f1bbb14c3cbad87c9a919fabcac289dd558df1d2b4c9c6a5a51ed85
-  data.tar.gz: 4f414b31538ae5e6863f096eaf298b43dae339d87b1ac7b2ea4029e8d58c50205e5d9b0e300b15732cda03c2e179d4058a96d4f65f64567fc629a9092c444e2a
+  metadata.gz: e0dd47fe1560866faf4ff202a3649c6d69ee7f2b6d1b3c21874b13299e8e9cf8f3c3769d120800c9292909f071e2ff3079f7de39a002eca2852f96087a122666
+  data.tar.gz: 07c6db97cfc003a5de49caa7d1d4cdc7bf76ebd9f7467ec56b580b710c3a13398c08bafa47a832d8a8a09737d75acdef53e76f445c09d614d5ad4fa89484b293

data/lib/patterns/default.rb

@@ -4,6 +4,10 @@
 # These patterns are sourced from different places on the internet, some came from https://github.com/l4yton/RegHex
 module Patterns
   DEFAULT = [
+    # RubyGems Token
+    # https://guides.rubygems.org/api-key-scopes/
+    /rubygems_[0-9a-f]{48}/,
+
     # GitHub Personal Access Token
     # https://github.blog/2021-04-05-behind-githubs-new-authentication-token-formats/
     /ghp_[A-Za-z0-9]{36,}|[0-9A-Fa-f]{40,}/,
@@ -42,11 +46,7 @@ module Patterns
 
     # Vault Tokens
     # https://github.com/hashicorp/vault/issues/27151
-    /[sbr]\.[a-zA-Z0-9]{24,}/,   # <= 1.9.x
-    /hv[sbr]\.[a-zA-Z0-9]{24,}/, # >= 1.10
-
-    # RubyGems Token
-    # https://guides.rubygems.org/api-key-scopes/
-    /rubygems_[0-9a-f]{48}/
+    /[sbr]\.[a-zA-Z0-9]{24,}/, # <= 1.9.x
+    /hv[sbr]\.[a-zA-Z0-9]{24,}/ # >= 1.10
   ].freeze
 end

data/lib/redacting_logger.rb

@@ -30,6 +30,8 @@ class RedactingLogger < Logger
     @redact_patterns = redact_patterns
     @redacted_msg = redacted_msg
     @redact_patterns += Patterns::DEFAULT if use_default_patterns
+
+    @redact_patterns = Regexp.union(@redact_patterns)
   end
 
   # Adds a message to the log.
@@ -40,30 +42,24 @@ class RedactingLogger < Logger
   def add(severity, message = nil, progname = nil)
     message, progname = yield if block_given?
 
-    @redact_patterns.each do |pattern|
-      case message
-
-      when String, Symbol, Numeric
-        message = message.to_s.gsub(pattern, @redacted_msg)
+    case message
 
-      when Array
-        message = message.map do |m|
-          m.to_s.gsub(pattern, @redacted_msg)
-        end
+    when String, Symbol, Numeric
+      message = message.to_s.gsub(@redact_patterns, @redacted_msg)
 
-      when Hash
-        message = message.transform_values do |v|
-          v.to_s.gsub(pattern, @redacted_msg)
-        end
+    when Array
+      message = message.map do |m|
+        m.to_s.gsub(@redact_patterns, @redacted_msg)
       end
-    end
 
-    if progname
-      @redact_patterns.each do |pattern|
-        progname = progname.to_s.gsub(pattern, @redacted_msg)
+    when Hash
+      message = message.transform_values do |v|
+        v.to_s.gsub(@redact_patterns, @redacted_msg)
       end
     end
 
-    super(severity, message, progname)
+    progname = progname.to_s.gsub(@redact_patterns, @redacted_msg) if progname
+
+    super
   end
 end

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module RedactingLogger
   module Version
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redacting-logger
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - GitHub
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger