From 5360ca4d0da2b81d6aaf9d87ca2329fb49394c24 Mon Sep 17 00:00:00 2001 From: Josh Sharpe Date: Tue, 4 Jun 2019 10:44:59 +0700 Subject: [PATCH 1/2] ignore vim sw[op] files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7c0cff862..ab53c38c9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Gemfile.lock .ruby-gemset .idea *.rdb +*.sw[op] From fedc34f0da3560b29752522b130ca6c405701b3c Mon Sep 17 00:00:00 2001 From: Josh Sharpe Date: Tue, 4 Jun 2019 10:45:36 +0700 Subject: [PATCH 2/2] clobber cookie values instead of entire hash --- lib/raven/processor/cookies.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/raven/processor/cookies.rb b/lib/raven/processor/cookies.rb index 6a684bc44..fb34d9c1a 100644 --- a/lib/raven/processor/cookies.rb +++ b/lib/raven/processor/cookies.rb @@ -10,14 +10,14 @@ def process(data) private def process_if_symbol_keys(data) - data[:request][:cookies] = STRING_MASK if data[:request][:cookies] + data[:request][:cookies] = data[:request][:cookies].merge(data[:request][:cookies]){|key, val| STRING_MASK} if data[:request][:cookies] return unless data[:request][:headers] && data[:request][:headers]["Cookie"] data[:request][:headers]["Cookie"] = STRING_MASK end def process_if_string_keys(data) - data["request"]["cookies"] = STRING_MASK if data["request"]["cookies"] + data["request"]["cookies"] = data["request"]["cookies"].merge(data["request"]["cookies"]){|key, val| STRING_MASK} if data["request"]["cookies"] return unless data["request"]["headers"] && data["request"]["headers"]["Cookie"] data["request"]["headers"]["Cookie"] = STRING_MASK