Force encode request body if it's a string

This fixes #1475
getsentry · Jun 25, 2021 · 4aa09ba · 4aa09ba
1 parent d82b463
commit 4aa09ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/sentry-ruby/lib/sentry/interfaces/request.rb b/sentry-ruby/lib/sentry/interfaces/request.rb
@@ -57,6 +57,7 @@ def read_data_from(request)
         request.POST
       elsif request.body # JSON requests, etc
         data = request.body.read(MAX_BODY_LIMIT)
+        data = data.force_encoding(Encoding::UTF_8) if data.respond_to?(:force_encoding)
         request.body.rewind
         data
       end

diff --git a/sentry-ruby/spec/sentry/interfaces/request_interface_spec.rb b/sentry-ruby/spec/sentry/interfaces/request_interface_spec.rb
@@ -210,6 +210,16 @@ def to_s
       expect(interface.data).to eq("catch me")
     end
 
+    it "force encodes request body to avoid encoding issue" do
+      new_env = env.merge(::Rack::RACK_INPUT => StringIO.new("あ"))
+
+      interface = described_class.build(env: new_env)
+
+      expect do
+        JSON.generate(interface.to_hash)
+      end.not_to raise_error
+    end
+
     it "doesn't remove ip address headers" do
       ip = "1.1.1.1"