Include teleport username in port-forward events

gravitational · Jun 11, 2018 · f7b29e0 · f7b29e0
1 parent 242aadf
commit f7b29e0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/lib/kube/proxy/forwarder.go b/lib/kube/proxy/forwarder.go
@@ -443,6 +443,7 @@ func (f *Forwarder) portForward(ctx *authContext, w http.ResponseWriter, req *ht
 			events.PortForwardAddr:    addr,
 			events.PortForwardSuccess: success,
 			events.EventLogin:         ctx.User.GetName(),
+			events.EventUser:          ctx.User.GetName(),
 			events.LocalAddr:          sess.targetAddr,
 			events.RemoteAddr:         req.RemoteAddr,
 		})

diff --git a/lib/srv/authhandlers.go b/lib/srv/authhandlers.go
@@ -108,6 +108,7 @@ func (h *AuthHandlers) CheckPortForward(addr string, ctx *ServerContext) error {
 			events.PortForwardSuccess: false,
 			events.PortForwardErr:     systemErrorMessage,
 			events.EventLogin:         ctx.Identity.Login,
+			events.EventUser:          ctx.Identity.TeleportUser,
 			events.LocalAddr:          ctx.Conn.LocalAddr().String(),
 			events.RemoteAddr:         ctx.Conn.RemoteAddr().String(),
 		})

diff --git a/lib/srv/forward/sshserver.go b/lib/srv/forward/sshserver.go
@@ -607,6 +607,7 @@ func (s *Server) handleDirectTCPIPRequest(ch ssh.Channel, req *sshutils.DirectTC
 		events.PortForwardAddr:    dstAddr,
 		events.PortForwardSuccess: true,
 		events.EventLogin:         s.identityContext.Login,
+		events.EventUser:          s.identityContext.TeleportUser,
 		events.LocalAddr:          s.sconn.LocalAddr().String(),
 		events.RemoteAddr:         s.sconn.RemoteAddr().String(),
 	})

diff --git a/lib/srv/regular/sshserver.go b/lib/srv/regular/sshserver.go
@@ -808,6 +808,7 @@ func (s *Server) handleDirectTCPIPRequest(sconn *ssh.ServerConn, identityContext
 		events.PortForwardAddr:    dstAddr,
 		events.PortForwardSuccess: true,
 		events.EventLogin:         ctx.Identity.Login,
+		events.EventUser:          ctx.Identity.TeleportUser,
 		events.LocalAddr:          sconn.LocalAddr().String(),
 		events.RemoteAddr:         sconn.RemoteAddr().String(),
 	})