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 lib/raven/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ class Configuration
# additional fields to sanitize
attr_accessor :sanitize_fields

# Sanitize values that look like credit card numbers
attr_accessor :sanitize_credit_cards

IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound',
'ActionController::RoutingError',
'ActionController::InvalidAuthenticityToken',
Expand All @@ -119,6 +122,7 @@ def initialize
self.async = false
self.catch_debugged_exceptions = true
self.sanitize_fields = []
self.sanitize_credit_cards = true
self.environments = []
end

Expand Down
7 changes: 4 additions & 3 deletions lib/raven/processor/sanitizedata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ class Processor::SanitizeData < Processor
DEFAULT_FIELDS = %w(authorization password passwd secret ssn social(.*)?sec)
CREDIT_CARD_RE = /^(?:\d[ -]*?){13,16}$/

attr_accessor :sanitize_fields
attr_accessor :sanitize_fields, :sanitize_credit_cards

def initialize(client)
super
self.sanitize_fields = client.configuration.sanitize_fields
self.sanitize_credit_cards = client.configuration.sanitize_credit_cards
end

def process(value)
Expand Down Expand Up @@ -49,7 +50,8 @@ def sanitize_query_string(query_string)
end

def matches_regexes?(k, v)
CREDIT_CARD_RE.match(v.to_s) || fields_re.match(k.to_s)
(sanitize_credit_cards && CREDIT_CARD_RE.match(v.to_s)) ||
fields_re.match(k.to_s)
end

def fields_re
Expand All @@ -65,4 +67,3 @@ def parse_json_or_nil(string)
end
end
end

16 changes: 16 additions & 0 deletions spec/raven/processors/sanitizedata_processor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
before do
@client = double("client")
allow(@client).to receive_message_chain(:configuration, :sanitize_fields) { ['user_field'] }
allow(@client).to receive_message_chain(:configuration, :sanitize_credit_cards) { true }
@processor = Raven::Processor::SanitizeData.new(@client)
end

Expand Down Expand Up @@ -109,6 +110,21 @@
expect(result["ccnumba_int"]).to eq(Raven::Processor::SanitizeData::INT_MASK)
end

it 'should pass through credit card values if configured' do
@processor.sanitize_credit_cards = false
data = {
'ccnumba' => '4242424242424242',
'ccnumba_13' => '4242424242424',
'ccnumba-dash' => '4242-4242-4242-4242',
'ccnumba_int' => 4242424242424242,
}

result = @processor.process(data)
expect(result["ccnumba"]).to eq('4242424242424242')
expect(result["ccnumba_13"]).to eq('4242424242424')
expect(result["ccnumba_int"]).to eq(4242424242424242)
end

it 'sanitizes hashes nested in arrays' do
data = {
"empty_array"=> [],
Expand Down