Skip to content

[v15] fix local re-register #46183

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

Merged
fspmarshall merged 1 commit into from
Sep 3, 2024
Merged

[v15] fix local re-register #46183

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion lib/auth/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ func LocalRegister(id state.IdentityID, authServer *Server, additionalPrincipals
}

// If local registration is happening and no remote address was passed in
// (which means no advertise IP was set), use localhost.
// (which means no advertise IP was set), use localhost. This behavior must
// be kept consistent with the equivalen behavior in cert rotation/re-register
// logic in lib/service.
if remoteAddr == "" {
remoteAddr = defaults.Localhost
}
Expand Down
7 changes: 6 additions & 1 deletion lib/service/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package service

import (
"cmp"
"context"
"crypto/tls"
"errors"
Expand Down Expand Up @@ -406,7 +407,11 @@ func (process *TeleportProcess) reRegister(conn *Connector, additionalPrincipals

if srv := process.getLocalAuth(); srv != nil {
clt = srv
remoteAddr = process.Config.AdvertiseIP
// auth server typically extracts remote addr from conn. since we're using the local auth
// directly we must supply a reasonable remote addr value. preferably the advertise IP, but
// otherwise localhost. this behavior must be kept consistent with the equivalent behavior
// in LocalRegister.
remoteAddr = cmp.Or(process.Config.AdvertiseIP, defaults.Localhost)
}

identity, err := auth.ReRegister(ctx, auth.ReRegisterParams{
Expand Down