Skip to content
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Unreleased

- Fix safe JSON encoding of improper lists ([#938](https://github.com/getsentry/sentry-elixir/pull/938))

## 11.0.3

#### Various improvements
Expand Down
26 changes: 15 additions & 11 deletions lib/sentry/client.ex
Original file line number Diff line number Diff line change
Expand Up @@ -361,18 +361,22 @@ defmodule Sentry.Client do
end

defp sanitize_non_jsonable_value(value, json_library) when is_list(value) do
{mapped, changed?} =
Enum.map_reduce(value, _changed? = false, fn value, changed? ->
case sanitize_non_jsonable_value(value, json_library) do
:unchanged -> {value, changed?}
{:changed, value} -> {value, true}
end
end)

if changed? do
{:changed, mapped}
if List.improper?(value) do
{:changed, inspect(value)}
else
:unchanged
{mapped, changed?} =
Enum.map_reduce(value, _changed? = false, fn value, changed? ->
case sanitize_non_jsonable_value(value, json_library) do
:unchanged -> {value, changed?}
{:changed, value} -> {value, true}
end
end)

if changed? do
{:changed, mapped}
else
:unchanged
end
end
end

Expand Down
4 changes: 3 additions & 1 deletion test/sentry/client_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ defmodule Sentry.ClientTest do
bool: true,
null: nil,
int: 2,
map: %{bool: false}
map: %{bool: false},
improper_list: [1 | 2]
},
user: %{id: "valid-ID", email: {"user", "@example.com"}},
tags: %{valid: "yes", tokens: MapSet.new([1])},
Expand All @@ -78,6 +79,7 @@ defmodule Sentry.ClientTest do
assert rendered.extra.null == nil
assert rendered.extra.int == 2
assert rendered.extra.map.bool == false
assert rendered.extra.improper_list == "[1 | 2]"

assert rendered.user.id == "valid-ID"
assert rendered.user.email == ~s({"user", "@example.com"})
Expand Down