fix(hsp/systemd): parse both matchpaths and matchdir together on hsp …

…event

Signed-off-by: daemon1024 <[email protected]>

KubeArmor/core/kubeUpdate.go

@@ -1568,7 +1568,9 @@ func (dm *KubeArmorDaemon) ParseAndUpdateHostSecurityPolicy(event tp.K8sKubeArmo
 				}
 			}
 		}
-	} else if len(secPolicy.Spec.Process.MatchDirectories) > 0 {
+	}
+
+	if len(secPolicy.Spec.Process.MatchDirectories) > 0 {
 		for idx, dir := range secPolicy.Spec.Process.MatchDirectories {
 			if dir.Severity == 0 {
 				if secPolicy.Spec.Process.Severity != 0 {
@@ -1602,7 +1604,9 @@ func (dm *KubeArmorDaemon) ParseAndUpdateHostSecurityPolicy(event tp.K8sKubeArmo
 				}
 			}
 		}
-	} else if len(secPolicy.Spec.Process.MatchPatterns) > 0 {
+	}
+
+	if len(secPolicy.Spec.Process.MatchPatterns) > 0 {
 		for idx, pat := range secPolicy.Spec.Process.MatchPatterns {
 			if pat.Severity == 0 {
 				if secPolicy.Spec.Process.Severity != 0 {

KubeArmor/core/unorchestratedUpdates.go

@@ -677,21 +677,20 @@ func (dm *KubeArmorDaemon) restoreKubeArmorPolicies() {
 					}
 
 				} else { // HostSecurityPolicy
-					var hostPolicy tp.HostSecurityPolicy
+					var hostPolicy tp.K8sKubeArmorHostPolicy
 					if err := json.Unmarshal(data, &hostPolicy); err == nil {
-						dm.HostSecurityPolicies = append(dm.HostSecurityPolicies, hostPolicy)
+						dm.ParseAndUpdateHostSecurityPolicy(tp.K8sKubeArmorHostPolicyEvent{
+							Type:   "ADDED",
+							Object: hostPolicy,
+						})
 					} else {
 						kg.Errf("Failed to unmarshal host policy: %v", err)
 					}
 				}
 			}
 		}
 
-		if len(policyFiles) != 0 {
-			if len(dm.HostSecurityPolicies) != 0 {
-				dm.UpdateHostSecurityPolicies()
-			}
-		} else {
+		if len(policyFiles) == 0 {
 			kg.Warn("No policies found for restoration")
 		}
 	}