From 737525b74618fb4fd1e0c24f896b766eb3f8decc Mon Sep 17 00:00:00 2001
From: Tom Burgin <tburgin@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:23:30 -0400
Subject: [PATCH] kvo static rules (#1425)

---
 Source/common/SNTConfigurator.m | 7 ++++++-
 Source/santad/Santad.mm         | 9 +++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Source/common/SNTConfigurator.m b/Source/common/SNTConfigurator.m
index 55d74ad19..170ef1601 100644
--- a/Source/common/SNTConfigurator.m
+++ b/Source/common/SNTConfigurator.m
@@ -368,7 +368,12 @@ + (NSSet *)keyPathsForValuesAffectingFileChangesPrefixFiltersKey {
 }
 
 + (NSSet *)keyPathsForValuesAffectingStaticRules {
-  return [self configStateSet];
+  static NSSet *set;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    set = [NSSet setWithObject:NSStringFromSelector(@selector(cachedStaticRules))];
+  });
+  return set;
 }
 
 + (NSSet *)keyPathsForValuesAffectingSyncBaseURL {
diff --git a/Source/santad/Santad.mm b/Source/santad/Santad.mm
index 0c82ce877..ef1ffa250 100644
--- a/Source/santad/Santad.mm
+++ b/Source/santad/Santad.mm
@@ -315,12 +315,9 @@ void SantadMain(std::shared_ptr<EndpointSecurityAPI> esapi, std::shared_ptr<Logg
                                  }],
     [[SNTKVOManager alloc] initWithObject:configurator
                                  selector:@selector(staticRules)
-                                     type:[NSArray class]
-                                 callback:^(NSArray *oldValue, NSArray *newValue) {
-                                   NSSet *oldValueSet = [NSSet setWithArray:oldValue ?: @[]];
-                                   NSSet *newValueSet = [NSSet setWithArray:newValue ?: @[]];
-
-                                   if ([oldValueSet isEqualToSet:newValueSet]) {
+                                     type:[NSDictionary class]
+                                 callback:^(NSDictionary *oldValue, NSDictionary *newValue) {
+                                   if ([oldValue isEqualToDictionary:newValue]) {
                                      return;
                                    }