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

Reject ssh keys that break gitolite.

Browse source 
Failing test.

Working check.
This commit is contained in:
Sytse Sijbrandij 2012-09-21 18:22:43 +02:00
parent 8f9a450eed
commit f3ce02b5c9
3 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/models/key.rb
View file

@ -18,7 +18,7 @@ class Key < ActiveRecord::Base
before_save :set_identifier
before_validation :strip_white_space
delegate :name, :email, to: :user, prefix: true
validate :unique_key
validate :unique_key, :fingerprintable_key
def strip_white_space
self.key = self.key.strip unless self.key.blank?
@ -32,6 +32,21 @@ class Key < ActiveRecord::Base
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
file = Tempfile.new('key_file')
begin
file.puts key
file.rewind
fingerprint_output = `ssh-keygen -lf #{file.path} 2>&1` # Catch stderr.
ensure
file.close
file.unlink # deletes the temp file
end
errors.add(:key, "can't be fingerprinted") if fingerprint_output.match("failed")
end
def set_identifier
if is_deploy_key
self.identifier = "deploy_" + Digest::MD5.hexdigest(key)