From a210cf86614e7ac806e60997b7cee7e527cc20c1 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 5 Jul 2016 12:46:32 +0200 Subject: [PATCH] support nil ip --- lib/travis/api/attack.rb | 2 +- spec/unit/attack_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/api/attack.rb b/lib/travis/api/attack.rb index 96af80bf..a834e38a 100644 --- a/lib/travis/api/attack.rb +++ b/lib/travis/api/attack.rb @@ -38,7 +38,7 @@ class Rack::Attack # https://help.github.com/articles/what-ip-addresses-does-github-use-that-i-should-whitelist/ whitelist('safelist anything coming from github') do |request| - NetAddr::CIDR.create('192.30.252.0/22').contains?(request.ip) + request.ip && NetAddr::CIDR.create('192.30.252.0/22').contains?(request.ip) end #### diff --git a/spec/unit/attack_spec.rb b/spec/unit/attack_spec.rb index a469ae4f..41aac8f8 100644 --- a/spec/unit/attack_spec.rb +++ b/spec/unit/attack_spec.rb @@ -13,7 +13,7 @@ describe Rack::Attack do describe 'request from GitHub ip' do let(:request) { env = Rack::MockRequest.env_for("https://api-test.travis-ci.org/repos/rails/rails/branches", { - 'REMOTE_ADDR' => '192.30.252.42' + 'REMOTE_ADDR' => '192.30.252.42', }) Rack::Attack::Request.new(env) }