Validate key uniqueness across Key and DeployKey tables

2 files changed, 8 insertions, 0 deletions

diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index 254e766c4a4..c720f09baf7 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -1,3 +1,5 @@
+require 'unique_public_key_validator'
+
 class DeployKey < ActiveRecord::Base
   belongs_to :project
 
@@ -10,6 +12,8 @@ class DeployKey < ActiveRecord::Base
             :uniqueness => true,
             :length   => { :within => 0..5000 }
 
+  validates_with UniquePublicKeyValidator
+
   before_save :set_identifier
   after_save :update_repository
   after_destroy :repository_delete_key
diff --git a/app/models/key.rb b/app/models/key.rb
index 359538d2cbd..0e4088e4750 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -1,3 +1,5 @@
+require 'unique_public_key_validator'
+
 class Key < ActiveRecord::Base
   belongs_to :user
 
@@ -10,6 +12,8 @@ class Key < ActiveRecord::Base
             :uniqueness => true,
             :length   => { :within => 0..5000 }
 
+  validates_with UniquePublicKeyValidator
+
   before_save :set_identifier
   after_save :update_repository
   after_destroy :repository_delete_key