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

Merge pull request #2182 from uli-heller/sshd-210

Browse Source 
Sshd 210
This commit is contained in:
Naoki Takezoe
2018-11-06 01:07:16 +09:00
committed by GitHub
parent 7f8e36eb66 03e32f970e
commit 20140fffe9
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@@ -43,7 +43,7 @@ libraryDependencies ++= Seq(
"org.apache.commons" % "commons-compress" % "1.18", "org.apache.commons" % "commons-compress" % "1.18",
"org.apache.commons" % "commons-email" % "1.5", "org.apache.commons" % "commons-email" % "1.5",
"org.apache.httpcomponents" % "httpclient" % "4.5.6", "org.apache.httpcomponents" % "httpclient" % "4.5.6",
"org.apache.sshd" % "apache-sshd" % "1.7.0" exclude ("org.slf4j", "slf4j-jdk14"), "org.apache.sshd" % "apache-sshd" % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
"org.apache.tika" % "tika-core" % "1.19.1", "org.apache.tika" % "tika-core" % "1.19.1",
"com.github.takezoe" %% "blocking-slick-32" % "0.0.11", "com.github.takezoe" %% "blocking-slick-32" % "0.0.11",
"com.novell.ldap" % "jldap" % "2009-10-07", "com.novell.ldap" % "jldap" % "2009-10-07",

2
src/main/scala/gitbucket/core/plugin/Plugin.scala
View File

@@ -8,7 +8,7 @@ import gitbucket.core.service.RepositoryService.RepositoryInfo
import gitbucket.core.service.SystemSettingsService.SystemSettings import gitbucket.core.service.SystemSettingsService.SystemSettings
import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util.SyntaxSugars._
import io.github.gitbucket.solidbase.model.Version import io.github.gitbucket.solidbase.model.Version
import org.apache.sshd.server.Command import org.apache.sshd.server.command.Command
import play.twirl.api.Html import play.twirl.api.Html
/** /**

2
src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
View File

@@ -24,7 +24,7 @@ import io.github.gitbucket.solidbase.manager.JDBCVersionManager
import io.github.gitbucket.solidbase.model.Module import io.github.gitbucket.solidbase.model.Module
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
import org.apache.http.client.methods.HttpGet import org.apache.http.client.methods.HttpGet
import org.apache.sshd.server.Command import org.apache.sshd.server.command.Command
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import play.twirl.api.Html import play.twirl.api.Html

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

@@ -6,7 +6,7 @@ import gitbucket.core.service.{AccountService, DeployKeyService, RepositoryServi
import gitbucket.core.servlet.{CommitLogHook, Database} import gitbucket.core.servlet.{CommitLogHook, Database}
import gitbucket.core.util.{SyntaxSugars, Directory} import gitbucket.core.util.{SyntaxSugars, Directory}
import org.apache.sshd.server.{Environment, ExitCallback, SessionAware} import org.apache.sshd.server.{Environment, ExitCallback, SessionAware}
import org.apache.sshd.server.{Command, CommandFactory} import org.apache.sshd.server.command.{Command, CommandFactory}
import org.apache.sshd.server.session.ServerSession import org.apache.sshd.server.session.ServerSession
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.io.{File, InputStream, OutputStream} import java.io.{File, InputStream, OutputStream}
@@ -16,7 +16,7 @@ import org.eclipse.jgit.api.Git
import Directory._ import Directory._
import gitbucket.core.ssh.PublicKeyAuthenticator.AuthType import gitbucket.core.ssh.PublicKeyAuthenticator.AuthType
import org.eclipse.jgit.transport.{ReceivePack, UploadPack} import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
import org.apache.sshd.server.scp.UnknownCommand import org.apache.sshd.server.shell.UnknownCommand
import org.eclipse.jgit.errors.RepositoryNotFoundException import org.eclipse.jgit.errors.RepositoryNotFoundException
object GitCommand { object GitCommand {

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

@@ -3,7 +3,7 @@ package gitbucket.core.ssh
import gitbucket.core.service.SystemSettingsService.SshAddress import gitbucket.core.service.SystemSettingsService.SshAddress
import org.apache.sshd.common.Factory import org.apache.sshd.common.Factory
import org.apache.sshd.server.{Environment, ExitCallback} import org.apache.sshd.server.{Environment, ExitCallback}
import org.apache.sshd.server.Command import org.apache.sshd.server.command.Command
import java.io.{OutputStream, InputStream} import java.io.{OutputStream, InputStream}
import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.Constants

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.scp.UnknownCommand import org.apache.sshd.server.shell.UnknownCommand
import org.scalatest.FunSpec import org.scalatest.FunSpec
class GitCommandFactorySpec extends FunSpec { class GitCommandFactorySpec extends FunSpec {