Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite
Reject ssh keys that break gitolite
This commit is contained in:
commit
b5f9d29f55
6 changed files with 38 additions and 8 deletions
|
@ -14,7 +14,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?
|
||||
|
@ -28,6 +28,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)}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue