summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-11-19 10:44:27 +0000
committerDouwe Maan <douwe@gitlab.com>2016-11-19 10:44:27 +0000
commit8d7cb865ac8c19b2bcfbee5a8009f9948d78d6f4 (patch)
treebef37e1f2a0a497d0d321459869cd1428857e3f5 /config
parent78e34d8add4bc1d5e4d820a3a8e8636d5226c427 (diff)
parente14bb160ac8756d663a1397de4482f02fd738e1e (diff)
downloadgitlab-ce-8d7cb865ac8c19b2bcfbee5a8009f9948d78d6f4.tar.gz
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
Diffstat (limited to 'config')
-rw-r--r--config/initializers/rack_attack_logging.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/rack_attack_logging.rb b/config/initializers/rack_attack_logging.rb
new file mode 100644
index 00000000000..8bb9ea29c33
--- /dev/null
+++ b/config/initializers/rack_attack_logging.rb
@@ -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