Skip to content

Commit

Permalink
Apply review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcsc
tcsc committed May 28, 2021
1 parent fb16ce2 commit 2afce36
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 116 deletions.
144 changes: 68 additions & 76 deletions integration/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,13 @@ func TestIntegrations(t *testing.T) {

t.Run("AuditOff", suite.bind(testAuditOff))
t.Run("AuditOn", suite.bind(testAuditOn))
t.Run("BPFExec", suite.bind(testBPFExec))
t.Run("BPFInteractive", suite.bind(testBPFInteractive))
t.Run("BPFSessionDifferentiation", suite.bind(testBPFSessionDifferentiation))
t.Run("CmdLabels", suite.bind(testCmdLabels))
t.Run("ControlMaster", suite.bind(testControlMaster))
t.Run("CustomReverseTunnel", suite.bind(testCustomReverseTunnel))
t.Run("DataTransfer", suite.bind(testDataTransfer))
t.Run("Disconnection", suite.bind(testDisconnectScenarios))
t.Run("Discovery", suite.bind(testDiscovery))
t.Run("DiscoveryNode", suite.bind(testDiscoveryNode))
Expand All @@ -185,9 +188,11 @@ func TestIntegrations(t *testing.T) {
t.Run("InvalidLogin", suite.bind(testInvalidLogins))
t.Run("JumpTrustedClusters", suite.bind(testJumpTrustedClusters))
t.Run("JumpTrustedClustersWithLabels", suite.bind(testJumpTrustedClustersWithLabels))
t.Run("List", suite.bind(testList))
t.Run("MapRoles", suite.bind(testMapRoles))
t.Run("MultiplexingTrustedClusters", suite.bind(testMultiplexingTrustedClusters))
t.Run("PAM", suite.bind(testPAM))
t.Run("PortForwarding", suite.bind(testPortForwarding))
t.Run("ProxyHostKeyCheck", suite.bind(testProxyHostKeyCheck))
t.Run("RotateChangeSigningAlg", suite.bind(testRotateChangeSigningAlg))
t.Run("RotateRollback", suite.bind(testRotateRollback))
Expand All @@ -201,11 +206,6 @@ func TestIntegrations(t *testing.T) {
t.Run("TwoClustersTunnel", suite.bind(testTwoClustersTunnel))
t.Run("UUIDBasedProxy", suite.bind(testUUIDBasedProxy))
t.Run("WindowChange", suite.bind(testWindowChange))
t.Run("DataTransfer", suite.bind(testDataTransfer))
t.Run("BPFInteractive", suite.bind(testBPFInteractive))
t.Run("BPFExec", suite.bind(testBPFExec))
t.Run("List", suite.bind(testList))

}

// testAuditOn creates a live session, records a bunch of data through it
Expand Down Expand Up @@ -346,23 +346,11 @@ func testAuditOn(t *testing.T, suite *integrationTestSuite) {

// wait until we've found the session in the audit log
getSession := func(site auth.ClientI) (*session.Session, error) {
tickCh := time.Tick(500 * time.Millisecond)
stopCh := time.After(10 * time.Second)
for {
select {
case <-tickCh:
sessions, err = site.GetSessions(defaults.Namespace)
if err != nil {
return nil, trace.Wrap(err)
}
if len(sessions) != 1 {
continue
}
return &sessions[0], nil
case <-stopCh:
return nil, trace.BadParameter("unable to find sessions after 10s (mode=%v)", tt.inRecordLocation)
}
sessions, err := waitForSessionToBeEstablished(defaults.Namespace, site, 10*time.Second)
if err != nil {
return nil, trace.Wrap(err)
}
return &sessions[0], nil
}
session, err := getSession(site)
require.NoError(t, err)
Expand Down Expand Up @@ -886,8 +874,6 @@ func testCustomReverseTunnel(t *testing.T, suite *integrationTestSuite) {

// verifySessionJoin covers SSH into shell and joining the same session from another client
func verifySessionJoin(t *testing.T, username string, teleport *TeleInstance) {
sessionEndC := make(chan interface{})

// get a reference to site obj:
site := teleport.GetSiteAPI(Site)
require.NotNil(t, site)
Expand All @@ -896,48 +882,64 @@ func verifySessionJoin(t *testing.T, username string, teleport *TeleInstance) {
personB := NewTerminal(250)

// PersonA: SSH into the server, wait one second, then type some commands on stdin:
sessionA := make(chan error)
openSession := func() {
cl, err := teleport.NewClient(ClientConfig{Login: username, Cluster: Site, Host: Host})
require.NoError(t, err)
if err != nil {
sessionA <- trace.Wrap(err)
return
}
cl.Stdout = personA
cl.Stdin = personA
// Person A types something into the terminal (including "exit")
personA.Type("\aecho hi\n\r\aexit\n\r\a")
err = cl.SSH(context.TODO(), []string{}, false)
require.NoError(t, err)
sessionEndC <- true

sessionA <- cl.SSH(context.TODO(), []string{}, false)
}

// PersonB: wait for a session to become available, then join:
sessionB := make(chan error)
joinSession := func() {
var sessionID string
for {
time.Sleep(time.Millisecond)
sessions, _ := site.GetSessions(defaults.Namespace)
if len(sessions) == 0 {
continue
}
sessionID = string(sessions[0].ID)
break
sessions, err := waitForSessionToBeEstablished(defaults.Namespace, site, 10*time.Second)
if err != nil {
sessionB <- trace.Wrap(err)
return
}
sessionID := string(sessions[0].ID)
cl, err := teleport.NewClient(ClientConfig{Login: username, Cluster: Site, Host: Host})
require.NoError(t, err)
cl.Stdout = personB
for i := 0; i < 10; i++ {
err = cl.Join(context.TODO(), defaults.Namespace, session.ID(sessionID), personB)
if err == nil {
break
if err != nil {
sessionB <- trace.Wrap(err)
return
}

timeoutCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()

ticker := time.NewTicker(100 * time.Millisecond)
defer ticker.Stop()
for {
select {
case <-timeoutCtx.Done():
sessionB <- timeoutCtx.Err()
return

case <-ticker.C:
err := cl.Join(context.TODO(), defaults.Namespace, session.ID(sessionID), personB)
if err == nil {
sessionB <- nil
return
}
}
}
require.NoError(t, err)
}

go openSession()
go joinSession()

// wait for the session to end
err := waitFor(sessionEndC, time.Second*10)
// wait for the sessions to end
err := waitForError(sessionA, time.Second*10)
require.NoError(t, err)

err = waitForError(sessionB, time.Second*10)
require.NoError(t, err)

// make sure the output of B is mirrored in A
Expand Down Expand Up @@ -1124,18 +1126,10 @@ func testDisconnectScenarios(t *testing.T, suite *integrationTestSuite) {
require.NoError(t, err)
require.Len(t, sems, 1)

var ss []session.Session
for i := 0; i < 6; i++ {
ss, err = site.GetSessions(defaults.Namespace)
if err == nil && len(ss) > 0 {
break
}
select {
case <-time.After(time.Millisecond * 100):
case <-ctx.Done():
return
}
}
timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Second)
defer cancel()

ss, err := waitForSessionToBeEstablishedWithContext(timeoutCtx, defaults.Namespace, site)
require.NoError(t, err)
require.Len(t, ss, 1)
require.Nil(t, teleport.StopAuth(false))
Expand Down Expand Up @@ -3186,14 +3180,8 @@ func testAuditOff(t *testing.T, suite *integrationTestSuite) {
}()

// wait until there's a session in there:
for i := 0; len(sessions) == 0; i++ {
time.Sleep(time.Millisecond * 20)
sessions, _ = site.GetSessions(defaults.Namespace)
if i > 100 {
t.Fatalf("Waited %v, but no sessions found", 100*20*time.Millisecond)
return
}
}
sessions, err = waitForSessionToBeEstablished(defaults.Namespace, site, 2*time.Second)
require.NoError(t, err)
session := &sessions[0]

// wait for the user to join this session
Expand Down Expand Up @@ -4169,16 +4157,9 @@ func testWindowChange(t *testing.T, suite *integrationTestSuite) {
// joinSession will join the existing session on a server.
joinSession := func() {
// Find the existing session in the backend.
var sessionID string
for {
time.Sleep(time.Millisecond)
sessions, _ := site.GetSessions(defaults.Namespace)
if len(sessions) == 0 {
continue
}
sessionID = string(sessions[0].ID)
break
}
sessions, err := waitForSessionToBeEstablished(defaults.Namespace, site, 10*time.Second)
require.NoError(t, err)
sessionID := string(sessions[0].ID)

cl, err := teleport.NewClient(ClientConfig{
Login: suite.me.Username,
Expand Down Expand Up @@ -5096,6 +5077,17 @@ func waitFor(c chan interface{}, timeout time.Duration) error {
}
}

// waitForError helper waits on an error channel for up to the given timeout
func waitForError(c chan error, timeout time.Duration) error {
tick := time.Tick(timeout)
select {
case err := <-c:
return err
case <-tick:
return fmt.Errorf("timeout waiting for event")
}
}

// hasPAMPolicy checks if the three policy files needed for tests exists. If
// they do it returns true, otherwise returns false.
func hasPAMPolicy() bool {
Expand Down
Loading

0 comments on commit 2afce36

Please sign in to comment.