self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-21 17:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fetch certificate authorities during every login.

Browse source 
This commit fixes the problem when login
is initiated during another command, for example
'tsh ls' and misses code path that updated cert
authorities in the main module.

By moving code in the Login the change makes sure
that additional cert authorities are always fetched.
This commit is contained in:
Sasha Klizhentas 2019-01-25 18:34:21 -08:00 committed by Russell Jones
parent 551be287ba
commit 5a36b35ad1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/client/api.go
View file

@ -1603,6 +1603,12 @@ func (tc *TeleportClient) Login(ctx context.Context, activateKey bool) (*Key, er
if err != nil {
return nil, trace.Wrap(err)
}
// Connect to the Auth Server of the main cluster
// and fetch the known hosts for this cluster.
if err := tc.UpdateTrustedCA(ctx, key.ClusterName); err != nil {
return nil, trace.Wrap(err)
}
}
return key, nil
}

6
tool/tsh/tsh.go
View file

@ -438,12 +438,6 @@ func onLogin(cf *CLIConf) {
// Regular login without -i flag.
tc.SaveProfile("")
// Connect to the Auth Server and fetch the known hosts for this cluster.
err = tc.UpdateTrustedCA(cf.Context, key.ClusterName)
if err != nil {
utils.FatalError(err)
}
// Print status to show information of the logged in user. Update the
// command line flag (used to print status) for the proxy to make sure any
// advertised settings are picked up.