propagate client-side DisableComponentNetworkMap flag

Signed-off-by: Dmitri Dolguikh <dmitri.external@netbird.io>

client/internal/auth/auth.go

@@ -351,6 +351,7 @@ func (a *Auth) setSystemInfoFlags(info *system.Info) {
 		a.config.BlockLANAccess,
 		a.config.BlockInbound,
 		a.config.DisableIPv6,
+		a.config.DisableComponentNetworkMap,
 		a.config.EnableSSHRoot,
 		a.config.EnableSSHSFTP,
 		a.config.EnableSSHLocalPortForwarding,

client/internal/connect.go

@@ -611,13 +611,14 @@ func createEngineConfig(key wgtypes.Key, config *profilemanager.Config, peerConf
 		DisableSSHAuth:                config.DisableSSHAuth,
 		DNSRouteInterval:              config.DNSRouteInterval,
 
-		DisableClientRoutes: config.DisableClientRoutes,
+		DisableClientRoutes:        config.DisableClientRoutes,
-		DisableServerRoutes: config.DisableServerRoutes || config.BlockInbound,
+		DisableServerRoutes:        config.DisableServerRoutes || config.BlockInbound,
-		DisableDNS:          config.DisableDNS,
+		DisableDNS:                 config.DisableDNS,
-		DisableFirewall:     config.DisableFirewall,
+		DisableFirewall:            config.DisableFirewall,
-		BlockLANAccess:      config.BlockLANAccess,
+		BlockLANAccess:             config.BlockLANAccess,
-		BlockInbound:        config.BlockInbound,
+		BlockInbound:               config.BlockInbound,
-		DisableIPv6:         config.DisableIPv6,
+		DisableIPv6:                config.DisableIPv6,
+		DisableComponentNetworkMap: config.DisableComponentNetworkMap,
 
 		LazyConnection: lazyconn.ParseState(config.LazyConnection),
 
@@ -693,6 +694,7 @@ func loginToManagement(ctx context.Context, client mgm.Client, pubSSHKey []byte,
 		config.BlockLANAccess,
 		config.BlockInbound,
 		config.DisableIPv6,
+		config.DisableComponentNetworkMap,
 		config.EnableSSHRoot,
 		config.EnableSSHSFTP,
 		config.EnableSSHLocalPortForwarding,

client/internal/engine.go

@@ -142,13 +142,14 @@ type EngineConfig struct {
 
 	DNSRouteInterval time.Duration
 
-	DisableClientRoutes bool
+	DisableClientRoutes        bool
-	DisableServerRoutes bool
+	DisableServerRoutes        bool
-	DisableDNS          bool
+	DisableDNS                 bool
-	DisableFirewall     bool
+	DisableFirewall            bool
-	BlockLANAccess      bool
+	BlockLANAccess             bool
-	BlockInbound        bool
+	BlockInbound               bool
-	DisableIPv6         bool
+	DisableIPv6                bool
+	DisableComponentNetworkMap bool
 
 	// LazyConnection is the MDM-sourced lazy-connection override; StateUnset defers to
 	// the env var and management feature flag.
@@ -1228,6 +1229,7 @@ func (e *Engine) applyInfoFlags(info *system.Info) {
 		e.config.BlockLANAccess,
 		e.config.BlockInbound,
 		e.config.DisableIPv6,
+		e.config.DisableComponentNetworkMap,
 		e.config.EnableSSHRoot,
 		e.config.EnableSSHSFTP,
 		e.config.EnableSSHLocalPortForwarding,
@@ -2096,6 +2098,7 @@ func (e *Engine) readInitialSettings() ([]*route.Route, *nbdns.Config, bool, err
 		e.config.BlockLANAccess,
 		e.config.BlockInbound,
 		e.config.DisableIPv6,
+		e.config.DisableComponentNetworkMap,
 		e.config.EnableSSHRoot,
 		e.config.EnableSSHSFTP,
 		e.config.EnableSSHLocalPortForwarding,

client/internal/profilemanager/config.go

@@ -130,13 +130,14 @@ type Config struct {
 	DisableSSHAuth                *bool
 	SSHJWTCacheTTL                *int
 
-	DisableClientRoutes bool
+	DisableClientRoutes        bool
-	DisableServerRoutes bool
+	DisableServerRoutes        bool
-	DisableDNS          bool
+	DisableDNS                 bool
-	DisableFirewall     bool
+	DisableFirewall            bool
-	BlockLANAccess      bool
+	BlockLANAccess             bool
-	BlockInbound        bool
+	BlockInbound               bool
-	DisableIPv6         bool
+	DisableIPv6                bool
+	DisableComponentNetworkMap bool
 
 	DisableNotifications *bool
 

client/system/info.go

@@ -66,13 +66,14 @@ type Info struct {
 	RosenpassPermissive bool
 	ServerSSHAllowed    bool
 
-	DisableClientRoutes bool
+	DisableClientRoutes        bool
-	DisableServerRoutes bool
+	DisableServerRoutes        bool
-	DisableDNS          bool
+	DisableDNS                 bool
-	DisableFirewall     bool
+	DisableFirewall            bool
-	BlockLANAccess      bool
+	BlockLANAccess             bool
-	BlockInbound        bool
+	BlockInbound               bool
-	DisableIPv6         bool
+	DisableIPv6                bool
+	DisableComponentNetworkMap bool
 
 	EnableSSHRoot                 bool
 	EnableSSHSFTP                 bool
@@ -85,7 +86,7 @@ func (i *Info) SetFlags(
 	rosenpassEnabled, rosenpassPermissive bool,
 	serverSSHAllowed *bool,
 	disableClientRoutes, disableServerRoutes,
-	disableDNS, disableFirewall, blockLANAccess, blockInbound, disableIPv6 bool,
+	disableDNS, disableFirewall, blockLANAccess, blockInbound, disableIPv6, disableComponentNetworkMap bool,
 	enableSSHRoot, enableSSHSFTP, enableSSHLocalPortForwarding, enableSSHRemotePortForwarding *bool,
 	disableSSHAuth *bool,
 ) {
@@ -102,6 +103,7 @@ func (i *Info) SetFlags(
 	i.BlockLANAccess = blockLANAccess
 	i.BlockInbound = blockInbound
 	i.DisableIPv6 = disableIPv6
+	i.DisableComponentNetworkMap = disableComponentNetworkMap
 
 	if enableSSHRoot != nil {
 		i.EnableSSHRoot = *enableSSHRoot

shared/management/client/grpc.go

@@ -1033,10 +1033,12 @@ func infoToMetaData(info *system.Info) *proto.PeerSystemMeta {
 func peerCapabilities(info system.Info) []proto.PeerCapability {
 	caps := []proto.PeerCapability{
 		proto.PeerCapability_PeerCapabilitySourcePrefixes,
-		// PeerCapabilityComponentNetworkMap signals that this client can
+	}
-		// decode the components-format SyncResponse.NetworkMapEnvelope and
+	// PeerCapabilityComponentNetworkMap signals that this client can
-		// run Calculate() locally.
+	// decode the components-format SyncResponse.NetworkMapEnvelope and
-		proto.PeerCapability_PeerCapabilityComponentNetworkMap,
+	// run Calculate() locally.
+	if !info.DisableComponentNetworkMap {
+		caps = append(caps, proto.PeerCapability_PeerCapabilityComponentNetworkMap)
 	}
 	if !info.DisableIPv6 {
 		caps = append(caps, proto.PeerCapability_PeerCapabilityIPv6Overlay)