grim/hgkeeper

Add some additional logging

2019-09-17, Gary Kramlich
2f2d7fef584c
Parents d295eb8f32ff
Children 19032dd26afd
Add some additional logging
  • +28 -12
    ssh/server.go
  • --- a/ssh/server.go Tue Sep 17 21:00:45 2019 -0500
    +++ b/ssh/server.go Tue Sep 17 21:38:36 2019 -0500
    @@ -47,18 +47,28 @@
    for {
    tcpConn, err := s.listener.Accept()
    if err != nil {
    - log.Errorf("failed to accept ssh connection: %v", err)
    + log.Errorf(
    + "failed to accept ssh connection for %s: %v",
    + tcpConn.RemoteAddr(),
    + err,
    + )
    continue
    }
    sshConn, chans, reqs, err := ssh.NewServerConn(tcpConn, s.cfg)
    if err != nil {
    - log.Errorf("ssh handshake failed: %v", err)
    + log.Errorf(
    + "ssh handshake failed for %q from %s(%s) : %v",
    + sshConn.Permissions.Extensions["username"],
    + sshConn.RemoteAddr(),
    + sshConn.ClientVersion(),
    + err,
    + )
    continue
    }
    log.Infof(
    - "new ssh connection for %s from %s(%s)",
    + "new ssh connection for %q from %s(%s)",
    sshConn.Permissions.Extensions["username"],
    sshConn.RemoteAddr(),
    sshConn.ClientVersion(),
    @@ -143,16 +153,22 @@
    rawCmd,
    err,
    )
    - req.Reply(false, nil)
    - }
    - log.Infof(
    - "%s@%s command %q succeed",
    - username,
    - serverConn.RemoteAddr(),
    - rawCmd,
    - )
    - req.Reply(true, nil)
    + if req.WantReply {
    + req.Reply(false, nil)
    + }
    + } else {
    + log.Infof(
    + "%s@%s command %q succeed",
    + username,
    + serverConn.RemoteAddr(),
    + rawCmd,
    + )
    +
    + if req.WantReply {
    + req.Reply(true, nil)
    + }
    + }
    default:
    log.Debugf(