Add validation for non-existing posture checks

netbirdio · Jan 9, 2024 · e138aa2 · e138aa2
1 parent 16c4bf5
commit e138aa2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/management/server/http/api/openapi.yml b/management/server/http/api/openapi.yml
@@ -849,7 +849,7 @@ components:
         min_version:
           description: Minimum acceptable NetBird version
           type: string
-          example: "1.2.3"
+          example: "0.25.0"
       required:
         - enabled
         - min_version

diff --git a/management/server/http/posture_checks_handler.go b/management/server/http/posture_checks_handler.go
@@ -200,7 +200,7 @@ func validatePostureChecksUpdate(req api.PostureCheckUpdate) error {
 		return status.Errorf(status.InvalidArgument, "posture checks name shouldn't be empty")
 	}
 
-	if req.Checks == nil {
+	if req.Checks == nil || req.Checks.NbVersionCheck == nil {
 		return status.Errorf(status.InvalidArgument, "posture checks shouldn't be empty")
 	}
 

diff --git a/management/server/http/posture_checks_handler_test.go b/management/server/http/posture_checks_handler_test.go
@@ -195,6 +195,23 @@ func TestPostureCheckUpdate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:        "Create Posture Checks Invalid Check",
+			requestType: http.MethodPost,
+			requestPath: "/api/posture-checks",
+			requestBody: bytes.NewBuffer(
+				[]byte(`{
+                   "name": "default",
+                   "checks": {
+						"non_existing_check": {
+							"enabled": true,
+							"min_version": "1.2.0"
+                   	}
+					}
+				}`)),
+			expectedStatus: http.StatusBadRequest,
+			expectedBody:   false,
+		},
 		{
 			name:        "Create Posture Checks Invalid Name",
 			requestType: http.MethodPost,
@@ -255,6 +272,23 @@ func TestPostureCheckUpdate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:        "Update Posture Checks Invalid Check",
+			requestType: http.MethodPut,
+			requestPath: "/api/posture-checks/postureCheck",
+			requestBody: bytes.NewBuffer(
+				[]byte(`{
+                   "name": "default",
+                   "checks": {
+						"non_existing_check": {
+							"enabled": true,
+							"min_version": "1.2.0"
+                   	}
+					}
+				}`)),
+			expectedStatus: http.StatusBadRequest,
+			expectedBody:   false,
+		},
 		{
 			name:        "Update Posture Checks Invalid Name",
 			requestType: http.MethodPut,