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

(refs #139) Add info log for debugging LDAP Auth

Browse Source
This commit is contained in:
Tomofumi Tanaka
2013-10-10 00:57:46 +09:00
parent 195364223f
commit e667b6c139
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/service/AccountService.scala
View File

@@ -9,9 +9,12 @@ import model.GroupMember
import scala.Some import scala.Some
import model.Account import model.Account
import util.LDAPUtil import util.LDAPUtil
import org.slf4j.LoggerFactory
trait AccountService { trait AccountService {
private val logger = LoggerFactory.getLogger(classOf[AccountService])
def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] = def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] =
if(settings.ldapAuthentication){ if(settings.ldapAuthentication){
ldapAuthentication(settings, userName, password) ldapAuthentication(settings, userName, password)
@@ -41,7 +44,10 @@ trait AccountService {
} }
getAccountByUserName(userName) getAccountByUserName(userName)
} }
case Left(errorMessage) => defaultAuthentication(userName, password) case Left(errorMessage) => {
logger.info(s"LDAP Authentication Failed: ${errorMessage}")
defaultAuthentication(userName, password)
}
} }
} }

2
src/main/scala/util/LDAPUtil.scala
View File

@@ -28,7 +28,7 @@ object LDAPUtil {
withConnection(conn) { conn => withConnection(conn) { conn =>
findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match { findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
case Some(userDN) => userAuthentication(ldapSettings, userDN, password) case Some(userDN) => userAuthentication(ldapSettings, userDN, password)
case None => Left("User does not exist") case None => Left("User does not exist.")
} }
} }
} }