Handle invalid ssh exception

randx
1 parent c48c0f95
Showing 3 changed files with 14 additions and 2 deletions Show diff stats
app/controllers/application_controller.rb
app/views/errors/invalid_ssh_key.html.haml
lib/gitlab/backend/gitolite.rb
@@ -14,6 +14,10 @@ class ApplicationController &lt; ActionController::Base
     render "errors/gitolite", layout: "error"
   end
+  rescue_from Gitlab::Gitolite::InvalidKey do |exception|
+    render "errors/invalid_ssh_key", layout: "error"
+  end
+
   rescue_from Encoding::CompatibilityError do |exception|
     render "errors/encoding", layout: "error", status: 404
   end
@@ -0,0 +1,3 @@
+%h1 Git Error
+%hr
+%p Seems like SSH Key you provided is not a valid SSH key.
@@ -6,6 +6,7 @@ require &#39;fileutils&#39;
 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
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+%h1 Git Error
	2	+%hr
	3	+%p Seems like SSH Key you provided is not a valid SSH key.