engineering/sshpiper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug: ssh upstream key did not map user

Browse source
This commit is contained in:
tgic 2015-08-31 01:16:38 +08:00 • committed by Boshi Lian
parent 517ca52bd2
commit dd443d8116
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ssh/sshpiper.go
View file

@ -176,10 +176,9 @@ func NewSSHPiperConn(conn net.Conn, piper *SSHPiperConfig) (pipe *SSHPiperConn,
p.processAuthMsg = func(msg *userAuthRequestMsg) (*userAuthRequestMsg, error) {
msg.User = mappedUser
// only public msg need
if msg.Method != "publickey" || piper.MapPublicKey == nil {
msg.User = mappedUser
return msg, nil
}
@ -201,7 +200,7 @@ func NewSSHPiperConn(conn net.Conn, piper *SSHPiperConfig) (pipe *SSHPiperConn,
if isQuery {
// reply for query msg
msg, err = p.validAndAck(upKey, downKey)
msg, err = p.validAndAck(mappedUser, upKey, downKey)
} else {
ok, err := p.checkPublicKey(msg, downKey, sig)
@ -214,7 +213,7 @@ func NewSSHPiperConn(conn net.Conn, piper *SSHPiperConfig) (pipe *SSHPiperConn,
return noneAuthMsg(user), nil
}
msg, err = p.signAgain(msg, signer, downKey)
msg, err = p.signAgain(mappedUser, msg, signer, downKey)
}
if err != nil {
@ -232,9 +231,8 @@ func NewSSHPiperConn(conn net.Conn, piper *SSHPiperConfig) (pipe *SSHPiperConn,
return &SSHPiperConn{p}, nil
}
func (pipe *pipedConn) validAndAck(upKey, downKey PublicKey) (*userAuthRequestMsg, error) {
func (pipe *pipedConn) validAndAck(user string, upKey, downKey PublicKey) (*userAuthRequestMsg, error) {
user := pipe.downstream.User()
ok, err := validateKey(upKey, user, pipe.upstream.transport)
if ok {
@ -267,9 +265,7 @@ func (pipe *pipedConn) checkPublicKey(msg *userAuthRequestMsg, pubkey PublicKey,
return true, nil
}
func (pipe *pipedConn) signAgain(msg *userAuthRequestMsg, signer Signer, downKey PublicKey) (*userAuthRequestMsg, error) {
user := pipe.downstream.User()
func (pipe *pipedConn) signAgain(user string, msg *userAuthRequestMsg, signer Signer, downKey PublicKey) (*userAuthRequestMsg, error) {
rand := pipe.upstream.transport.config.Rand
session := pipe.upstream.transport.getSessionID()