Fix cookies, put in correct spot. Fix #787 (#812)

lib/raven/integrations/rack.rb

@@ -74,9 +74,10 @@ def from_rack(env_hash)
  self.method = req.request_method
  self.query_string = req.query_string
  self.data = read_data_from(req)
+ self.cookies = req.cookies
 
  self.headers = format_headers_for_sentry(env_hash)
- self.env = format_env_for_sentry(env_hash)
+ self.env  = format_env_for_sentry(env_hash)
  end
 
  private
@@ -108,6 +109,7 @@ def format_headers_for_sentry(env_hash)
  # if the request has legitimately sent a Version header themselves.
  # See: https://github.com/rack/rack/blob/028438f/lib/rack/handler/cgi.rb#L29
  next if key == 'HTTP_VERSION' && value == env_hash['SERVER_PROTOCOL']
+ next if key == 'HTTP_COOKIE' # Cookies don't go here, they go somewhere else
 
  next unless key.start_with?('HTTP_') || %w(CONTENT_TYPE CONTENT_LENGTH).include?(key)
  # Rack stores headers as HTTP_WHAT_EVER, we need What-Ever

spec/raven/event_spec.rb

@@ -167,7 +167,7 @@
  :method => 'POST',
  :query_string => 'biz=baz',
  :url => 'http:https://localhost/lol',
- :cookies => nil)
+ :cookies => {})
  end
 
  it "sets user context ip address correctly" do

spec/raven/integrations/rack_spec.rb

@@ -80,11 +80,18 @@
 
  it 'transforms headers to conform with the interface' do
  interface = Raven::HttpInterface.new
- new_env = env.merge("HTTP_VERSION" => "HTTP/1.1")
+ new_env = env.merge("HTTP_VERSION" => "HTTP/1.1", "HTTP_COOKIE" => "test")
  interface.from_rack(new_env)
 
- expect(interface.headers["Content-Length"]).to eq("0")
- expect(interface.headers["Version"]).to eq("HTTP/1.1")
+ expect(interface.headers).to eq("Content-Length" => "0", "Version" => "HTTP/1.1")
+ end
+
+ it 'puts cookies into the cookies attribute' do
+ interface = Raven::HttpInterface.new
+ new_env = env.merge("HTTP_COOKIE" => "test")
+ interface.from_rack(new_env)
+
+ expect(interface.cookies).to eq("test" => nil)
  end
 
  it 'does not ignore version headers which do not match SERVER_PROTOCOL' do