Merge remote-tracking branch 'origin/master' into add-rails-event-subscriber

stympy · stympy · commit 9ab46ff570d6 · 2025-11-25T12:21:30.000-08:00
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -76,6 +76,7 @@ jobs:
     - name: Build and test regular ruby
       run: |
         bundle exec rake
+      continue-on-error: ${{ matrix.ruby == 'ruby-head' }}
 
   jruby:
     runs-on: ubuntu-22.04
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,27 @@
 # Change Log
 
 
+## [6.1.3](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.1.2...v6.1.3) (2025-10-28)
+
+
+### Bug Fixes
+
+* replace return with next in execution blocks to prevent LocalJumpError ([#745](https://github.com/honeybadger-io/honeybadger-ruby/issues/745)) ([f49977a](https://github.com/honeybadger-io/honeybadger-ruby/commit/f49977a174c15d37c46ff6d0492790ee040778d2))
+
+## [6.1.2](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.1.1...v6.1.2) (2025-10-13)
+
+
+### Bug Fixes
+
+* handle invalid byte sequence in breadcrumbs ([#742](https://github.com/honeybadger-io/honeybadger-ruby/issues/742)) ([87fd97b](https://github.com/honeybadger-io/honeybadger-ruby/commit/87fd97b944d5bfcc51296bb021eed5a2db30ccf7)), closes [#741](https://github.com/honeybadger-io/honeybadger-ruby/issues/741)
+
+## [6.1.1](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.1.0...v6.1.1) (2025-10-10)
+
+
+### Bug Fixes
+
+* handle invalid strings when sanitizing ([#739](https://github.com/honeybadger-io/honeybadger-ruby/issues/739)) ([e707cc8](https://github.com/honeybadger-io/honeybadger-ruby/commit/e707cc84ae6503e8a2f20d362f78442d243bcdca)), closes [#733](https://github.com/honeybadger-io/honeybadger-ruby/issues/733)
+
 ## [6.1.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.0.6...v6.1.0) (2025-08-29)
 
 
diff --git a/lib/honeybadger/breadcrumbs/logging.rb b/lib/honeybadger/breadcrumbs/logging.rb
@@ -1,3 +1,5 @@
+require "honeybadger/util/sanitizer"
+
 module Honeybadger
   module Breadcrumbs
     # @api private
@@ -10,7 +12,7 @@ def add(severity, message = nil, progname = nil)
         elsif message.nil?
           message, progname = [progname, nil]
         end
-        message &&= message.to_s.strip
+        message &&= Util::Sanitizer.sanitize(message.to_s).strip
         unless should_ignore_log?(message, progname)
           Honeybadger.add_breadcrumb(message, category: :log, metadata: {
             severity: format_severity(severity),
diff --git a/lib/honeybadger/plugins/delayed_job.rb b/lib/honeybadger/plugins/delayed_job.rb
@@ -15,7 +15,7 @@ module Honeybadger
     end
 
     execution do
-      return unless Honeybadger.config[:"exceptions.enabled"]
+      next unless Honeybadger.config[:"exceptions.enabled"]
       require "honeybadger/plugins/delayed_job/plugin"
       ::Delayed::Worker.plugins << Plugins::DelayedJob::Plugin
     end
diff --git a/lib/honeybadger/plugins/faktory.rb b/lib/honeybadger/plugins/faktory.rb
@@ -15,7 +15,7 @@ def call(worker, job)
         requirement { defined?(::Faktory) }
 
         execution do
-          return unless Honeybadger.config[:"exceptions.enabled"]
+          next unless Honeybadger.config[:"exceptions.enabled"]
           ::Faktory.configure_worker do |faktory|
             faktory.worker_middleware do |chain|
               chain.prepend Middleware
diff --git a/lib/honeybadger/plugins/resque.rb b/lib/honeybadger/plugins/resque.rb
@@ -64,7 +64,7 @@ def payload_class_with_honeybadger
         end
 
         execution do
-          return unless Honeybadger.config[:"exceptions.enabled"]
+          next unless Honeybadger.config[:"exceptions.enabled"]
           ::Resque::Job.send(:include, Installer)
         end
       end
diff --git a/lib/honeybadger/plugins/shoryuken.rb b/lib/honeybadger/plugins/shoryuken.rb
@@ -40,7 +40,7 @@ def notification_params(body)
         requirement { defined?(::Shoryuken) }
 
         execution do
-          return unless Honeybadger.config[:"exceptions.enabled"]
+          next unless Honeybadger.config[:"exceptions.enabled"]
           ::Shoryuken.configure_server do |config|
             config.server_middleware do |chain|
               chain.add Middleware
diff --git a/lib/honeybadger/plugins/sucker_punch.rb b/lib/honeybadger/plugins/sucker_punch.rb
@@ -6,7 +6,7 @@ module Honeybadger
     requirement { defined?(::SuckerPunch) }
 
     execution do
-      return unless Honeybadger.config[:"exceptions.enabled"]
+      next unless Honeybadger.config[:"exceptions.enabled"]
       if SuckerPunch.respond_to?(:exception_handler=) # >= v2
         SuckerPunch.exception_handler = ->(ex, klass, args) { Honeybadger.notify(ex, component: klass, parameters: args) }
       else
diff --git a/lib/honeybadger/plugins/thor.rb b/lib/honeybadger/plugins/thor.rb
@@ -25,7 +25,7 @@ def invoke_command_with_honeybadger(*args)
       requirement { defined?(::Thor.no_commands) }
 
       execution do
-        return unless Honeybadger.config[:"exceptions.enabled"]
+        next unless Honeybadger.config[:"exceptions.enabled"]
         ::Thor.send(:include, Thor)
       end
     end
diff --git a/lib/honeybadger/util/sanitizer.rb b/lib/honeybadger/util/sanitizer.rb
@@ -206,7 +206,13 @@ def can_dup?(obj)
       end
 
       def inspected?(string)
-        String(string) =~ /#<.*>/
+        # Ensure string has valid encoding before pattern matching
+        # to avoid ArgumentError with invalid byte sequences
+        string = valid_encoding(string) unless valid_encoding?(string)
+        string =~ /#<.*>/
+      rescue
+        # If any encoding error occurs, assume it's not inspected
+        false
       end
     end
   end
diff --git a/lib/honeybadger/version.rb b/lib/honeybadger/version.rb
@@ -1,4 +1,4 @@
 module Honeybadger
   # The current String Honeybadger version.
-  VERSION = "6.1.0".freeze
+  VERSION = "6.1.3".freeze
 end
diff --git a/spec/unit/honeybadger/breadcrumbs/logging_spec.rb b/spec/unit/honeybadger/breadcrumbs/logging_spec.rb
@@ -33,6 +33,12 @@ def format_severity(str)
     subject.add("DEBUG", {})
   end
 
+  it "handles invalid UTF-8 byte sequences" do
+    invalid_string = "\xE9s"
+    expect(Honeybadger).to receive(:add_breadcrumb).with("?s", anything)
+    subject.add("DEBUG", invalid_string)
+  end
+
   it "does not mutate the message" do
     subject.add("DEBUG", {}, "Honeybadger")
     expect(subject.severity).to eq("DEBUG")
diff --git a/spec/unit/honeybadger/util/sanitizer_spec.rb b/spec/unit/honeybadger/util/sanitizer_spec.rb
@@ -97,6 +97,34 @@
       expect(described_class.new.sanitize(object)).to eq(object)
     end
 
+    it "handles objects with invalid byte sequences in their string representation" do
+      # Create a string with invalid UTF-8 byte sequences
+      invalid_string = (100..1000).to_a.pack("c*").force_encoding("utf-8")
+      object = double(to_s: invalid_string)
+      
+      # Should not raise an error
+      expect { described_class.new.sanitize(object) }.not_to raise_error
+      
+      # Should return sanitized string
+      result = described_class.new.sanitize(object)
+      expect(result).to be_a(String)
+      expect(result.encoding).to eq(Encoding::UTF_8)
+      expect(result.valid_encoding?).to be true
+    end
+
+    it "handles objects with invalid byte sequences that look like inspect output" do
+      # Create a string with invalid UTF-8 that starts with #<
+      invalid_string = "#<Object \xFF\xFE>".force_encoding("utf-8")
+      object = double(to_s: invalid_string)
+      
+      # Should not raise an error
+      expect { described_class.new.sanitize(object) }.not_to raise_error
+      
+      # Should return sanitized class name since it looks like inspect output
+      result = described_class.new.sanitize(object)
+      expect(result).to eq("#<RSpec::Mocks::Double>")
+    end
+
     context "with bad encodings" do
       let(:string) { "hello ümlaut" }
       let(:binary) { string.dup.force_encoding(Encoding::BINARY) }
