Merge pull request #208 from getsentry/plug-upload

Handle Plug Upload during scrubbing

Author: mitchellhenke

lib/sentry/plug.ex

@@ -176,8 +176,10 @@ defmodule Sentry.Plug do
           @scrubbed_value
         is_binary(value) && Regex.match?(@credit_card_regex, value) ->
           @scrubbed_value
-        is_map(value) -> scrub_map(value)
-        true -> value
+        is_map(value) && !Map.has_key?(value, :__struct__) ->
+          scrub_map(value)
+        true ->
+          value
       end
 
       {key, value}

test/plug_test.exs

@@ -105,4 +105,26 @@ defmodule Sentry.PlugTest do
       "is_admin" => false, "passwd" => "*********", "credit_card" => "*********", "cc" => "*********",
       "another_cc" => "*********", "user" => %{"password" => "*********"}}
   end
+
+  test "handles data scrubbing with file upload" do
+    bypass = Bypass.open
+    Bypass.expect bypass, fn conn ->
+      {:ok, body, conn} = Plug.Conn.read_body(conn)
+      json = Poison.decode!(body)
+      assert is_map(json["request"]["data"]["image"])
+      assert json["request"]["data"]["password"] == "*********"
+      Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
+    end
+
+    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    upload = %Plug.Upload{path: "test/fixtures/my_image.png", filename: "my_image.png"}
+
+    assert_raise(RuntimeError, "Error", fn ->
+      conn(:post, "/error_route", %{"image" => upload, "password" => "my_password"})
+      |> put_req_cookie("cookie_key", "cookie_value")
+      |> put_req_header("accept-language", "en-US")
+      |> put_req_header("authorization", "ignorme")
+      |> Sentry.ExampleApp.call([])
+    end)
+  end
 end

test/sources_test.exs

@@ -5,9 +5,10 @@ defmodule Sentry.SourcesTest do
 
   test "exception makes call to Sentry API" do
     correct_context = %{"context_line" => "    raise RuntimeError, \"Error\"",
-                        "post_context" => ["  end", "", "  match \"/error_route\" do"],
-                        "pre_context" => ["", "  get \"/error_route\" do", "    _ = conn"]
-                        }
+      "post_context" => ["  end", "", "  post \"/error_route\" do"],
+      "pre_context" => ["", "  get \"/error_route\" do",
+                        "    _ = conn"]
+    }
     bypass = Bypass.open
     Bypass.expect bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)

test/support/test_plug.ex

@@ -14,6 +14,11 @@ defmodule Sentry.ExampleApp do
     raise RuntimeError, "Error"
   end
 
+  post "/error_route" do
+    _ = conn
+    raise RuntimeError, "Error"
+  end
+
   match "/error_route" do
     _ = conn
     raise RuntimeError, "Error"