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
1 change: 0 additions & 1 deletion app/services/analytics.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ def track_event(event, attributes = {})
event_properties: attributes.except(:user_id),
user_id: attributes[:user_id] || uuid,
}

ahoy.track(event, analytics_hash.merge!(request_attributes))
end

Expand Down
8 changes: 8 additions & 0 deletions lib/headers_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,18 @@ def initialize(app)

def call(env)
HEADERS_TO_DELETE.each { |header| env.delete(header) }
ascii_encode_headers(env)
app.call(env)
end

private

def ascii_encode_headers(env)
headers = env.select { |key, _value| key.starts_with? 'HTTP_' }
headers.each do |header, value|
env[header] = value.encode('ascii-8bit', invalid: :replace, undef: :replace, replace: '?')
end
end

attr_reader :app
end
2 changes: 1 addition & 1 deletion spec/features/visitors/i18n_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

context 'visit homepage with locale set in header' do
before do
page.driver.header 'Accept-Language', locale
page.driver.header 'Accept-Language', locale.to_s
visit root_path
end

Expand Down
10 changes: 10 additions & 0 deletions spec/lib/headers_filter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,15 @@
expect(env).to_not have_key('HTTP_HOST')
expect(env).to_not have_key('HTTP_X_FORWARDED_HOST')
end

it 'encodes headers as 8 bit ASCII' do
env = {
'HTTP_USER_AGENT' => 'Mózillá/5.0',
}

middleware.call(env)

expect(env['HTTP_USER_AGENT'].ascii_only?).to eq(true)
end
end
end
6 changes: 6 additions & 0 deletions spec/requests/headers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,10 @@

expect(response.code.to_i).to eq(404)
end

it 'ASCII encodes UTF8 headers' do
get root_path, headers: { 'User-Agent' => 'Mózillá/5.0' }

expect(request.env['HTTP_USER_AGENT'].ascii_only?).to eq(true)
end
end