Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-03 03:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1554)Enable DB session for plugin git repo authentication

Browse Source
This commit is contained in:
Naoki Takezoe
2017-04-25 13:53:50 +09:00
parent 5337b29532
commit f46f5909f1
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/scala/gitbucket/core/servlet/GitAuthenticationFilter.scala
View File

@@ -51,21 +51,21 @@ class GitAuthenticationFilter extends Filter with RepositoryService with Account
private def pluginRepository(request: HttpServletRequest, response: HttpServletResponse, chain: FilterChain,
settings: SystemSettings, isUpdating: Boolean, filter: GitRepositoryFilter): Unit = {
implicit val r = request
Database() withSession { implicit session =>
val account = for {
auth <- Option(request.getHeader("Authorization"))
Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2)
account <- authenticate(settings, username, password)
} yield {
request.setAttribute(Keys.Request.UserName, account.userName)
account
}
val account = for {
auth <- Option(request.getHeader("Authorization"))
Array(username, password) = AuthUtil.decodeAuthHeader(auth).split(":", 2)
account <- authenticate(settings, username, password)
} yield {
request.setAttribute(Keys.Request.UserName, account.userName)
account
}
if(filter.filter(request.gitRepositoryPath, account.map(_.userName), settings, isUpdating)){
chain.doFilter(request, response)
} else {
AuthUtil.requireAuth(response)
if (filter.filter(request.gitRepositoryPath, account.map(_.userName), settings, isUpdating)) {
chain.doFilter(request, response)
} else {
AuthUtil.requireAuth(response)
}
}
}