Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gracefully fail on malformed utf-8 breadcrumb message #2582

Merged
merged 1 commit into from
Mar 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Unreleased

### Bug Fixes

- Gracefully fail on malformed utf-8 breadcrumb message ([#2582](https://github.com/getsentry/sentry-ruby/pull/2582))
- Fixes [#2376](https://github.com/getsentry/sentry-ruby/issues/2376)

## 5.23.0

### Features
Expand Down
2 changes: 1 addition & 1 deletion sentry-ruby/lib/sentry/breadcrumb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def to_hash
# @param message [String]
# @return [void]
def message=(message)
@message = message ? message.byteslice(0..Event::MAX_MESSAGE_SIZE_IN_BYTES) : ""
@message = message && Utils::EncodingHelper.valid_utf_8?(message) ? message.byteslice(0..Event::MAX_MESSAGE_SIZE_IN_BYTES) : ""
end

# @param level [String]
Expand Down
6 changes: 6 additions & 0 deletions sentry-ruby/spec/sentry/breadcrumb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
crumb.message = long_message
expect(crumb.message.length).to eq(Sentry::Event::MAX_MESSAGE_SIZE_IN_BYTES + 1)
end

it "removes bad encoding message gracefully" do
crumb = described_class.new
crumb.message = "foo \x1F\xE6"
expect(crumb.message).to eq("")
end
end

describe "#level=" do
Expand Down
16 changes: 16 additions & 0 deletions sentry-ruby/spec/sentry/transport_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,22 @@
end
end

context "malformed breadcrumb" do
let(:event) { client.event_from_message("foo") }

before do
event.breadcrumbs = Sentry::BreadcrumbBuffer.new(1000)
breadcrumb = Sentry::Breadcrumb.new(message: "foo \x1F\xE6")
event.breadcrumbs.record(breadcrumb)
end

it "gracefully removes bad encoding breadcrumb message" do
expect do
serialized_result = JSON.generate(event.to_hash)
end.not_to raise_error
end
end

context "oversized event" do
context "due to breadcrumb" do
let(:event) { client.event_from_message("foo") }
Expand Down
Loading