suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

...

6 Commits
master ... te-dev

Author SHA1 Message Date
Brandon Ferguson
ee701e6892 Merge pull request from travis-ci/update-travis-core-for-backport 
Bump travis-core to get amqps fixes
 2016-08-01 16:36:54 +02:00
bnferguson
021b2249e8 Bump travis-core to get amqps fixes 2016-08-01 16:22:06 +02:00
Brandon Ferguson
169b82956c Merge pull request from travis-ci/te-dev-for-dependencies 
Use te-dev branch for travis-core in te-dev branch
 2016-07-11 15:25:32 +02:00
bnferguson
c08dcc6390 Use te-dev branch for travis-core in Gemfile 2016-07-11 15:13:26 +02:00
Brandon Ferguson
73c2691959 Merge pull request from travis-ci/backport-287 
[Backport] Don't run Rack::Attack for Enterprise.
 2016-07-05 09:48:21 +02:00
Konstantin Haase
eacb4a6372 Don't run Rack::Attack for Enterprise. 
On enterprise, the reverse proxy is not correctly set up, and therefore the client IP address not passed through properly. For that reason, all requests look like they originate from the same client, and if one gets blocked, everyone gets blocked.
 2016-07-05 09:46:39 +02:00
3 changed files with 13 additions and 9 deletions

2
Gemfile
View File

@ -5,7 +5,7 @@ ruby '2.1.7' if ENV.key?('DYNO')
gem 's3', github: 'travis-ci/s3' gem 's3', github: 'travis-ci/s3'
gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-core', github: 'travis-ci/travis-core', branch: 'te-dev'
gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-support', github: 'travis-ci/travis-support'
gem 'travis-amqp', github: 'travis-ci/travis-amqp' gem 'travis-amqp', github: 'travis-ci/travis-amqp'
gem 'travis-config', '~> 0.1.0' gem 'travis-config', '~> 0.1.0'

18
Gemfile.lock
View File

@ -48,7 +48,8 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: f7b3a76b3f39c28bb5cf7b9dc24acec13908a11a revision: 2d7714edb82507173514bb9aa762e732626aa732
branch: te-dev
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.19) actionmailer (~> 3.2.19)
@ -56,7 +57,7 @@ GIT
coder (~> 0.4.0) coder (~> 0.4.0)
data_migrations (~> 0.0.1) data_migrations (~> 0.0.1)
gh gh
hashr (~> 0.0.19) hashr
metriks (~> 0.9.7) metriks (~> 0.9.7)
multi_json multi_json
pusher (~> 0.14.0) pusher (~> 0.14.0)
@ -193,11 +194,11 @@ GEM
net-http-pipeline net-http-pipeline
hashr (0.0.22) hashr (0.0.22)
hike (1.2.3) hike (1.2.3)
hitimes (1.2.3) hitimes (1.2.4)
httparty (0.11.0) httparty (0.11.0)
multi_json (~> 1.0) multi_json (~> 1.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.7.1) httpclient (2.8.0)
i18n (0.7.0) i18n (0.7.0)
ice_nine (0.11.2) ice_nine (0.11.2)
jemalloc (1.0.1) jemalloc (1.0.1)
@ -224,7 +225,7 @@ GEM
mime-types (1.25.1) mime-types (1.25.1)
mocha (0.14.0) mocha (0.14.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.11.2) multi_json (1.12.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
net-http-persistent (2.9.4) net-http-persistent (2.9.4)
@ -267,7 +268,7 @@ GEM
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (2.3.0) redcarpet (2.3.0)
redis (3.2.2) redis (3.3.1)
redis-namespace (1.5.1) redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
rerun (0.8.2) rerun (0.8.2)
@ -331,7 +332,7 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.47) tzinfo (0.3.51)
unicorn (4.8.3) unicorn (4.8.3)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
@ -388,3 +389,6 @@ DEPENDENCIES
travis-yaml! travis-yaml!
unicorn unicorn
yard-sinatra! yard-sinatra!
BUNDLED WITH
1.12.4

2
lib/travis/api/app.rb
View File

@ -129,7 +129,7 @@ module Travis::Api
use Travis::Api::App::Middleware::UserAgentTracker use Travis::Api::App::Middleware::UserAgentTracker
# make sure this is below ScopeCheck so we have the token # make sure this is below ScopeCheck so we have the token
use Rack::Attack if Endpoint.production? use Rack::Attack if Endpoint.production? and not Travis.config.enterprise
# if this is a v3 API request, ignore everything after # if this is a v3 API request, ignore everything after
use Travis::API::V3::OptIn use Travis::API::V3::OptIn