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

Merge pull request #1261 from UprootStaging/sshdUpdate

Browse Source 
Sshd update
This commit is contained in:
Naoki Takezoe
2016-08-04 15:51:03 +09:00
committed by GitHub
parent 0d900a892c dc6fdaf482
commit a4e9903e00
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@@ -33,7 +33,7 @@ libraryDependencies ++= Seq(
"org.apache.commons" % "commons-compress" % "1.11", "org.apache.commons" % "commons-compress" % "1.11",
"org.apache.commons" % "commons-email" % "1.4", "org.apache.commons" % "commons-email" % "1.4",
"org.apache.httpcomponents" % "httpclient" % "4.5.1", "org.apache.httpcomponents" % "httpclient" % "4.5.1",
"org.apache.sshd" % "apache-sshd" % "1.0.0", "org.apache.sshd" % "apache-sshd" % "1.2.0",
"org.apache.tika" % "tika-core" % "1.13", "org.apache.tika" % "tika-core" % "1.13",
"com.typesafe.slick" %% "slick" % "2.1.0", "com.typesafe.slick" %% "slick" % "2.1.0",
"com.novell.ldap" % "jldap" % "2009-10-07", "com.novell.ldap" % "jldap" % "2009-10-07",

2
src/main/scala/gitbucket/core/ssh/GitCommand.scala
View File

@@ -13,7 +13,7 @@ import ControlUtil._
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import Directory._ import Directory._
import org.eclipse.jgit.transport.{ReceivePack, UploadPack} import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
import org.apache.sshd.server.command.UnknownCommand import org.apache.sshd.server.scp.UnknownCommand
import org.eclipse.jgit.errors.RepositoryNotFoundException import org.eclipse.jgit.errors.RepositoryNotFoundException
object GitCommand { object GitCommand {

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

@@ -7,12 +7,12 @@ import gitbucket.core.service.SshKeyService
import gitbucket.core.servlet.Database import gitbucket.core.servlet.Database
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator
import org.apache.sshd.server.session.ServerSession import org.apache.sshd.server.session.ServerSession
import org.apache.sshd.common.session.Session import org.apache.sshd.common.AttributeStore
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
object PublicKeyAuthenticator { object PublicKeyAuthenticator {
// put in the ServerSession here to be read by GitCommand later // put in the ServerSession here to be read by GitCommand later
private val userNameSessionKey = new Session.AttributeKey[String] 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) serverSession.setAttribute(userNameSessionKey, userName)

2
src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala
View File

@@ -1,6 +1,6 @@
package gitbucket.core.ssh package gitbucket.core.ssh
import org.apache.sshd.server.command.UnknownCommand import org.apache.sshd.server.scp.UnknownCommand
import org.scalatest.FunSpec import org.scalatest.FunSpec
class GitCommandFactorySpec extends FunSpec { class GitCommandFactorySpec extends FunSpec {