Merge branch 'add-logging-to-rack-attack' into 'master'

Add logging for rack attack events

Patch for issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/15612 and partial patch for https://gitlab.com/gitlab-com/support/issues/119.

Also related: https://gitlab.com/gitlab-org/gitlab-ce/issues/22527 

Adds logging for throttle and blacklist rack attack events to the production log.

@stanhu @MrChrisW

See merge request !7585
This commit is contained in:
Douwe Maan 2016-11-19 10:44:27 +00:00
commit 8d7cb865ac
2 changed files with 11 additions and 0 deletions

View File

@ -0,0 +1,4 @@
---
title: Add logging for rack attack events to production.log
merge_request:
author:

View File

@ -0,0 +1,7 @@
# Adds logging for all Rack Attack blocks and throttling events.
ActiveSupport::Notifications.subscribe('rack.attack') do |name, start, finish, request_id, req|
if [:throttle, :blacklist].include? req.env['rack.attack.match_type']
Rails.logger.info("Rack_Attack: #{req.env['rack.attack.match_type']} #{req.ip} #{req.request_method} #{req.fullpath}")
end
end