Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 15:15:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code formatting

Browse Source
This commit is contained in:
Naoki Takezoe
2017-03-02 18:15:39 +09:00
parent 5a1ec385a8
commit 629aaa78d6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/gitbucket/core/service/SystemSettingsService.scala
View File

@@ -175,9 +175,9 @@ object SystemSettingsService {
fromName: Option[String])
case class SshAddress(
host:String,
port:Int,
genericUser:String)
host: String,
port: Int,
genericUser: String)
case class Lfs(
serverUrl: Option[String])

8
src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala
View File

@@ -14,14 +14,14 @@ object PublicKeyAuthenticator {
// put in the ServerSession here to be read by GitCommand later
private val userNameSessionKey = new AttributeStore.AttributeKey[String]
def putUserName(serverSession:ServerSession, userName:String):Unit =
def putUserName(serverSession: ServerSession, userName: String):Unit =
serverSession.setAttribute(userNameSessionKey, userName)
def getUserName(serverSession:ServerSession):Option[String] =
def getUserName(serverSession: ServerSession):Option[String] =
Option(serverSession.getAttribute(userNameSessionKey))
}
class PublicKeyAuthenticator(genericUser:String) extends PublickeyAuthenticator with SshKeyService {
class PublicKeyAuthenticator(genericUser: String) extends PublickeyAuthenticator with SshKeyService {
private val logger = LoggerFactory.getLogger(classOf[PublicKeyAuthenticator])
override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean =
@@ -45,7 +45,7 @@ class PublicKeyAuthenticator(genericUser:String) extends PublickeyAuthenticator
authenticated
}
private def authenticateGenericUser(username: String, key: PublicKey, session: ServerSession, genericUser:String): Boolean = {
private def authenticateGenericUser(username: String, key: PublicKey, session: ServerSession, genericUser: String): Boolean = {
// find all users having the key we got from ssh
val possibleUserNames =
Database()