Handle invalid ssh exception
This commit is contained in:
parent
c48c0f95b2
commit
b03ee4666b
3 changed files with 14 additions and 2 deletions
|
@ -6,6 +6,7 @@ require 'fileutils'
|
|||
module Gitlab
|
||||
class Gitolite
|
||||
class AccessDenied < StandardError; end
|
||||
class InvalidKey < StandardError; end
|
||||
|
||||
def set_key key_id, key_content, projects
|
||||
configure do |c|
|
||||
|
@ -190,8 +191,12 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
rescue Exception => ex
|
||||
Gitlab::Logger.error(ex.message)
|
||||
raise Gitolite::AccessDenied.new("gitolite timeout")
|
||||
if ex.message =~ /is not a valid SSH key string/
|
||||
raise Gitolite::InvalidKey.new("ssh key is not valid")
|
||||
else
|
||||
Gitlab::Logger.error(ex.message)
|
||||
raise Gitolite::AccessDenied.new("gitolite timeout")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue