feat(crd): support execname in Process spec

Signed-off-by: daemon1024 <[email protected]>
kubearmor · Mar 6, 2024 · 84c907f · 84c907f
1 parent 4248f8b
commit 84c907f
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/KubeArmor/types/types.go b/KubeArmor/types/types.go
@@ -333,7 +333,8 @@ type MatchSourceType struct {
 
 // ProcessPathType Structure
 type ProcessPathType struct {
-	Path       string            `json:"path"`
+	Path       string            `json:"path,omitempty"`
+	ExecName   string            `json:"execname,omitempty"`
 	OwnerOnly  bool              `json:"ownerOnly,omitempty"`
 	FromSource []MatchSourceType `json:"fromSource,omitempty"`
 

diff --git a/deployments/CRD/KubeArmorHostPolicy.yaml b/deployments/CRD/KubeArmorHostPolicy.yaml
@@ -345,6 +345,9 @@ spec:
                           - Audit
                           - Block
                           type: string
+                        execname:
+                          pattern: ^[^\/]+$
+                          type: string
                         fromSource:
                           items:
                             properties:
@@ -368,8 +371,6 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - path
                       type: object
                     type: array
                   matchPatterns:

diff --git a/deployments/CRD/KubeArmorPolicy.yaml b/deployments/CRD/KubeArmorPolicy.yaml
@@ -335,6 +335,9 @@ spec:
                           - Audit
                           - Block
                           type: string
+                        execname:
+                          pattern: ^[^\/]+$
+                          type: string
                         fromSource:
                           items:
                             properties:
@@ -358,8 +361,6 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - path
                       type: object
                     type: array
                   matchPatterns:

diff --git a/pkg/KubeArmorController/api/security.kubearmor.com/v1/common.go b/pkg/KubeArmorController/api/security.kubearmor.com/v1/common.go
@@ -11,6 +11,9 @@ type NodeSelectorType struct {
 	MatchLabels map[string]string `json:"matchLabels,omitempty"`
 }
 
+// +kubebuilder:validation:Pattern=^[^\/]+$
+type MatchBinType string
+
 // +kubebuilder:validation:Pattern=^\/+.*[^\/]$
 type MatchPathType string
 
@@ -25,7 +28,11 @@ type MatchSourceType struct {
 }
 
 type ProcessPathType struct {
-	Path MatchPathType `json:"path"`
+	// +kubebuilder:validation:Optional
+	Path MatchPathType `json:"path,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	ExecName MatchBinType `json:"execname,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	OwnerOnly bool `json:"ownerOnly,omitempty"`

diff --git a/pkg/KubeArmorController/config/crd/bases/security.kubearmor.com_kubearmorhostpolicies.yaml b/pkg/KubeArmorController/config/crd/bases/security.kubearmor.com_kubearmorhostpolicies.yaml
@@ -345,6 +345,9 @@ spec:
                           - Audit
                           - Block
                           type: string
+                        execname:
+                          pattern: ^[^\/]+$
+                          type: string
                         fromSource:
                           items:
                             properties:
@@ -368,8 +371,6 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - path
                       type: object
                     type: array
                   matchPatterns:

diff --git a/pkg/KubeArmorController/config/crd/bases/security.kubearmor.com_kubearmorpolicies.yaml b/pkg/KubeArmorController/config/crd/bases/security.kubearmor.com_kubearmorpolicies.yaml
@@ -335,6 +335,9 @@ spec:
                           - Audit
                           - Block
                           type: string
+                        execname:
+                          pattern: ^[^\/]+$
+                          type: string
                         fromSource:
                           items:
                             properties:
@@ -358,8 +361,6 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - path
                       type: object
                     type: array
                   matchPatterns:

diff --git a/pkg/KubeArmorController/crd/KubeArmorHostPolicy.yaml b/pkg/KubeArmorController/crd/KubeArmorHostPolicy.yaml
@@ -345,6 +345,9 @@ spec:
                           - Audit
                           - Block
                           type: string
+                        execname:
+                          pattern: ^[^\/]+$
+                          type: string
                         fromSource:
                           items:
                             properties:
@@ -368,8 +371,6 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - path
                       type: object
                     type: array
                   matchPatterns:

diff --git a/pkg/KubeArmorController/crd/KubeArmorPolicy.yaml b/pkg/KubeArmorController/crd/KubeArmorPolicy.yaml
@@ -335,6 +335,9 @@ spec:
                           - Audit
                           - Block
                           type: string
+                        execname:
+                          pattern: ^[^\/]+$
+                          type: string
                         fromSource:
                           items:
                             properties:
@@ -358,8 +361,6 @@ spec:
                           items:
                             type: string
                           type: array
-                      required:
-                      - path
                       type: object
                     type: array
                   matchPatterns: