From 0742d55015625e267dba142989cefb6e4d38294e Mon Sep 17 00:00:00 2001 From: Matt W <436037+mlw@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:19:43 -0500 Subject: [PATCH 1/2] Add back code to watch changes to our defaults domain --- Source/common/SNTConfigurator.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/common/SNTConfigurator.m b/Source/common/SNTConfigurator.m index 713bb803..e385b032 100644 --- a/Source/common/SNTConfigurator.m +++ b/Source/common/SNTConfigurator.m @@ -37,6 +37,8 @@ } @interface SNTConfigurator () +@property(readonly, nonatomic) NSUserDefaults *defaults; + /// Keys and expected value types. @property(readonly, nonatomic) NSDictionary *syncServerKeyTypes; @property(readonly, nonatomic) NSDictionary *forcedConfigKeyTypes; @@ -296,6 +298,9 @@ - (instancetype)initWithSyncStateFile:(NSString *)syncStateFilePath _syncStateFilePath = syncStateFilePath; _syncStateAccessAuthorizerBlock = syncStateAccessAuthorizer; + _defaults = [NSUserDefaults standardUserDefaults]; + [_defaults addSuiteNamed:@"com.northpolesec.santa"]; + _configState = [self readForcedConfig]; [self cacheStaticRules]; From b6bb4ccfeb89b129848d29abd0a1a1e4d8d7a158 Mon Sep 17 00:00:00 2001 From: Matt W <436037+mlw@users.noreply.github.com> Date: Fri, 17 Jan 2025 09:22:12 -0500 Subject: [PATCH 2/2] PR feedback - add comment --- Source/common/SNTConfigurator.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/common/SNTConfigurator.m b/Source/common/SNTConfigurator.m index e385b032..e8ecc49f 100644 --- a/Source/common/SNTConfigurator.m +++ b/Source/common/SNTConfigurator.m @@ -298,6 +298,7 @@ - (instancetype)initWithSyncStateFile:(NSString *)syncStateFilePath _syncStateFilePath = syncStateFilePath; _syncStateAccessAuthorizerBlock = syncStateAccessAuthorizer; + // This is used to keep KVO on changes, but we use `CFPreferences*` for reading. _defaults = [NSUserDefaults standardUserDefaults]; [_defaults addSuiteNamed:@"com.northpolesec.santa"];