[CWS] Move JSON schemas to secl package (#30913)

DataDog · Nov 18, 2024 · 3387a1b · 3387a1b
1 parent 44cf7cf
commit 3387a1b
Show file tree

Hide file tree

Showing 57 changed files with 334 additions and 323 deletions.
diff --git a/pkg/security/generators/schemas/policy/main.go b/pkg/security/generators/schemas/policy/main.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:generate go run github.com/DataDog/datadog-agent/pkg/security/generators/schemas/policy -output ../../../tests/schemas/policy.schema.json
+//go:generate go run github.com/DataDog/datadog-agent/pkg/security/generators/schemas/policy -output ../../../secl/schemas/policy.schema.json
 
 // Package main holds main related files
 package main

diff --git a/pkg/security/secl/rules/policy_test.go b/pkg/security/secl/rules/policy_test.go
@@ -1028,7 +1028,7 @@ func TestPolicySchema(t *testing.T) {
 		},
 	}
 
-	fs := os.DirFS("../../../../pkg/security/tests/schemas")
+	fs := os.DirFS("../../../../pkg/security/secl/schemas")
 	schemaLoader := gojsonschema.NewReferenceLoaderFileSystem("file:///policy.schema.json", http.FS(fs))
 
 	for _, test := range tests {

diff --git a/...y/tests/schemas/activity_dump.schema.json → ...ty/secl/schemas/activity_dump.schema.json b/...y/tests/schemas/activity_dump.schema.json → ...ty/secl/schemas/activity_dump.schema.json
diff --git a/...s/schemas/activity_dump_proto.schema.json → ...l/schemas/activity_dump_proto.schema.json b/...s/schemas/activity_dump_proto.schema.json → ...l/schemas/activity_dump_proto.schema.json
diff --git a/...security/tests/schemas/agent_context.json → ...ty/secl/schemas/agent_context.schema.json b/...security/tests/schemas/agent_context.json → ...ty/secl/schemas/agent_context.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "agent_context.json",
+    "$id": "agent_context.schema.json",
     "type": "object",
     "properties": {
         "rule_id": {
@@ -32,10 +32,10 @@
             "items": {
                 "oneOf": [
                     {
-                        "$ref": "/schemas/kill.schema.json"
+                        "$ref": "kill.schema.json"
                     },
                     {
-                        "$ref": "/schemas/hash.schema.json"
+                        "$ref": "hash.schema.json"
                     }
                 ]
             }

diff --git a/pkg/security/tests/schemas/bind.schema.json → pkg/security/secl/schemas/bind.schema.json b/pkg/security/tests/schemas/bind.schema.json → pkg/security/secl/schemas/bind.schema.json
@@ -1,20 +1,20 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "bind.json",
+    "$id": "bind.schema.json",
     "type": "object",
     "allOf": [
         {
-            "$ref": "/schemas/event.json"
+            "$ref": "event.schema.json"
         },
         {
-            "$ref": "/schemas/usr.json"
+            "$ref": "usr.schema.json"
         },
         {
-            "$ref": "/schemas/process_context.json"
+            "$ref": "process_context.schema.json"
         },
         {
             "date": {
-                "$ref": "/schemas/datetime.json"
+                "$ref": "datetime.schema.json"
             }
         },
         {

diff --git a/pkg/security/tests/schemas/bpf.schema.json → pkg/security/secl/schemas/bpf.schema.json b/pkg/security/tests/schemas/bpf.schema.json → pkg/security/secl/schemas/bpf.schema.json
@@ -1,20 +1,20 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "bpf.json",
+    "$id": "bpf.schema.json",
     "type": "object",
     "allOf": [
         {
-            "$ref": "/schemas/event.json"
+            "$ref": "event.schema.json"
         },
         {
-            "$ref": "/schemas/usr.json"
+            "$ref": "usr.schema.json"
         },
         {
-            "$ref": "/schemas/process_context.json"
+            "$ref": "process_context.schema.json"
         },
         {
             "date": {
-                "$ref": "/schemas/datetime.json"
+                "$ref": "datetime.schema.json"
             }
         },
         {

diff --git a/pkg/security/tests/schemas/chmod.schema.json → pkg/security/secl/schemas/chmod.schema.json b/pkg/security/tests/schemas/chmod.schema.json → pkg/security/secl/schemas/chmod.schema.json
@@ -1,13 +1,13 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "chmod.json",
+    "$id": "chmod.schema.json",
     "type": "object",
     "anyOf": [
         {
-            "$ref": "/schemas/container_event.json"
+            "$ref": "container_event.schema.json"
         },
         {
-            "$ref": "/schemas/host_event.json"
+            "$ref": "host_event.schema.json"
         }
     ],
     "allOf": [

diff --git a/pkg/security/tests/schemas/chown.schema.json → pkg/security/secl/schemas/chown.schema.json b/pkg/security/tests/schemas/chown.schema.json → pkg/security/secl/schemas/chown.schema.json
@@ -1,13 +1,13 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "chown.json",
+    "$id": "chown.schema.json",
     "type": "object",
     "anyOf": [
         {
-            "$ref": "/schemas/container_event.json"
+            "$ref": "container_event.schema.json"
         },
         {
-            "$ref": "/schemas/host_event.json"
+            "$ref": "host_event.schema.json"
         }
     ],
     "allOf": [

diff --git a/...ecurity/tests/schemas/connect.schema.json → ...security/secl/schemas/connect.schema.json b/...ecurity/tests/schemas/connect.schema.json → ...security/secl/schemas/connect.schema.json
@@ -1,20 +1,20 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "connect.json",
+    "$id": "connect.schema.json",
     "type": "object",
     "allOf": [
         {
-            "$ref": "/schemas/event.json"
+            "$ref": "event.schema.json"
         },
         {
-            "$ref": "/schemas/usr.json"
+            "$ref": "usr.schema.json"
         },
         {
-            "$ref": "/schemas/process_context.json"
+            "$ref": "process_context.schema.json"
         },
         {
             "date": {
-                "$ref": "/schemas/datetime.json"
+                "$ref": "datetime.schema.json"
             }
         },
         {

diff --git a/pkg/security/tests/schemas/container.json → ...curity/secl/schemas/container.schema.json b/pkg/security/tests/schemas/container.json → ...curity/secl/schemas/container.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "container.json",
+    "$id": "container.schema.json",
     "type": "object",
     "properties": {
         "id": {

diff --git a/...rity/tests/schemas/container_context.json → ...ecl/schemas/container_context.schema.json b/...rity/tests/schemas/container_context.json → ...ecl/schemas/container_context.schema.json
@@ -1,10 +1,10 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "container_context.json",
+    "$id": "container_context.schema.json",
     "type": "object",
     "properties": {
         "container": {
-            "$ref": "/schemas/container.json"
+            "$ref": "container.schema.json"
         }
     },
     "required": [

diff --git a/pkg/security/secl/schemas/container_event.schema.json b/pkg/security/secl/schemas/container_event.schema.json
@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "container_event.schema.json",
+    "allOf": [
+        {
+            "$ref": "host_event.schema.json"
+        },
+        {
+            "$ref": "container_context.schema.json"
+        }
+    ]
+}
diff --git a/pkg/security/secl/schemas/container_event_no_file.schema.json b/pkg/security/secl/schemas/container_event_no_file.schema.json
@@ -0,0 +1,12 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "container_event_no_file.schema.json",
+    "allOf": [
+        {
+            "$ref": "host_event_no_file.schema.json"
+        },
+        {
+            "$ref": "container_context.schema.json"
+        }
+    ]
+}
diff --git a/pkg/security/tests/schemas/datetime.json → ...ecurity/secl/schemas/datetime.schema.json b/pkg/security/tests/schemas/datetime.json → ...ecurity/secl/schemas/datetime.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "datetime.json",
+    "$id": "datetime.schema.json",
     "allOf": [
         {
             "type": "string",

diff --git a/pkg/security/tests/schemas/dns.schema.json → pkg/security/secl/schemas/dns.schema.json b/pkg/security/tests/schemas/dns.schema.json → pkg/security/secl/schemas/dns.schema.json
@@ -1,23 +1,23 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "dns.json",
+    "$id": "dns.schema.json",
     "type": "object",
     "allOf": [
         {
-            "$ref": "/schemas/event.json"
+            "$ref": "event.schema.json"
         },
         {
-            "$ref": "/schemas/usr.json"
+            "$ref": "usr.schema.json"
         },
         {
-            "$ref": "/schemas/process_context.json"
+            "$ref": "process_context.schema.json"
         },
         {
-            "$ref": "/schemas/network.json"
+            "$ref": "network.schema.json"
         },
         {
             "date": {
-                "$ref": "/schemas/datetime.json"
+                "$ref": "datetime.schema.json"
             }
         },
         {

diff --git a/pkg/security/tests/schemas/event.json → pkg/security/secl/schemas/event.schema.json b/pkg/security/tests/schemas/event.json → pkg/security/secl/schemas/event.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "event.json",
+    "$id": "event.schema.json",
     "type": "object",
     "properties": {
         "evt": {
@@ -32,7 +32,7 @@
             "type": "object"
         },
         "date": {
-            "$ref": "/schemas/datetime.json"
+            "$ref": "datetime.schema.json"
         }
     },
     "required": [

diff --git a/pkg/security/tests/schemas/exec.schema.json → pkg/security/secl/schemas/exec.schema.json b/pkg/security/tests/schemas/exec.schema.json → pkg/security/secl/schemas/exec.schema.json
@@ -1,13 +1,13 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "exec.json",
+    "$id": "exec.schema.json",
     "type": "object",
     "anyOf": [
         {
-            "$ref": "/schemas/container_event.json"
+            "$ref": "container_event.schema.json"
         },
         {
-            "$ref": "/schemas/host_event.json"
+            "$ref": "host_event.schema.json"
         }
     ],
     "allOf": [

diff --git a/pkg/security/tests/schemas/exit.schema.json → pkg/security/secl/schemas/exit.schema.json b/pkg/security/tests/schemas/exit.schema.json → pkg/security/secl/schemas/exit.schema.json
@@ -1,13 +1,13 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "exit.json",
+    "$id": "exit.schema.json",
     "type": "object",
     "anyOf": [
         {
-            "$ref": "/schemas/container_event.json"
+            "$ref": "container_event.schema.json"
         },
         {
-            "$ref": "/schemas/host_event.json"
+            "$ref": "host_event.schema.json"
         }
     ],
     "allOf": [

diff --git a/pkg/security/tests/schemas/file.json → pkg/security/secl/schemas/file.schema.json b/pkg/security/tests/schemas/file.json → pkg/security/secl/schemas/file.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "file.json",
+    "$id": "file.schema.json",
     "type": "object",
     "properties": {
         "path": {
@@ -29,10 +29,10 @@
             "type": "string"
         },
         "modification_time": {
-            "$ref": "/schemas/datetime.json"
+            "$ref": "datetime.schema.json"
         },
         "change_time": {
-            "$ref": "/schemas/datetime.json"
+            "$ref": "datetime.schema.json"
         },
         "flags": {
             "type": "array",

diff --git a/pkg/security/tests/schemas/hash.schema.json → pkg/security/secl/schemas/hash.schema.json b/pkg/security/tests/schemas/hash.schema.json → pkg/security/secl/schemas/hash.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "kill.json",
+    "$id": "kill.schema.json",
     "type": "object",
     "properties": {
         "type": {

diff --git a/...urity/tests/schemas/heartbeat.schema.json → ...curity/secl/schemas/heartbeat.schema.json b/...urity/tests/schemas/heartbeat.schema.json → ...curity/secl/schemas/heartbeat.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "$id": "heartbeat.json",
+    "$id": "heartbeat.schema.json",
     "type": "object",
     "properties": {
         "policy": {
@@ -9,7 +9,7 @@
             }
         },
         "date": {
-            "$ref": "/schemas/datetime.json"
+            "$ref": "datetime.schema.json"
         }
     },
     "required": [

diff --git a/pkg/security/secl/schemas/host_event.schema.json b/pkg/security/secl/schemas/host_event.schema.json
@@ -0,0 +1,23 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "host_event.schema.json",
+    "allOf": [
+        {
+            "$ref": "event.schema.json"
+        },
+        {
+            "file": { "$ref": "file.schema.json" }
+        },
+        {
+            "$ref": "usr.schema.json"
+        },
+        {
+            "$ref": "process_context.schema.json"
+        },
+        {
+            "date": {
+                "$ref": "datetime.schema.json"
+            }
+        }
+    ]
+}
diff --git a/pkg/security/secl/schemas/host_event_no_file.schema.json b/pkg/security/secl/schemas/host_event_no_file.schema.json
@@ -0,0 +1,20 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "host_event_no_file.schema.json",
+    "allOf": [
+        {
+            "$ref": "event.schema.json"
+        },
+        {
+            "$ref": "usr.schema.json"
+        },
+        {
+            "$ref": "process_context.schema.json"
+        },
+        {
+            "date": {
+                "$ref": "datetime.schema.json"
+            }
+        }
+    ]
+}