Send ssh and rosenpass config meta

client/system/info.go

@@ -33,21 +33,24 @@ type Environment struct {
 // Info is an object that contains machine information
 // Most of the code is taken from https://github.com/matishsiao/goInfo
 type Info struct {
-	GoOS               string
-	Kernel             string
-	Platform           string
-	OS                 string
-	OSVersion          string
-	Hostname           string
-	CPUs               int
-	WiretrusteeVersion string
-	UIVersion          string
-	KernelVersion      string
-	NetworkAddresses   []NetworkAddress
-	SystemSerialNumber string
-	SystemProductName  string
-	SystemManufacturer string
-	Environment        Environment
+	GoOS                string
+	Kernel              string
+	Platform            string
+	OS                  string
+	OSVersion           string
+	Hostname            string
+	CPUs                int
+	WiretrusteeVersion  string
+	UIVersion           string
+	KernelVersion       string
+	NetworkAddresses    []NetworkAddress
+	SystemSerialNumber  string
+	SystemProductName   string
+	SystemManufacturer  string
+	Environment         Environment
+	RosenpassEnabled    bool
+	RosenpassPermissive bool
+	ServerSSHAllowed    bool
 }
 
 // extractUserAgent extracts Netbird's agent (client) name and version from the outgoing context

client/system/info_android.go

@@ -12,11 +12,12 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
+	"github.com/netbirdio/netbird/client/internal"
 	"github.com/netbirdio/netbird/version"
 )
 
 // GetInfo retrieves and parses the system information
