Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[v10] Remove duplicate parties in kube and ssh session trackers. #13987

Merged
merged 8 commits into from
Jul 1, 2022
Merged

[v10] Remove duplicate parties in kube and ssh session trackers. #13987

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
482e27a
Remove duplicate parties in kube and ssh session trackers.
Joerger Jun 22, 2022
c172edb
Fix spacing.
Joerger Jun 22, 2022
17a1e75
Merge branch 'branch/v10' into bot/backport-13753-branch/v10
Joerger Jun 29, 2022
5d071f3
Merge branch 'branch/v10' into bot/backport-13753-branch/v10
Joerger Jun 30, 2022
822cf3d
Merge branch 'branch/v10' into bot/backport-13753-branch/v10
Joerger Jun 30, 2022
5370139
Merge branch 'branch/v10' into bot/backport-13753-branch/v10
Joerger Jun 30, 2022
60adf64
Merge branch 'branch/v10' into bot/backport-13753-branch/v10
Joerger Jul 1, 2022
af3aafb
Merge branch 'branch/v10' into bot/backport-13753-branch/v10
Joerger Jul 1, 2022
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
15 changes: 5 additions & 10 deletions lib/kube/proxy/sess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,16 +1066,11 @@ func getRolesByName(forwarder *Forwarder, roleNames []string) ([]types.Role, err
// on an interval until the session tracker is closed.
func (s *session) trackSession(p *party, policySet []*types.SessionTrackerPolicySet) error {
trackerSpec := types.SessionTrackerSpecV1{
SessionID: s.id.String(),
Kind: string(types.KubernetesSessionKind),
State: types.SessionState_SessionStatePending,
Hostname: s.podName,
ClusterName: s.ctx.teleportCluster.name,
Participants: []types.Participant{{
ID: p.ID.String(),
User: p.Ctx.User.GetName(),
LastActive: time.Now().UTC(),
}},
SessionID: s.id.String(),
Kind: string(types.KubernetesSessionKind),
State: types.SessionState_SessionStatePending,
Hostname: s.podName,
ClusterName: s.ctx.teleportCluster.name,
KubernetesCluster: s.ctx.kubeCluster,
HostUser: p.Ctx.User.GetName(),
HostPolicies: policySet,
Expand Down
4 changes: 0 additions & 4 deletions lib/srv/sess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,10 +1075,6 @@ func (s *session) startInteractive(ch ssh.Channel, ctx *ServerContext, tempUser
}()
}

if err := s.addParty(p, types.SessionPeerMode); err != nil {
return trace.Wrap(err)
}

ctx.Debug("Waiting for continue signal")

if tempUser != nil {
Expand Down