sjs/rack-attack
1
0
Fork 0
mirror of https://github.com/samsonjs/rack-attack.git synced 2026-04-26 14:57:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #20 from rallysf/correct-http-codes

Browse source 
Use correct HTTP status codes for blackist and throttle
This commit is contained in:
Aaron Suggs 2013-07-02 13:33:03 -07:00
commit eaaad929b1
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/rack/attack.rb
View file

@ -39,10 +39,10 @@ module Rack::Attack
# Set defaults # Set defaults
@notifier ||= ActiveSupport::Notifications if defined?(ActiveSupport::Notifications) @notifier ||= ActiveSupport::Notifications if defined?(ActiveSupport::Notifications)
@blacklisted_response ||= lambda {|env| [503, {}, ["Blocked\n"]] } @blacklisted_response ||= lambda {|env| [401, {}, ["Unauthorized\n"]] }
@throttled_response ||= lambda {|env| @throttled_response ||= lambda {|env|
retry_after = env['rack.attack.match_data'][:period] rescue nil retry_after = env['rack.attack.match_data'][:period] rescue nil
[503, {'Retry-After' => retry_after.to_s}, ["Retry later\n"]] [429, {'Retry-After' => retry_after.to_s}, ["Retry later\n"]]
} }
self self

8
spec/fail2ban_spec.rb
View file

@ -24,7 +24,7 @@ describe 'Rack::Attack.Fail2Ban' do
describe 'when not at maxretry' do describe 'when not at maxretry' do
before { get '/?foo=OMGHAX', {}, 'REMOTE_ADDR' => '1.2.3.4' } before { get '/?foo=OMGHAX', {}, 'REMOTE_ADDR' => '1.2.3.4' }
it 'fails' do it 'fails' do
last_response.status.must_equal 503 last_response.status.must_equal 401
end end
it 'increases fail count' do it 'increases fail count' do
@ -46,7 +46,7 @@ describe 'Rack::Attack.Fail2Ban' do
end end
it 'fails' do it 'fails' do
last_response.status.must_equal 503 last_response.status.must_equal 401
end end
it 'increases fail count' do it 'increases fail count' do
@ -83,7 +83,7 @@ describe 'Rack::Attack.Fail2Ban' do
end end
it 'fails' do it 'fails' do
last_response.status.must_equal 503 last_response.status.must_equal 401
end end
it 'does not increase fail count' do it 'does not increase fail count' do
@ -103,7 +103,7 @@ describe 'Rack::Attack.Fail2Ban' do
end end
it 'fails' do it 'fails' do
last_response.status.must_equal 503 last_response.status.must_equal 401
end end
it 'does not increase fail count' do it 'does not increase fail count' do

2
spec/rack_attack_spec.rb
View file

@ -15,7 +15,7 @@ describe 'Rack::Attack' do
before { get '/', {}, 'REMOTE_ADDR' => @bad_ip } before { get '/', {}, 'REMOTE_ADDR' => @bad_ip }
it "should return a blacklist response" do it "should return a blacklist response" do
get '/', {}, 'REMOTE_ADDR' => @bad_ip get '/', {}, 'REMOTE_ADDR' => @bad_ip
last_response.status.must_equal 503 last_response.status.must_equal 401
end end
it "should tag the env" do it "should tag the env" do
last_request.env['rack.attack.matched'].must_equal "ip #{@bad_ip}" last_request.env['rack.attack.matched'].must_equal "ip #{@bad_ip}"

2
spec/rack_attack_throttle_spec.rb
View file

@ -26,7 +26,7 @@ describe 'Rack::Attack.throttle' do
2.times { get '/', {}, 'REMOTE_ADDR' => '1.2.3.4' } 2.times { get '/', {}, 'REMOTE_ADDR' => '1.2.3.4' }
end end
it 'should block the last request' do it 'should block the last request' do
last_response.status.must_equal 503 last_response.status.must_equal 429
end end
it 'should tag the env' do it 'should tag the env' do
last_request.env['rack.attack.matched'].must_equal 'ip/sec' last_request.env['rack.attack.matched'].must_equal 'ip/sec'