Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Backport: add missing audit log fields for k8s sessions #4075

Merged
merged 1 commit into from
Jul 23, 2020
Merged

Backport: add missing audit log fields for k8s sessions #4075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions lib/kube/proxy/forwarder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,15 +505,18 @@ func (f *Forwarder) exec(ctx *authContext, w http.ResponseWriter, req *http.Requ
H: 100,
}
if err := recorder.GetAuditLog().EmitAuditEvent(events.SessionStart, events.EventFields{
events.EventProtocol: events.EventProtocolKube,
events.EventNamespace: f.Namespace,
events.SessionEventID: string(sessionID),
events.SessionServerID: f.ServerID,
events.EventLogin: ctx.User.GetName(),
events.EventUser: ctx.User.GetName(),
events.LocalAddr: sess.cluster.targetAddr,
events.RemoteAddr: req.RemoteAddr,
events.TerminalSize: termParams.Serialize(),
events.EventProtocol: events.EventProtocolKube,
events.EventNamespace: f.Namespace,
events.SessionEventID: string(sessionID),
events.SessionServerID: f.ServerID,
events.SessionServerHostname: sess.cluster.GetName(),
events.SessionServerAddr: sess.cluster.targetAddr,
events.SessionInteractive: true,
events.EventLogin: ctx.User.GetName(),
events.EventUser: ctx.User.GetName(),
events.LocalAddr: sess.cluster.targetAddr,
events.RemoteAddr: req.RemoteAddr,
events.TerminalSize: termParams.Serialize(),
}); err != nil {
f.Warnf("Failed to emit session start event: %v", err)
}
Expand Down Expand Up @@ -552,10 +555,18 @@ func (f *Forwarder) exec(ctx *authContext, w http.ResponseWriter, req *http.Requ
if request.tty {
// send an event indicating that this session has ended
if err := recorder.GetAuditLog().EmitAuditEvent(events.SessionEnd, events.EventFields{
events.EventProtocol: events.EventProtocolKube,
events.SessionEventID: sessionID,
events.EventUser: ctx.User.GetName(),
events.EventNamespace: f.Namespace,
events.EventProtocol: events.EventProtocolKube,
events.SessionEventID: sessionID,
events.SessionServerID: f.ServerID,
events.SessionServerHostname: sess.cluster.GetName(),
events.SessionServerAddr: sess.cluster.targetAddr,
events.SessionInteractive: true,
events.SessionStartTime: sess.startTime,
events.SessionEndTime: time.Now().UTC(),
// There can only be 1 participant, k8s sessions are not join-able.
events.SessionParticipants: []string{ctx.User.GetName()},
events.EventUser: ctx.User.GetName(),
events.EventNamespace: f.Namespace,
}); err != nil {
f.Warnf("Failed to emit session end event: %v", err)
}
Expand Down Expand Up @@ -827,6 +838,7 @@ type clusterSession struct {
parent *Forwarder
tlsConfig *tls.Config
forwarder *forward.Forwarder
startTime time.Time
}

func (s *clusterSession) monitorConn(conn net.Conn, err error) (net.Conn, error) {
Expand Down Expand Up @@ -982,6 +994,7 @@ func (f *Forwarder) newClusterSession(ctx authContext) (*clusterSession, error)
parent: f,
authContext: ctx,
tlsConfig: tlsConfig,
startTime: time.Now().UTC(),
}

var transport http.RoundTripper = f.newTransport(sess.Dial, tlsConfig)
Expand Down