extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-25 17:43:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid pulling in management code in client (#437)

Browse Source 
Avoid management code import for the legacy port value, hardcoding it
instead (it's literally spelled out in a comment below as well).
This commit is contained in:
szakharchenko 2022-08-24 17:30:40 +03:00 committed by GitHub
parent e8733a37af
commit e3657610bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/internal/connect.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"github.com/netbirdio/netbird/client/ssh" "github.com/netbirdio/netbird/client/ssh"
nbStatus "github.com/netbirdio/netbird/client/status" nbStatus "github.com/netbirdio/netbird/client/status"
mgmtcmd "github.com/netbirdio/netbird/management/cmd"
"strings" "strings"
"time" "time"
@ -241,6 +240,11 @@ func connectToManagement(ctx context.Context, managementAddr string, ourPrivateK
return client, loginResp, nil return client, loginResp, nil
} }
// NB: hardcoded from github.com/netbirdio/netbird/management/cmd to avoid import
// ManagementLegacyPort is the port that was used before by the Management gRPC server.
// It is used for backward compatibility now.
const ManagementLegacyPort = 33073
// UpdateOldManagementPort checks whether client can switch to the new Management port 443. // UpdateOldManagementPort checks whether client can switch to the new Management port 443.
// If it can switch, then it updates the config and returns a new one. Otherwise, it returns the provided config. // If it can switch, then it updates the config and returns a new one. Otherwise, it returns the provided config.
// The check is performed only for the NetBird's managed version. // The check is performed only for the NetBird's managed version.
@ -261,7 +265,7 @@ func UpdateOldManagementPort(ctx context.Context, config *Config, configPath str
return config, nil return config, nil
} }
if mgmTlsEnabled && config.ManagementURL.Port() == fmt.Sprintf("%d", mgmtcmd.ManagementLegacyPort) { if mgmTlsEnabled && config.ManagementURL.Port() == fmt.Sprintf("%d", ManagementLegacyPort) {
newURL, err := ParseURL("Management URL", fmt.Sprintf("%s://%s:%d", newURL, err := ParseURL("Management URL", fmt.Sprintf("%s://%s:%d",
config.ManagementURL.Scheme, config.ManagementURL.Hostname(), 443)) config.ManagementURL.Scheme, config.ManagementURL.Hostname(), 443))