diff --git a/lib/rack/attack.rb b/lib/rack/attack.rb index 80a8801..24a74b5 100644 --- a/lib/rack/attack.rb +++ b/lib/rack/attack.rb @@ -10,7 +10,8 @@ class Rack::Attack autoload :Track, 'rack/attack/track' autoload :StoreProxy,'rack/attack/store_proxy' autoload :Fail2Ban, 'rack/attack/fail2ban' - autoload :Allow2Ban, 'rack/attack/allow2ban' + autoload :Allow2Ban, 'rack/attack/allow2ban' + autoload :Request, 'rack/attack/request' class << self @@ -88,7 +89,7 @@ class Rack::Attack end def call(env) - req = Rack::Request.new(env) + req = Rack::Attack::Request.new(env) if whitelisted?(req) @app.call(env) diff --git a/lib/rack/attack/request.rb b/lib/rack/attack/request.rb new file mode 100644 index 0000000..603a126 --- /dev/null +++ b/lib/rack/attack/request.rb @@ -0,0 +1,6 @@ +module Rack + class Attack + class Request < ::Rack::Request + end + end +end diff --git a/spec/rack_attack_request_spec.rb b/spec/rack_attack_request_spec.rb new file mode 100644 index 0000000..ca3eadd --- /dev/null +++ b/spec/rack_attack_request_spec.rb @@ -0,0 +1,19 @@ +require_relative 'spec_helper' + +describe 'Rack::Attack' do + describe 'helpers' do + before do + class Rack::Attack::Request + def remote_ip + ip + end + end + + Rack::Attack.whitelist('valid IP') do |req| + req.remote_ip == "127.0.0.1" + end + end + + allow_ok_requests + end +end