Feature: Deploy keys between projects

Dmitriy Zaporozhets
1 parent 8e4625af
Showing 13 changed files with 86 additions and 105 deletions Show diff stats
app/controllers/deploy_keys_controller.rb
app/models/deploy_key.rb
app/models/key.rb
app/models/project.rb
app/models/user.rb
app/views/deploy_keys/_deploy_key.html.haml
app/views/deploy_keys/_form.html.haml
app/views/deploy_keys/_show.html.haml
app/views/deploy_keys/index.html.haml
app/views/deploy_keys/show.html.haml
app/views/refs/logs_tree.js.haml
config/routes.rb
spec/features/projects_deploy_keys_spec.rb
@@ -5,7 +5,8 @@ class DeployKeysController &lt; ProjectResourceController
   before_filter :authorize_admin_project!
  
   def index
-    @keys = @project.deploy_keys.all
+    @enabled_keys = @project.deploy_keys.all
+    @available_keys = available_keys - @enabled_keys
   end
  
   def show
@@ -19,8 +20,9 @@ class DeployKeysController &lt; ProjectResourceController
   end
  
   def create
-    @key = @project.deploy_keys.new(params[:key])
-    if @key.save
+    @key = DeployKey.new(params[:deploy_key])
+
+    if @key.valid? && @project.deploy_keys << @key
       redirect_to project_deploy_keys_path(@project)
     else
       render "new"
@@ -36,4 +38,22 @@ class DeployKeysController &lt; ProjectResourceController
       format.js { render nothing: true }
     end
   end
+
+  def enable
+    project.deploy_keys << available_keys.find(params[:id])
+
+    redirect_to project_deploy_keys_path(@project)
+  end
+
+  def disable
+    @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy
+
+    redirect_to project_deploy_keys_path(@project)
+  end
+
+  protected
+
+  def available_keys
+    @available_keys ||= DeployKey.in_projects(current_user.owned_projects)
+  end
 end
 class DeployKey < Key
   has_many :deploy_keys_projects, dependent: :destroy
   has_many :projects, through: :deploy_keys_projects
+
+  scope :in_projects, ->(projects) { joins(:deploy_keys_projects).where('deploy_keys_projects.project_id in (?)', projects) }
 end
@@ -46,10 +46,6 @@ class Key &lt; ActiveRecord::Base
     errors.add(:key, "can't be fingerprinted") if $?.exitstatus != 0
   end
  
-  def is_deploy_key
-    project.present?
-  end
-
   # projects that has this key
   def projects
     user.authorized_projects
@@ -55,7 +55,6 @@ class Project &lt; ActiveRecord::Base
   has_many :users_projects,     dependent: :destroy
   has_many :notes,              dependent: :destroy
   has_many :snippets,           dependent: :destroy
-  has_many :deploy_keys,        dependent: :destroy, class_name: "Key", foreign_key: "project_id"
   has_many :hooks,              dependent: :destroy, class_name: "ProjectHook"
   has_many :protected_branches, dependent: :destroy
   has_many :user_team_project_relationships, dependent: :destroy
@@ -65,6 +64,9 @@ class Project &lt; ActiveRecord::Base
   has_many :user_team_user_relationships, through: :user_teams
   has_many :user_teams_members, through: :user_team_user_relationships
  
+  has_many :deploy_keys_projects, dependent: :destroy
+  has_many :deploy_keys, through: :deploy_keys_projects
+
   delegate :name, to: :owner, allow_nil: true, prefix: true
  
   # Validations
@@ -89,7 +89,7 @@ class User &lt; ActiveRecord::Base
  
   has_many :personal_projects,        through: :namespace, source: :projects
   has_many :projects,                 through: :users_projects
-  has_many :own_projects,             foreign_key: :creator_id
+  has_many :own_projects,             foreign_key: :creator_id, class_name: 'Project'
   has_many :owned_projects,           through: :namespaces, source: :projects
  
   #
