self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 02:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Determine node registration method based on server port (#5182)

Browse source 
The logic of `auth.Register` is adapted so that it attempts the proxy mode connection first in case the first of the auth servers to register with has port `defaults.HTTPListenPort` (= 3080).
This commit is contained in:
Andrej Tokarčík 2021-01-08 18:30:37 +01:00 committed by GitHub
parent 88e77bda51
commit 7b723d3313
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
lib/auth/register.go
View file

@ -110,37 +110,47 @@ func Register(params RegisterParams) (*Identity, error) {
return nil, trace.Wrap(err)
}
// Attempt to register through the auth server, if it fails, try and
// register through the proxy server.
ident, err := registerThroughAuth(token, params)
if err != nil {
// If no params client was set this is a proxy and fail right away.
if params.GetHostCredentials == nil {
log.Debugf("Missing client, failing with error from Auth Server: %v.", err)
return nil, trace.Wrap(err)
}
log.WithField("auth-servers", params.Servers).Debugf("Registering node to the cluster.")
log.Errorf("Failed to register through auth server: %v; falling back to trying the proxy server", err)
type registerMethod struct {
call func(token string, params RegisterParams) (*Identity, error)
desc string
}
registerThroughAuth := registerMethod{registerThroughAuth, "with auth server"}
registerThroughProxy := registerMethod{registerThroughProxy, "via proxy server"}
// params.AuthServers could contain a proxy address, to deal with nodes
// behind NAT. Try registering using the proxy API.
ident, err = registerThroughProxy(token, params)
if err != nil {
return nil, trace.Wrap(err, "failed to register through proxy server: %v", err)
}
log.Debugf("Successfully registered through proxy server.")
return ident, nil
registerMethods := []registerMethod{registerThroughAuth, registerThroughProxy}
if params.GetHostCredentials == nil {
log.Debugf("Missing client, it is not possible to register through proxy.")
registerMethods = []registerMethod{registerThroughAuth}
} else if authServerIsProxy(params.Servers) {
log.Debugf("The first specified auth server appears to be a proxy.")
registerMethods = []registerMethod{registerThroughProxy, registerThroughAuth}
}
log.Debugf("Successfully registered through auth server.")
return ident, nil
var collectedErrs []error
for _, method := range registerMethods {
log.Infof("Attempting registration %s.", method.desc)
ident, err := method.call(token, params)
if err != nil {
collectedErrs = append(collectedErrs, err)
log.WithError(err).Debugf("Registration %s failed.", method.desc)
continue
}
log.Infof("Successfully registered %s.", method.desc)
return ident, nil
}
return nil, trace.NewAggregate(collectedErrs...)
}
// authServerIsProxy returns true if the first specified auth server
// to register with appears to be a proxy.
func authServerIsProxy(servers []utils.NetAddr) bool {
return len(servers) > 0 && servers[0].Port(0) == defaults.HTTPListenPort
}
// registerThroughProxy is used to register through the proxy server.
func registerThroughProxy(token string, params RegisterParams) (*Identity, error) {
log.Debugf("Attempting to register through proxy server.")
if len(params.Servers) == 0 {
return nil, trace.BadParameter("no auth servers set")
}
@ -168,8 +178,6 @@ func registerThroughProxy(token string, params RegisterParams) (*Identity, error
// registerThroughAuth is used to register through the auth server.
func registerThroughAuth(token string, params RegisterParams) (*Identity, error) {
log.Debugf("Attempting to register through auth server.")
var client *Client
var err error