Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-08 16:42:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix account table dead lock caused by ApiAuthenticationFilter (#2395)

Browse Source
This commit is contained in:
SIkebe
2019-11-30 21:42:16 +09:00
committed by Naoki Takezoe
parent 08389cb1a0
commit c241c08904
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala
View File

@@ -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)
}
}
}