From 7b23bbf9ba2a97c1c5b5b5e0ded8df3e5594eaa6 Mon Sep 17 00:00:00 2001
From: Herr Ritschwumm <ritschwumm@djini.de>
Date: Thu, 5 May 2016 22:42:22 +0200
Subject: [PATCH] move filtering into the database

---
 src/main/scala/gitbucket/core/service/SshKeyService.scala    | 2 +-
 .../scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala    | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/gitbucket/core/service/SshKeyService.scala b/src/main/scala/gitbucket/core/service/SshKeyService.scala
index fb317e9c1..5feb1192f 100644
--- a/src/main/scala/gitbucket/core/service/SshKeyService.scala
+++ b/src/main/scala/gitbucket/core/service/SshKeyService.scala
@@ -13,7 +13,7 @@ trait SshKeyService {
     SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list
 
   def getAllKeys()(implicit s: Session): List[SshKey] =
-  	SshKeys.list
+    SshKeys.filter(_.publicKey.trim =!= "").list
 
   def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
     SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete
diff --git a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
index 507a8ee7a..7e06eea1c 100644
--- a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
+++ b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
@@ -51,10 +51,7 @@ class PublicKeyAuthenticator(genericUser:String) extends PublickeyAuthenticator
       Database()
       .withSession { implicit dbSession => getAllKeys() }
       .filter { sshKey =>
-        Option(sshKey.publicKey)
-        .filter(_.trim.nonEmpty)
-        .flatMap(SshUtil.str2PublicKey)
-        .exists(_ == key)
+        SshUtil.str2PublicKey(sshKey.publicKey).exists(_ == key)
       }
       .map(_.userName)
       .distinct