BigW Consortium Gitlab

Commit 48628d31 by Dmitriy Zaporozhets

dont allow duplicates in ssh keys

parent 18fc0900
...@@ -24,8 +24,8 @@ class Key < ActiveRecord::Base ...@@ -24,8 +24,8 @@ class Key < ActiveRecord::Base
before_save :set_identifier before_save :set_identifier
validates :title, presence: true, length: { within: 0..255 } validates :title, presence: true, length: { within: 0..255 }
validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / } validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }, uniqueness: true
validate :unique_key, :fingerprintable_key validate :fingerprintable_key
delegate :name, :email, to: :user, prefix: true delegate :name, :email, to: :user, prefix: true
...@@ -33,14 +33,6 @@ class Key < ActiveRecord::Base ...@@ -33,14 +33,6 @@ class Key < ActiveRecord::Base
self.key = self.key.strip unless self.key.blank? self.key = self.key.strip unless self.key.blank?
end end
def unique_key
query = Key.where(key: key)
query = query.where('(project_id IS NULL OR project_id = ?)', project_id) if project_id
if (query.count > 0)
errors.add :key, 'already exist.'
end
end
def fingerprintable_key def fingerprintable_key
return true unless key # Don't test if there is no key. return true unless key # Don't test if there is no key.
# `ssh-keygen -lf /dev/stdin <<< "#{key}"` errors with: redirection unexpected # `ssh-keygen -lf /dev/stdin <<< "#{key}"` errors with: redirection unexpected
...@@ -65,7 +57,7 @@ class Key < ActiveRecord::Base ...@@ -65,7 +57,7 @@ class Key < ActiveRecord::Base
end end
def is_deploy_key def is_deploy_key
true if project_id !!project_id
end end
# projects that has this key # projects that has this key
...@@ -77,10 +69,6 @@ class Key < ActiveRecord::Base ...@@ -77,10 +69,6 @@ class Key < ActiveRecord::Base
end end
end end
def last_deploy?
Key.where(identifier: identifier).count == 0
end
def shell_id def shell_id
"key-#{self.id}" "key-#{self.id}"
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment