mirror of https://github.com/go-gitea/gitea.git
Backport #20476 The code in modules/ssh/ssh.go:sessionHandler() currently cause an error to be logged if `gitea serv` exits with a exit(1). This logging is useless because the accompanying stderr is not provided and in any case the exit(1) is most likely due to permissions errors. Further it then causes the EOF to be logged - even though this is not helpful. This PR simply checks the errors returned and stops logging them. In the case of misconfigurations causing `gitea serv` to fail with exit(1) the current logging is not helpful at determining this and users should simply review the message passed over the ssh connection. Fix #20473 Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
parent
ae86a0bc9f
commit
6986e56791
|
@ -11,6 +11,7 @@ import (
|
||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
|
@ -142,10 +143,14 @@ func sessionHandler(session ssh.Session) {
|
||||||
// Wait for the command to exit and log any errors we get
|
// Wait for the command to exit and log any errors we get
|
||||||
err = cmd.Wait()
|
err = cmd.Wait()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("SSH: Wait: %v", err)
|
// Cannot use errors.Is here because ExitError doesn't implement Is
|
||||||
|
// Thus errors.Is will do equality test NOT type comparison
|
||||||
|
if _, ok := err.(*exec.ExitError); !ok {
|
||||||
|
log.Error("SSH: Wait: %v", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := session.Exit(getExitStatusFromError(err)); err != nil {
|
if err := session.Exit(getExitStatusFromError(err)); err != nil && !errors.Is(err, io.EOF) {
|
||||||
log.Error("Session failed to exit. %s", err)
|
log.Error("Session failed to exit. %s", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue