Merge branch 'master' into 3354-render-textile

[arvados.git] / apps / workbench / app / views / users / _manage_ssh_keys.html.erb

diff --git a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index 1165ffa3e19b73c462e4a3638cab7758048174ab..17b64b27f9f7c7d74141bc55ea52de7ba3b080ff 100644 (file)
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -30,7 +30,13 @@
             <td style="word-break:break-all;">
               <% if key[:public_key] && key[:public_key].size > 0 %>
                 <div>
-                  <span title="<%=key[:public_key]%>"> <%= SSHKey.fingerprint key[:public_key] %> </span>
+                  <span title="<%=key[:public_key]%>"> <%=
+                    begin
+                      SSHKey.fingerprint key[:public_key]
+                    rescue
+                      "INVALID KEY: " + key[:public_key]
+                    end
+                   %> </span>
                 </div>
               <% else %>
                   <%= key[:public_key] %>