Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #991 from warpc/953-ssh_keys 

[refs #953] fix managment keys and name of ssh-key in web
This commit is contained in:
Vladimir Sharshov 2013-03-01 11:37:35 -08:00
parent 6d449de465 3f4ea585df
commit 657d330b59
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/ssh_key.rb
View File

@ -2,7 +2,7 @@
# https://github.com/gitlabhq/gitlabhq/blob/15c0e58a49d623a0f8747e1d7e74364324eeb79f/app/models/key.rb
class SshKey < ActiveRecord::Base
SHELL_KEY_COMMAND = "sudo ~#{APP_CONFIG['shell_user']}/gitlab-shell/bin/gitlab-keys"
SHELL_KEY_COMMAND = "sudo -i -u #{APP_CONFIG['shell_user']} ~#{APP_CONFIG['shell_user']}/gitlab-shell/bin/gitlab-keys"
belongs_to :user
attr_accessible :key, :name
@ -23,6 +23,7 @@ class SshKey < ActiveRecord::Base
return false unless key
file = Tempfile.new('key_file', "#{APP_CONFIG['root_path']}/tmp")
filename = file.path
begin
file.puts key
file.rewind
@ -38,7 +39,7 @@ class SshKey < ActiveRecord::Base
self.fingerprint = fingerprint_output.split.try :[], 1
if name.blank?
s = fingerprint_output.split.try :[], 2
if File.exist? s # no identificator
if filename == s # no identificator
start = key =~ /ssh-.{3} /
self.name = key[start..start+26] # taken first 26 characters
else