-func GetInfo(ctx context.Context) *Info {
+func GetInfo(ctx context.Context, config internal.Config) *Info {
 	kernel := "android"
 	osInfo := uname()
 	if len(osInfo) == 2 {
@@ -28,7 +29,21 @@ func GetInfo(ctx context.Context) *Info {
 		kernelVersion = osInfo[2]
 	}
 
-	gio := &Info{Kernel: kernel, Platform: "unknown", OS: "android", OSVersion: osVersion(), GoOS: runtime.GOOS, CPUs: runtime.NumCPU(), KernelVersion: kernelVersion}
+	gio := &Info{
+		Kernel:              kernel,
+		Platform:            "unknown",
+		OS:                  "android",
+		OSVersion:           osVersion(),
+		GoOS:                runtime.GOOS,
+		CPUs:                runtime.NumCPU(),
+		KernelVersion:       kernelVersion,
+		RosenpassEnabled:    config.RosenpassEnabled,
+		RosenpassPermissive: config.RosenpassPermissive,
+	}
+	if config.ServerSSHAllowed != nil {
+		gio.ServerSSHAllowed = true
+	}
+
 	gio.Hostname = extractDeviceName(ctx, "android")
 	gio.WiretrusteeVersion = version.NetbirdVersion()
 	gio.UIVersion = extractUserAgent(ctx)

client/system/info_darwin.go

@@ -15,13 +15,14 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
+	"github.com/netbirdio/netbird/client/internal"
 	"github.com/netbirdio/netbird/client/system/detect_cloud"
 	"github.com/netbirdio/netbird/client/system/detect_platform"
 	"github.com/netbirdio/netbird/version"
 )
 
 // GetInfo retrieves and parses the system information
-func GetInfo(ctx context.Context) *Info {
+func GetInfo(ctx context.Context, config internal.Config) *Info {
 	utsname := unix.Utsname{}
 	err := unix.Uname(&utsname)
 	if err != nil {
@@ -49,18 +50,24 @@ func GetInfo(ctx context.Context) *Info {
 	}
 
 	gio := &Info{
-		Kernel:             sysName,
-		OSVersion:          strings.TrimSpace(string(swVersion)),
-		Platform:           machine,
-		OS:                 sysName,
-		GoOS:               runtime.GOOS,
-		CPUs:               runtime.NumCPU(),
-		KernelVersion:      release,
-		NetworkAddresses:   addrs,
-		SystemSerialNumber: serialNum,
-		SystemProductName:  prodName,
-		SystemManufacturer: manufacturer,
-		Environment:        env,
+		Kernel:              sysName,
+		OSVersion:           strings.TrimSpace(string(swVersion)),
+		Platform:            machine,
+		OS:                  sysName,
+		GoOS:                runtime.GOOS,
+		CPUs:                runtime.NumCPU(),
+		KernelVersion:       release,
+		NetworkAddresses:    addrs,
+		SystemSerialNumber:  serialNum,
+		SystemProductName:   prodName,
+		SystemManufacturer:  manufacturer,
+		Environment:         env,
+		RosenpassEnabled:    config.RosenpassEnabled,
+		RosenpassPermissive: config.RosenpassPermissive,
+	}
+
+	if config.ServerSSHAllowed != nil {
+		gio.ServerSSHAllowed = *config.ServerSSHAllowed
 	}
 
 	systemHostname, _ := os.Hostname()

client/system/info_freebsd.go

@@ -10,13 +10,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/netbirdio/netbird/client/internal"
 	"github.com/netbirdio/netbird/client/system/detect_cloud"
 	"github.com/netbirdio/netbird/client/system/detect_platform"
 	"github.com/netbirdio/netbird/version"
 )
 
 // GetInfo retrieves and parses the system information
-func GetInfo(ctx context.Context) *Info {
+func GetInfo(ctx context.Context, config internal.Config) *Info {
 	out := _getInfo()
 	for strings.Contains(out, "broken pipe") {
 		out = _getInfo()
@@ -31,7 +32,21 @@ func GetInfo(ctx context.Context) *Info {
 		Platform: detect_platform.Detect(ctx),
 	}
 
-	gio := &Info{Kernel: osInfo[0], Platform: runtime.GOARCH, OS: osInfo[2], GoOS: runtime.GOOS, CPUs: runtime.NumCPU(), KernelVersion: osInfo[1], Environment: env}
+	gio := &Info{
+		Kernel:              osInfo[0],
+		Platform:            runtime.GOARCH,
+		OS:                  osInfo[2],
+		GoOS:                runtime.GOOS,
+		CPUs:                runtime.NumCPU(),
+		KernelVersion:       osInfo[1],
+		Environment:         env,
+		RosenpassEnabled:    config.RosenpassEnabled,
+		RosenpassPermissive: config.RosenpassPermissive,
+	}
+
+	if config.ServerSSHAllowed != nil {
+		gio.ServerSSHAllowed = true
+	}
 
 	systemHostname, _ := os.Hostname()
 	gio.Hostname = extractDeviceName(ctx, systemHostname)

client/system/info_ios.go

@@ -7,17 +7,31 @@ import (
 	"context"
 	"runtime"
 
+	"github.com/netbirdio/netbird/client/internal"
 	"github.com/netbirdio/netbird/version"
 )
 
 // GetInfo retrieves and parses the system information
-func GetInfo(ctx context.Context) *Info {
+func GetInfo(ctx context.Context, config internal.Config) *Info {
 
 	// Convert fixed-size byte arrays to Go strings
 	sysName := extractOsName(ctx, "sysName")
 	swVersion := extractOsVersion(ctx, "swVersion")
 
-	gio := &Info{Kernel: sysName, OSVersion: swVersion, Platform: "unknown", OS: sysName, GoOS: runtime.GOOS, CPUs: runtime.NumCPU(), KernelVersion: swVersion}
+	gio := &Info{
+		Kernel:              sysName,
+		OSVersion:           swVersion,
+		Platform:            "unknown",
+		OS:                  sysName,
+		GoOS:                runtime.GOOS,
+		CPUs:                runtime.NumCPU(),
+		KernelVersion:       swVersion,
+		RosenpassEnabled:    config.RosenpassEnabled,
+		RosenpassPermissive: config.RosenpassPermissive,
+	}
+	if config.ServerSSHAllowed != nil {
+		gio.ServerSSHAllowed = true
+	}
 	gio.Hostname = extractDeviceName(ctx, "hostname")
 	gio.WiretrusteeVersion = version.NetbirdVersion()
 	gio.UIVersion = extractUserAgent(ctx)

client/system/info_linux.go

@@ -15,13 +15,14 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/zcalusic/sysinfo"
 
+	"github.com/netbirdio/netbird/client/internal"
 	"github.com/netbirdio/netbird/client/system/detect_cloud"
 	"github.com/netbirdio/netbird/client/system/detect_platform"
 	"github.com/netbirdio/netbird/version"
 )
 
 // GetInfo retrieves and parses the system information
-func GetInfo(ctx context.Context) *Info {
+func GetInfo(ctx context.Context, config internal.Config) *Info {
 	info := _getInfo()
 	for strings.Contains(info, "broken pipe") {
 		info = _getInfo()
@@ -69,21 +70,27 @@ func GetInfo(ctx context.Context) *Info {
 	}
 
 	gio := &Info{
-		Kernel:             osInfo[0],
-		Platform:           osInfo[2],
-		OS:                 osName,
-		OSVersion:          osVer,
-		Hostname:           extractDeviceName(ctx, systemHostname),
-		GoOS:               runtime.GOOS,
-		CPUs:               runtime.NumCPU(),
-		WiretrusteeVersion: version.NetbirdVersion(),
-		UIVersion:          extractUserAgent(ctx),
-		KernelVersion:      osInfo[1],
-		NetworkAddresses:   addrs,
-		SystemSerialNumber: serialNum,
-		SystemProductName:  prodName,
-		SystemManufacturer: manufacturer,
-		Environment:        env,
+		Kernel:              osInfo[0],
+		Platform:            osInfo[2],
+		OS:                  osName,
+		OSVersion:           osVer,
+		Hostname:            extractDeviceName(ctx, systemHostname),
+		GoOS:                runtime.GOOS,
+		CPUs:                runtime.NumCPU(),
+		WiretrusteeVersion:  version.NetbirdVersion(),
+		UIVersion:           extractUserAgent(ctx),
+		KernelVersion:       osInfo[1],
+		NetworkAddresses:    addrs,
+		SystemSerialNumber:  serialNum,
+		SystemProductName:   prodName,
+		SystemManufacturer:  manufacturer,
+		Environment:         env,
+		RosenpassEnabled:    config.RosenpassEnabled,
+		RosenpassPermissive: config.RosenpassPermissive,
+	}
+
+	if config.ServerSSHAllowed != nil {
+		gio.ServerSSHAllowed = *config.ServerSSHAllowed
 	}
 
 	return gio

client/system/info_windows.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	log "github.com/sirupsen/logrus"
-	"github.com/yusufpapurcu/wmi"
 	"golang.org/x/sys/windows/registry"
 
 	"github.com/netbirdio/netbird/client/system/detect_cloud"
@@ -33,7 +32,7 @@ type Win32_BIOS struct {
 }
 
 // GetInfo retrieves and parses the system information
-func GetInfo(ctx context.Context) *Info {
+func GetInfo(ctx context.Context, config internal.Config) *Info {
 	osName, osVersion := getOSNameAndVersion()
 	buildVersion := getBuildVersion()
 
@@ -63,18 +62,24 @@ func GetInfo(ctx context.Context) *Info {
 	}
 
 	gio := &Info{
-		Kernel:             "windows",
-		OSVersion:          osVersion,
-		Platform:           "unknown",
-		OS:                 osName,
-		GoOS:               runtime.GOOS,
-		CPUs:               runtime.NumCPU(),
-		KernelVersion:      buildVersion,
-		NetworkAddresses:   addrs,
-		SystemSerialNumber: serialNum,
-		SystemProductName:  prodName,
-		SystemManufacturer: manufacturer,
-		Environment:        env,
+		Kernel:              "windows",
+		OSVersion:           osVersion,
+		Platform:            "unknown",
+		OS:                  osName,
+		GoOS:                runtime.GOOS,
+		CPUs:                runtime.NumCPU(),
+		KernelVersion:       buildVersion,
+		NetworkAddresses:    addrs,
+		SystemSerialNumber:  serialNum,
+		SystemProductName:   prodName,
+		SystemManufacturer:  manufacturer,
+		Environment:         env,
+		RosenpassEnabled:    config.RosenpassEnabled,
+		RosenpassPermissive: config.RosenpassPermissive,
+	}
+
+	if config.ServerSSHAllowed != nil {
+		gio.ServerSSHAllowed = *config.ServerSSHAllowed
 	}
 
 	systemHostname, _ := os.Hostname()