update sshpiper lib

tg123 · Feb 24, 2018 · 12af6b6 · 12af6b6
1 parent 29fbb83
commit 12af6b6
Show file tree

Hide file tree

Showing 9 changed files with 244 additions and 119 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/sshpiperd/sshpiperd.go b/sshpiperd/sshpiperd.go
@@ -42,7 +42,7 @@ func getAndInstall(name string, get func(n string) registry.Plugin, install func
 	return install(p)
 }
 
-func installDrivers(piper *ssh.SSHPiperConfig, config *piperdConfig, logger *log.Logger) (auditor.Provider, error) {
+func installDrivers(piper *ssh.PiperConfig, config *piperdConfig, logger *log.Logger) (auditor.Provider, error) {
 
 	// install upstreamProvider driver
 	if config.UpstreamDriver == "" {
@@ -115,7 +115,7 @@ func startPiper(config *piperdConfig, logger *log.Logger) error {
 
 	logger.Println("sshpiper is about to start")
 
-	piper := &ssh.SSHPiperConfig{}
+	piper := &ssh.PiperConfig{}
 
 	bigbro, err := installDrivers(piper, config, logger)
 

diff --git a/sshpiperd/upstream/mysql/workingdir.go b/sshpiperd/upstream/mysql/workingdir.go
@@ -39,7 +39,7 @@ func connectServer(db *sql.DB, sid int64) (net.Conn, error) {
 
 	return net.Dial("tcp", addr)
 }
-func (w *mysqlWorkingDir) connectUpstream(db *sql.DB, uid int64, defuser string) (net.Conn, *ssh.SSHPiperAuthPipe, error) {
+func (w *mysqlWorkingDir) connectUpstream(db *sql.DB, uid int64, defuser string) (net.Conn, *ssh.AuthPipe, error) {
 
 	o := crud.NewUpstream(db)
 
@@ -64,7 +64,7 @@ func (w *mysqlWorkingDir) connectUpstream(db *sql.DB, uid int64, defuser string)
 	}
 
 	logger.Printf("connecting upstream id [%v] addr [%v]@[%v] ", uid, user, c.RemoteAddr())
-	return c, &ssh.SSHPiperAuthPipe{
+	return c, &ssh.AuthPipe{
 		User: user,
 
 		PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (ssh.AuthPipeType, ssh.AuthMethod, error) {
@@ -134,7 +134,7 @@ func findByUsername(db *sql.DB, username string) (int64, error) {
 }
 
 //func (w *mysqlWorkingDir) FindUpstream(conn ssh.ConnMetadata, downkey ssh.PublicKey) (net.Conn, *ssh.SSHPiperAuthPipe, error) {
-func (w *mysqlWorkingDir) FindUpstream(conn ssh.ConnMetadata) (net.Conn, *ssh.SSHPiperAuthPipe, error) {
+func (w *mysqlWorkingDir) FindUpstream(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, error) {
 
 	db, err := w.ConnectDB()
 	defer db.Close()

diff --git a/sshpiperd/upstream/provider.go b/sshpiperd/upstream/provider.go
@@ -12,7 +12,7 @@ import (
 // the returned auth pipe is to map/convert downstream auth method to another auth for
 // connecting to upstream.
 // e.g. map downstream public key to another upstream private key
-type Handler func(conn ssh.ConnMetadata) (net.Conn, *ssh.SSHPiperAuthPipe, error)
+type Handler func(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, error)
 
 // Provider is a factory for Upstream Provider
 type Provider interface {

diff --git a/sshpiperd/upstream/workingdir/workingdir.go b/sshpiperd/upstream/workingdir/workingdir.go
@@ -122,7 +122,7 @@ func parseUpstreamFile(data string) (string, string) {
 	return line, user
 }
 
-func findUpstreamFromUserfile(conn ssh.ConnMetadata) (net.Conn, *ssh.SSHPiperAuthPipe, error) {
+func findUpstreamFromUserfile(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, error) {
 	user := conn.User()
 
 	if !checkUsername(user) {
@@ -152,7 +152,7 @@ func findUpstreamFromUserfile(conn ssh.ConnMetadata) (net.Conn, *ssh.SSHPiperAut
 		return nil, nil, err
 	}
 
-	return c, &ssh.SSHPiperAuthPipe{
+	return c, &ssh.AuthPipe{
 		User: mappedUser,
 
 		PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (ssh.AuthPipeType, ssh.AuthMethod, error) {

diff --git a/vendor/golang.org/x/crypto/ssh/client_auth_test.go b/vendor/golang.org/x/crypto/ssh/client_auth_test.go
diff --git a/vendor/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go