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

Check for repository owner instead of current user to validate feature flag

Browse Source
This commit is contained in:
Ana Rosas 2016-06-23 15:15:31 -05:00
parent cf5ea374d4
commit 69cc2eef7d
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/travis/api/app/endpoint/builds.rb
View File

@ -22,9 +22,10 @@ class Travis::Api::App
post '/:id/cancel' do
Metriks.meter("api.request.cancel_build").mark
if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id] })
else
service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id] })
repository_owner = service.target.repository.owner
if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner)
service = self.service(:cancel_build, params.merge(source: 'api'))
end
@ -60,10 +61,11 @@ class Travis::Api::App
post '/:id/restart' do
Metriks.meter("api.request.restart_build").mark
service = if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
Travis::Enqueue::Services::RestartModel.new(current_user, build_id: params[:id])
else
self.service(:reset_model, build_id: params[:id])
service = Travis::Enqueue::Services::RestartModel.new(current_user, build_id: params[:id])
repository_owner = service.target.repository.owner
if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner)
service = self.service(:reset_model, build_id: params[:id])
end
result = if !service.accept?

14
lib/travis/api/app/endpoint/jobs.rb
View File

@ -29,9 +29,9 @@ class Travis::Api::App
post '/:id/cancel' do
Metriks.meter("api.request.cancel_job").mark
if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
service = Travis::Enqueue::Services::CancelModel.new(current_user, { job_id: params[:id] })
else
service = Travis::Enqueue::Services::CancelModel.new(current_user, { job_id: params[:id] })
repository_owner = service.target.repository.owner
if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner)
service = self.service(:cancel_job, params.merge(source: 'api'))
end
@ -68,10 +68,10 @@ class Travis::Api::App
post '/:id/restart' do
Metriks.meter("api.request.restart_job").mark
service = if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
Travis::Enqueue::Services::RestartModel.new(current_user, { job_id: params[:id] })
else
self.service(:reset_model, job_id: params[:id])
service = Travis::Enqueue::Services::RestartModel.new(current_user, { job_id: params[:id] })
repository_owner = service.target.repository.owner
if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner)
service = self.service(:reset_model, job_id: params[:id])
end
result = if !service.accept?

4
lib/travis/api/v3/queries/build.rb
View File

@ -13,7 +13,7 @@ module Travis::API::V3
def cancel(user)
raise BuildNotCancelable if %w(passed failed canceled errored).include? find.state
payload = { id: id, user_id: user.id, source: 'api' }
if Travis::Features.owner_active?(:enqueue_to_hub, user)
if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner)
service = Travis::Enqueue::Services::CancelModel.new(user, { build_id: id })
service.push("build:cancel", payload)
else
@ -24,7 +24,7 @@ module Travis::API::V3
def restart(user)
raise BuildAlreadyRunning if %w(received queued started).include? find.state
if Travis::Features.owner_active?(:enqueue_to_hub, user)
if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner)
service = Travis::Enqueue::Services::RestartModel.new(user, { build_id: id })
payload = { id: id, user_id: user.id }
service.push("build:restart", payload)

5
lib/travis/api/v3/queries/job.rb
View File

@ -13,7 +13,8 @@ module Travis::API::V3
def cancel(user)
raise JobNotCancelable if %w(passed failed canceled errored).include? find.state
payload = { id: id, user_id: user.id, source: 'api' }
if Travis::Features.owner_active?(:enqueue_to_hub, user)
#look for repo.owner instead and look if the user belongs to the repo, instead of using user for the feature flag
if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner)
service = Travis::Enqueue::Services::CancelModel.new(user, { job_id: id })
service.push("job:cancel", payload)
else
@ -25,7 +26,7 @@ module Travis::API::V3
def restart(user)
raise JobAlreadyRunning if %w(received queued started).include? find.state
if Travis::Features.owner_active?(:enqueue_to_hub, user)
if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner)
service = Travis::Enqueue::Services::RestartModel.new(user, { job_id: id })
payload = { id: id, user_id: user.id }
service.push("job:restart", payload)

1
lib/travis/api/workers/job_cancellation.rb
View File

@ -13,7 +13,6 @@ module Travis
user = User.find(data['user_id'])
Travis.service(:cancel_job, user, { id: data['id'], source: data['source'] }).run
end
end
end
end