@@ -0,0 +1,25 @@
+%li
+  .pull-right
+    - if @available_keys.include?(deploy_key)
+      = link_to enable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
+        %i.icon-plus
+        Enable
+    - else
+      - if deploy_key.projects.count > 1
+        = link_to disable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
+          %i.icon-off
+          Disable
+      - else
+        = link_to 'Remove', project_deploy_key_path(@project, deploy_key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
+
+
+  = link_to project_deploy_key_path(@project, deploy_key) do
+    %i.icon-key
+    %strong= deploy_key.title
+
+  %p.light.prepend-top-10
+    - deploy_key.projects.map(&:name_with_namespace).each do |project_name|
+      %span.label= project_name
+    %small.pull-right
+      Created #{time_ago_in_words(deploy_key.created_at)} ago
+
@@ -18,6 +18,6 @@
           = link_to "here", help_ssh_path
  
     .actions
-      = f.submit 'Save', class: "btn-save btn"
+      = f.submit 'Create', class: "btn-create btn"
       = link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
  
@@ -1,12 +0,0 @@
-%tr
-  %td
-    %a{href: project_deploy_key_path(key.project, key)}
-      %strong= key.title
-  %td
-    %span.update-author
-      Added
-      = time_ago_in_words(key.created_at)
-      ago
-  %td
-    = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
-
 = render "projects/settings_nav"
  
 %p.slead
-  Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers. A deploy key can be added to only one project. If you need to add the same key to multiple projects you can create a deploy user and add that user to multiple projects.
+  Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
  
-  - if can? current_user, :admin_project, @project
-    = link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
-      Add Deploy Key
-- if @keys.any?
-  %table
-    %thead
-      %tr
-        %th Keys
-        %th
-        %th
-    - @keys.each do |key|
-      = render(partial: 'show', locals: {key: key})
+%p
+  You can create a deploy key or add existing one
+  = link_to new_project_deploy_key_path(@project), class: "btn btn-primary pull-right", title: "New Deploy Key" do
+    %i.icon-plus
+    New Deploy Key
+
+%hr.clearfix
+
+.row
+  .span6.enabled-keys
+    %h5.cgreen
+      Enabled deploy keys
+      %small for this project
+    %ul.bordered-list
+      = render @enabled_keys
+  .span6.available-keys
+    %h5
+      Available deploy keys
+      %small from projects you are able to manage
+    %ul.bordered-list
+      = render @available_keys
@@ -12,4 +12,4 @@
 %hr
 %pre= @key.key
 .pull-right
-  = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
+  = link_to 'Remove', project_deploy_key_path(@project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
-- @logs.each do |content_data| 
+- @logs.each do |content_data|
   - file_name = content_data[:file_name]
   - commit = content_data[:commit]
  
@@ -215,7 +215,13 @@ Gitlab::Application.routes.draw do
       end
     end
  
-    resources :deploy_keys
+    resources :deploy_keys do
+      member do
+        put :enable
+        put :disable
+      end
+    end
+
     resources :protected_branches, only: [:index, :create, :destroy]
  
     resources :refs, only: [] do
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe "Projects", "DeployKeys" do
-  let(:project) { create(:project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-  end
-
-  describe "GET /keys" do
-    before do
-      @key = create(:key, project: project)
-      visit project_deploy_keys_path(project)
-    end
-
-    subject { page }
-
-    it { should have_content(@key.title) }
-
-    describe "Destroy" do
-      before { visit project_deploy_key_path(project, @key) }
-
-      it "should remove entry" do
-        expect {
-          click_link "Remove"
-        }.to change { project.deploy_keys.count }.by(-1)
-      end
-    end
-  end
-
-  describe "New key" do
-    before do
-      visit project_deploy_keys_path(project)
-      click_link "New Deploy Key"
-    end
-
-    it "should open new key popup" do
-      page.should have_content("New Deploy key")
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "key_title", with: "laptop"
-        fill_in "key_key", with: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop"
-      end
-
-      it { expect { click_button "Save" }.to change {Key.count}.by(1) }
-
-      it "should add new key to table" do
-        click_button "Save"
-
-        page.should have_content "laptop"
-      end
-    end
-  end
-
-  describe "Show page" do
-    before do
-      @key = create(:key, project: project)
-      visit project_deploy_key_path(project, @key)
-    end
-
-    it { page.should have_content @key.title }
-    it { page.should have_content @key.key[0..10] }
-  end
-end
...	...	@@ -5,7 +5,8 @@ class DeployKeysController < ProjectResourceController
5	5	before_filter :authorize_admin_project!
6	6
7	7	def index
8		- @keys = @project.deploy_keys.all
	8	+ @enabled_keys = @project.deploy_keys.all
	9	+ @available_keys = available_keys - @enabled_keys
9	10	end
10	11
11	12	def show
...	...	@@ -19,8 +20,9 @@ class DeployKeysController < ProjectResourceController
19	20	end
20	21
21	22	def create
22		- @key = @project.deploy_keys.new(params[:key])
23		- if @key.save
	23	+ @key = DeployKey.new(params[:deploy_key])
	24	+
	25	+ if @key.valid? && @project.deploy_keys << @key
24	26	redirect_to project_deploy_keys_path(@project)
25	27	else
26	28	render "new"
...	...	@@ -36,4 +38,22 @@ class DeployKeysController < ProjectResourceController
36	38	format.js { render nothing: true }
37	39	end
38	40	end
	41	+
	42	+ def enable
	43	+ project.deploy_keys << available_keys.find(params[:id])
	44	+
	45	+ redirect_to project_deploy_keys_path(@project)
	46	+ end
	47	+
	48	+ def disable
	49	+ @project.deploy_keys_projects.where(deploy_key_id: params[:id]).last.destroy
	50	+
	51	+ redirect_to project_deploy_keys_path(@project)
	52	+ end
	53	+
	54	+ protected
	55	+
	56	+ def available_keys
	57	+ @available_keys \|\|= DeployKey.in_projects(current_user.owned_projects)
	58	+ end
39	59	end
...	...
1	1	class DeployKey < Key
2	2	has_many :deploy_keys_projects, dependent: :destroy
3	3	has_many :projects, through: :deploy_keys_projects
	4	+
	5	+ scope :in_projects, ->(projects) { joins(:deploy_keys_projects).where('deploy_keys_projects.project_id in (?)', projects) }
4	6	end
...	...
...	...	@@ -46,10 +46,6 @@ class Key < ActiveRecord::Base
46	46	errors.add(:key, "can't be fingerprinted") if $?.exitstatus != 0
47	47	end
48	48
49		- def is_deploy_key
50		- project.present?
51		- end
52		-
53	49	# projects that has this key
54	50	def projects
55	51	user.authorized_projects
...	...
...	...	@@ -55,7 +55,6 @@ class Project < ActiveRecord::Base
55	55	has_many :users_projects, dependent: :destroy
56	56	has_many :notes, dependent: :destroy
57	57	has_many :snippets, dependent: :destroy
58		- has_many :deploy_keys, dependent: :destroy, class_name: "Key", foreign_key: "project_id"
59	58	has_many :hooks, dependent: :destroy, class_name: "ProjectHook"
60	59	has_many :protected_branches, dependent: :destroy
61	60	has_many :user_team_project_relationships, dependent: :destroy
...	...	@@ -65,6 +64,9 @@ class Project < ActiveRecord::Base
65	64	has_many :user_team_user_relationships, through: :user_teams
66	65	has_many :user_teams_members, through: :user_team_user_relationships
67	66
	67	+ has_many :deploy_keys_projects, dependent: :destroy
	68	+ has_many :deploy_keys, through: :deploy_keys_projects
	69	+
68	70	delegate :name, to: :owner, allow_nil: true, prefix: true
69	71
70	72	# Validations
...	...
...	...	@@ -89,7 +89,7 @@ class User < ActiveRecord::Base
89	89
90	90	has_many :personal_projects, through: :namespace, source: :projects
91	91	has_many :projects, through: :users_projects
92		- has_many :own_projects, foreign_key: :creator_id
	92	+ has_many :own_projects, foreign_key: :creator_id, class_name: 'Project'
93	93	has_many :owned_projects, through: :namespaces, source: :projects
94	94
95	95	#
...	...
...	...	@@ -0,0 +1,25 @@
	1	+%li
	2	+ .pull-right
	3	+ - if @available_keys.include?(deploy_key)
	4	+ = link_to enable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
	5	+ %i.icon-plus
	6	+ Enable
	7	+ - else
	8	+ - if deploy_key.projects.count > 1
	9	+ = link_to disable_project_deploy_key_path(@project, deploy_key), class: 'btn btn-small', method: :put do
	10	+ %i.icon-off
	11	+ Disable
	12	+ - else
	13	+ = link_to 'Remove', project_deploy_key_path(@project, deploy_key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
	14	+
	15	+
	16	+ = link_to project_deploy_key_path(@project, deploy_key) do
	17	+ %i.icon-key
	18	+ %strong= deploy_key.title
	19	+
	20	+ %p.light.prepend-top-10
	21	+ - deploy_key.projects.map(&:name_with_namespace).each do \|project_name\|
	22	+ %span.label= project_name
	23	+ %small.pull-right
	24	+ Created #{time_ago_in_words(deploy_key.created_at)} ago
	25	+
...	...
...	...	@@ -18,6 +18,6 @@
18	18	= link_to "here", help_ssh_path
19	19
20	20	.actions
21		- = f.submit 'Save', class: "btn-save btn"
	21	+ = f.submit 'Create', class: "btn-create btn"
22	22	= link_to "Cancel", project_deploy_keys_path(@project), class: "btn btn-cancel"
23	23
...	...
...	...	@@ -1,12 +0,0 @@
1		-%tr
2		- %td
3		- %a{href: project_deploy_key_path(key.project, key)}
4		- %strong= key.title
5		- %td
6		- %span.update-author
7		- Added
8		- = time_ago_in_words(key.created_at)
9		- ago
10		- %td
11		- = link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
12		-
1	1	= render "projects/settings_nav"
2	2
3	3	%p.slead
4		- Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers. A deploy key can be added to only one project. If you need to add the same key to multiple projects you can create a deploy user and add that user to multiple projects.
	4	+ Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
5	5
6		- - if can? current_user, :admin_project, @project
7		- = link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
8		- Add Deploy Key
9		-- if @keys.any?
10		- %table
11		- %thead
12		- %tr
13		- %th Keys
14		- %th
15		- %th
16		- - @keys.each do \|key\|
17		- = render(partial: 'show', locals: {key: key})
	6	+%p
	7	+ You can create a deploy key or add existing one
	8	+ = link_to new_project_deploy_key_path(@project), class: "btn btn-primary pull-right", title: "New Deploy Key" do
	9	+ %i.icon-plus
	10	+ New Deploy Key
	11	+
	12	+%hr.clearfix
	13	+
	14	+.row
	15	+ .span6.enabled-keys
	16	+ %h5.cgreen
	17	+ Enabled deploy keys
	18	+ %small for this project
	19	+ %ul.bordered-list
	20	+ = render @enabled_keys
	21	+ .span6.available-keys
	22	+ %h5
	23	+ Available deploy keys
	24	+ %small from projects you are able to manage
	25	+ %ul.bordered-list
	26	+ = render @available_keys
...	...
...	...	@@ -12,4 +12,4 @@
12	12	%hr
13	13	%pre= @key.key
14	14	.pull-right
15		- = link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
	15	+ = link_to 'Remove', project_deploy_key_path(@project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
...	...