grim/hgkeeper

clean up a ton of logging

2019-09-10, Gary Kramlich
ea4d0c4e0f66
Parents 803e8c53ff13
Children b4dd55fef66b
clean up a ton of logging
1 files changed, 41 insertions(+), 9 deletions(-)
  • +41 -9
    ssh/server.go
    • --- a/ssh/server.go Tue Sep 10 02:11:53 2019 -0500
    +++ b/ssh/server.go Tue Sep 10 02:22:13 2019 -0500
    @@ -57,7 +57,12 @@
    continue
    }
    - log.Infof("new ssh connection from %s(%s)", sshConn.RemoteAddr(), sshConn.ClientVersion())
    + log.Infof(
    + "new ssh connection for %s from %s(%s)",
    + sshConn.Permissions.Extensions["username"],
    + sshConn.RemoteAddr(),
    + sshConn.ClientVersion(),
    + )
    go ssh.DiscardRequests(reqs)
    @@ -67,12 +72,15 @@
    func (s *Server) publicKeyCallback(meta ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
    username, err := access.UsernameFromPubkey(key)
    - log.Infof("username: %q; err %v", username, err)
    if err != nil {
    return nil, err
    }
    - log.Infof("returning username: %q", username)
    + log.Infof(
    + "%q authenticated with %s",
    + username,
    + ssh.FingerprintSHA256(key),
    + )
    return &ssh.Permissions{
    Extensions: map[string]string{"username": username},
    @@ -101,6 +109,8 @@
    // now run through all of the requests but only handle shell requests
    go func() {
    for req := range requests {
    + username := serverConn.Permissions.Extensions["username"]
    +
    switch req.Type {
    case "exec":
    // this is garbage, but payload is a pascal string where the
    @@ -110,7 +120,12 @@
    // works fine.
    rawCmd := string(req.Payload[4:])
    - log.Infof("%s requested command %q", serverConn.RemoteAddr(), rawCmd)
    + log.Infof(
    + "%s@%s requested command %q",
    + username,
    + serverConn.RemoteAddr(),
    + rawCmd,
    + )
    cmd, err := commands.Find(rawCmd, s.reposPath)
    if err != nil {
    @@ -120,16 +135,33 @@
    continue
    }
    - username := serverConn.Permissions.Extensions["username"]
    - log.Infof("username in exec: %q", username)
    -
    if err := cmd.Run(conn, serverConn, username, req); err != nil {
    - log.Warnf("%s command %q failed: %v", serverConn.RemoteAddr(), rawCmd, err)
    + log.Warnf(
    + "%s@%s command %q failed: %v",
    + username,
    + serverConn.RemoteAddr(),
    + rawCmd,
    + err,
    + )
    req.Reply(false, nil)
    }
    + log.Infof(
    + "%s@%s command %q succeed",
    + username,
    + serverConn.RemoteAddr(),
    + rawCmd,
    + )
    + req.Reply(true, nil)
    +
    default:
    - log.Debugf("%s unsupported request: %q", serverConn.RemoteAddr(), req.Type)
    + log.Debugf(
    + "%s@%s unsupported request: %q",
    + username,
    + serverConn.RemoteAddr(),
    + req.Type,
    + )
    +
    if req.WantReply {
    req.Reply(false, nil)
    }