ssh: disable wantReply in some requests to comply with OpenSSH

The existing implementation does not comply with OpenSSH, where some requests is sent without wantReply flag. [email protected]: https://github.com/openssh/openssh-portable/blob/V_8_0_P1/ssh.c#L1815 (wantconfirm=0) env: https://github.com/openssh/openssh-portable/blob/V_8_0_P1/clientloop.c#L2299 cancel-tcpip-forward: https://github.com/openssh/openssh-portable/blob/V_8_0_P1/channels.c#L565 [email protected]: https://github.com/openssh/openssh-portable/blob/V_8_0_P1/channels.c#L4017
golang · Sep 3, 2019 · f54c30f · f54c30f
1 parent 9756ffd
commit f54c30f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/ssh/agent/forward.go b/ssh/agent/forward.go
@@ -17,14 +17,8 @@ import (
 // ForwardToAgent or ForwardToRemote should be called to route
 // the authentication requests.
 func RequestAgentForwarding(session *ssh.Session) error {
-	ok, err := session.SendRequest("[email protected]", true, nil)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return errors.New("forwarding request denied")
-	}
-	return nil
+	_, err := session.SendRequest("[email protected]", false, nil)
+	return err
 }
 
 // ForwardToAgent routes authentication requests to the given keyring.

diff --git a/ssh/session.go b/ssh/session.go
@@ -169,10 +169,7 @@ func (s *Session) Setenv(name, value string) error {
 		Name:  name,
 		Value: value,
 	}
-	ok, err := s.ch.SendRequest("env", true, Marshal(&msg))
-	if err == nil && !ok {
-		err = errors.New("ssh: setenv failed")
-	}
+	_, err := s.ch.SendRequest("env", false, Marshal(&msg))
 	return err
 }
 

diff --git a/ssh/streamlocal.go b/ssh/streamlocal.go
@@ -100,10 +100,7 @@ func (l *unixListener) Close() error {
 	m := streamLocalChannelForwardMsg{
 		l.socketPath,
 	}
-	ok, _, err := l.conn.SendRequest("[email protected]", true, Marshal(&m))
-	if err == nil && !ok {
-		err = errors.New("ssh: [email protected] failed")
-	}
+	_, _, err := l.conn.SendRequest("[email protected]", false, Marshal(&m))
 	return err
 }
 

diff --git a/ssh/tcpip.go b/ssh/tcpip.go
@@ -320,10 +320,7 @@ func (l *tcpListener) Close() error {
 
 	// this also closes the listener.
 	l.conn.forwards.remove(l.laddr)
-	ok, _, err := l.conn.SendRequest("cancel-tcpip-forward", true, Marshal(&m))
-	if err == nil && !ok {
-		err = errors.New("ssh: cancel-tcpip-forward failed")
-	}
+	_, _, err := l.conn.SendRequest("cancel-tcpip-forward", false, Marshal(&m))
 	return err
 }