From 60d1dcb83ac97e3d0dfd9cdf0daa970671ba3d68 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 19 Jan 2017 17:11:48 +0000 Subject: Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Fix users being able to delete instance public deployment keys See merge request !2049 --- lib/api/deploy_keys.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/api/deploy_keys.rb') diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb index 85360730841..f6cb17bafd8 100644 --- a/lib/api/deploy_keys.rb +++ b/lib/api/deploy_keys.rb @@ -105,15 +105,19 @@ module API present key.deploy_key, with: Entities::SSHKey end - desc 'Delete existing deploy key of currently authenticated user' do + desc 'Delete deploy key for a project' do success Key end params do requires :key_id, type: Integer, desc: 'The ID of the deploy key' end delete ":id/#{path}/:key_id" do - key = user_project.deploy_keys.find(params[:key_id]) - key.destroy + key = user_project.deploy_keys_projects.find_by(deploy_key_id: params[:key_id]) + if key + key.destroy + else + not_found!('Deploy Key') + end end end end -- cgit v1.2.3