Post rebase fixes

netbirdio · Jan 22, 2024 · 952478a · 952478a
1 parent 34ee987
commit 952478a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/management/server/posture/os_version.go b/management/server/posture/os_version.go
@@ -1,10 +1,9 @@
 package posture
 
 import (
-	"fmt"
-
 	"github.com/hashicorp/go-version"
 	nbpeer "github.com/netbirdio/netbird/management/server/peer"
+	log "github.com/sirupsen/logrus"
 )
 
 type MinVersionCheck struct {
@@ -25,7 +24,7 @@ type OSVersionCheck struct {
 
 var _ Check = (*OSVersionCheck)(nil)
 
-func (c *OSVersionCheck) Check(peer nbpeer.Peer) error {
+func (c *OSVersionCheck) Check(peer nbpeer.Peer) (bool, error) {
 	peerGoOS := peer.Meta.GoOS
 	switch peerGoOS {
 	case "android":
@@ -39,53 +38,59 @@ func (c *OSVersionCheck) Check(peer nbpeer.Peer) error {
 	case "windows":
 		return checkMinKernelVersion(peerGoOS, peer.Meta.KernelVersion, c.Windows)
 	}
-	return nil
+	return true, nil
 }
 
 func (c *OSVersionCheck) Name() string {
 	return OSVersionCheckName
 }
 
-func checkMinVersion(peerGoOS, peerVersion string, check *MinVersionCheck) error {
+func checkMinVersion(peerGoOS, peerVersion string, check *MinVersionCheck) (bool, error) {
 	if check == nil {
-		return fmt.Errorf("peer %s OS is not allowed", peerGoOS)
+		log.Debugf("peer %s OS is not allowed in the check", peerGoOS)
+		return false, nil
 	}
 
 	peerNBVersion, err := version.NewVersion(peerVersion)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	constraints, err := version.NewConstraint(">= " + check.MinVersion)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	if constraints.Check(peerNBVersion) {
-		return nil
+		return true, nil
 	}
 
-	return fmt.Errorf("peer %s OS version %s is older than minimum allowed version %s", peerGoOS, peerVersion, check.MinVersion)
+	log.Debugf("peer %s OS version %s is older than minimum allowed version %s", peerGoOS, peerVersion, check.MinVersion)
+
+	return false, nil
 }
 
-func checkMinKernelVersion(peerGoOS, peerVersion string, check *MinKernelVersionCheck) error {
+func checkMinKernelVersion(peerGoOS, peerVersion string, check *MinKernelVersionCheck) (bool, error) {
 	if check == nil {
-		return fmt.Errorf("peer %s OS is not allowed", peerGoOS)
+		log.Debugf("peer %s OS is not allowed in the check", peerGoOS)
+		return false, nil
 	}
 
 	peerNBVersion, err := version.NewVersion(peerVersion)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	constraints, err := version.NewConstraint(">= " + check.MinKernelVersion)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	if constraints.Check(peerNBVersion) {
-		return nil
+		return true, nil
 	}
 
-	return fmt.Errorf("peer %s kernel version %s is older than minimum allowed version %s", peerGoOS, peerVersion, check.MinKernelVersion)
+	log.Debugf("peer %s kernel version %s is older than minimum allowed version %s", peerGoOS, peerVersion, check.MinKernelVersion)
+
+	return false, nil
 }
diff --git a/management/server/posture/os_version_test.go b/management/server/posture/os_version_test.go
@@ -14,6 +14,7 @@ func TestOSVersionCheck_Check(t *testing.T) {
 		input   peer.Peer
 		check   OSVersionCheck
 		wantErr bool
+		isValid bool
 	}{
 		{
 			name: "Valid Peer Linux Kernel version",
@@ -29,6 +30,7 @@ func TestOSVersionCheck_Check(t *testing.T) {
 				},
 			},
 			wantErr: false,
+			isValid: true,
 		},
 		{
 			name: "Not valid Peer macOS version",
@@ -43,7 +45,8 @@ func TestOSVersionCheck_Check(t *testing.T) {
 					MinVersion: "15",
 				},
 			},
-			wantErr: true,
+			wantErr: false,
+			isValid: false,
 		},
 		{
 			name: "Valid Peer ios version allowed by any rule",
@@ -59,6 +62,7 @@ func TestOSVersionCheck_Check(t *testing.T) {
 				},
 			},
 			wantErr: false,
+			isValid: true,
 		},
 		{
 			name: "Valid Peer android version not allowed by rule",
@@ -69,7 +73,8 @@ func TestOSVersionCheck_Check(t *testing.T) {
 				},
 			},
 			check:   OSVersionCheck{},
-			wantErr: true,
+			wantErr: false,
+			isValid: false,
 		},
 		{
 			name: "Valid Peer Linux Kernel version not allowed by rule",
@@ -80,18 +85,20 @@ func TestOSVersionCheck_Check(t *testing.T) {
 				},
 			},
 			check:   OSVersionCheck{},
-			wantErr: true,
+			wantErr: false,
+			isValid: false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := tt.check.Check(tt.input)
+			isValid, err := tt.check.Check(tt.input)
 			if tt.wantErr {
 				assert.Error(t, err)
 			} else {
 				assert.NoError(t, err)
 			}
+			assert.Equal(t, tt.isValid, isValid)
 		})
 	}
 }