From c241c0890444002288902e2082ae2ecbb768458e Mon Sep 17 00:00:00 2001 From: SIkebe Date: Sat, 30 Nov 2019 21:42:16 +0900 Subject: [PATCH] Fix account table dead lock caused by ApiAuthenticationFilter (#2395) --- .../gitbucket/core/servlet/ApiAuthenticationFilter.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala index 82cd80e9b..3593a202d 100644 --- a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala +++ b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala @@ -53,8 +53,9 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun } def doBasicAuth(auth: String, settings: SystemSettings, request: HttpServletRequest): Option[Account] = { - implicit val session = request.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session] val Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2) - authenticate(settings, username, password) + Database() withTransaction { implicit session => + authenticate(settings, username, password) + } } }