sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 16:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass proxy information to management on grpc connection

Browse Source
This commit is contained in:
Alisdair MacLeod
2026-01-28 10:50:35 +00:00
parent b611d4a751
commit a4c1362bff
2 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proxy/cmd/proxy/main.go
View File

@@ -70,6 +70,7 @@ func main() {
errorLog := slog.New(slog.NewTextHandler(os.Stderr, nil))
srv := proxy.Server{
Version: Version,
ErrorLog: errorLog,
ManagementAddress: mgmtAddr,
CertificateDirectory: certDir,

37
proxy/server.go
View File

@@ -21,6 +21,9 @@ import (
"github.com/cloudflare/backoff"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/keepalive"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/netbirdio/netbird/proxy/internal/accesslog"
"github.com/netbirdio/netbird/proxy/internal/acme"
@@ -44,6 +47,11 @@ type Server struct {
http *http.Server
https *http.Server
// Mostly used for debugging on management.
startTime time.Time
ID string
Version string
ErrorLog errorLog
ManagementAddress string
CertificateDirectory string
@@ -53,6 +61,16 @@ type Server struct {
}
func (s *Server) ListenAndServe(ctx context.Context, addr string) (err error) {
s.startTime = time.Now()
// If no ID is set then one can be generated.
if s.ID == "" {
s.ID = "netbird-proxy-" + s.startTime.Format("20060102150405")
}
// Fallback version option in case it is not set.
if s.Version == "" {
s.Version = "dev"
}
if s.ErrorLog == nil {
// If no ErrorLog is specified, then just discard the log output.
s.ErrorLog = slog.New(slog.DiscardHandler)
@@ -60,7 +78,14 @@ func (s *Server) ListenAndServe(ctx context.Context, addr string) (err error) {
// The very first thing to do should be to connect to the Management server.
// Without this connection, the Proxy cannot do anything.
s.mgmtConn, err = grpc.NewClient(s.ManagementAddress)
s.mgmtConn, err = grpc.NewClient(s.ManagementAddress,
grpc.WithTransportCredentials(insecure.NewCredentials()), // TODO: TLS needed here.
grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 20 * time.Second,
Timeout: 10 * time.Second,
PermitWithoutStream: true,
}),
)
if err != nil {
return fmt.Errorf("could not create management connection: %w", err)
}
@@ -118,11 +143,14 @@ func (s *Server) ListenAndServe(ctx context.Context, addr string) (err error) {
return s.https.ListenAndServeTLS("", "")
}
func (s *Server) newManagementMappingWorker(ctx context.Context, client proto.ProxyServiceClient) func() {
func (s *Server) newManagementMappingWorker(ctx context.Context, client proto.ProxyServiceClient) {
b := backoff.New(0, 0)
return func() {
for {
mappingClient, err := client.GetMappingUpdate(ctx, &proto.GetMappingUpdateRequest{})
mappingClient, err := client.GetMappingUpdate(ctx, &proto.GetMappingUpdateRequest{
ProxyId: s.ID,
Version: s.Version,
StartedAt: timestamppb.New(s.startTime),
})
if err != nil {
backoffDuration := b.Duration()
s.ErrorLog.ErrorContext(ctx, "Unable to create mapping client to management server, retrying connection after backoff.",
@@ -151,7 +179,6 @@ func (s *Server) newManagementMappingWorker(ctx context.Context, client proto.Pr
}
time.Sleep(backoffDuration)
}
}
}
func (s *Server) handleMappingStream(ctx context.Context, mappingClient proto.ProxyService_GetMappingUpdateClient) error {