diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-22 09:49:50 +0200 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-22 09:56:39 +0200 |
commit | b70606287bda9b52be2288513f612505fa3d86b2 (patch) | |
tree | 91679e2491107f76e4d3598c8e73e192bf8663b2 /config | |
parent | 52e903e99f3b220553e65be7b6034dfbaeef6d81 (diff) | |
download | gitlab-ce-b70606287bda9b52be2288513f612505fa3d86b2.tar.gz |
Create one big regular expresion for Rack::Attack
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/rack_attack.rb.example | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/initializers/rack_attack.rb.example b/config/initializers/rack_attack.rb.example index d093666561b..332865d2881 100644 --- a/config/initializers/rack_attack.rb.example +++ b/config/initializers/rack_attack.rb.example @@ -9,18 +9,18 @@ paths_to_be_protected = [ "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session", "#{Rails.application.config.relative_url_root}/users", "#{Rails.application.config.relative_url_root}/users/confirmation", - "#{Rails.application.config.relative_url_root}/unsubscribes/*" + "#{Rails.application.config.relative_url_root}/unsubscribes/" ] -paths_to_be_protected.map! { |path| Regexp.new(path) } +# Create one big regular expression that matches strings starting with any of +# the paths_to_be_protected. +paths_regex = Regexp.union(paths_to_be_protected.map { |path| /\A#{Regexp.escape(path)}/ }) unless Rails.env.test? Rack::Attack.throttle('protected paths', limit: 10, period: 60.seconds) do |req| - if req.post? - paths_paths_to_be_protected.each do |protected_path| - req.ip if req.path =~ protected_path - end + if req.post? && req.path =~ paths_regex + req.ip end end end |