deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dont allow duplicates in ssh keys

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-07 09:42:22 +02:00
parent 18fc090052
commit 48628d31d5
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/models/key.rb
View file

@ -24,8 +24,8 @@ class Key < ActiveRecord::Base
before_save :set_identifier
validates :title, presence: true, length: { within: 0..255 }
validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }
validate :unique_key, :fingerprintable_key
validates :key, presence: true, length: { within: 0..5000 }, format: { :with => /ssh-.{3} / }, uniqueness: true
validate :fingerprintable_key
delegate :name, :email, to: :user, prefix: true
@ -33,14 +33,6 @@ class Key < ActiveRecord::Base
self.key = self.key.strip unless self.key.blank?
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
return true unless key # Don't test if there is no key.
# `ssh-keygen -lf /dev/stdin <<< "#{key}"` errors with: redirection unexpected
@ -65,7 +57,7 @@ class Key < ActiveRecord::Base
end
def is_deploy_key
true if project_id
!!project_id
end
# projects that has this key
@ -77,10 +69,6 @@ class Key < ActiveRecord::Base
end
end
def last_deploy?
Key.where(identifier: identifier).count == 0
end
def shell_id
"key-#{self.id}"
end