santad: wait for driver connection before adding prefix filters (#443 )

* wait for driver connection before adding prefix filters * version bump * fix travis build
santad: fix launch path and args for loading the system extension (#442 )
2026-01-15 01:08:12 -05:00 · 2020-02-21 14:58:12 -05:00 · 2020-02-20 20:01:42 -05:00
4 changed files with 6 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ addons:
  homebrew:
    taps: bazelbuild/tap
    packages: bazelbuild/tap/bazel
+    update: true

 script:
 - bazel build :release --show_progress_rate_limit=30.0 -c opt --apple_generate_dsym --color=no --verbose_failures --sandbox_debug
--- a/Source/santad/EventProviders/SNTDriverManager.m
+++ b/Source/santad/EventProviders/SNTDriverManager.m
@@ -310,6 +310,8 @@ static void driverAppearedHandler(void *info, io_iterator_t iterator) {
 }

 - (void)fileModificationPrefixFilterAdd:(NSArray *)filters {
+  while (!self.connectionEstablished) usleep(100000); // 100ms
+
  uint64_t n = 0;
  uint32_t n_len = 1;

--- a/Source/santad/SNTApplication.m
+++ b/Source/santad/SNTApplication.m
@@ -324,8 +324,8 @@ void diskDisappearedCallback(DADiskRef disk, void *context) {
    if (old == NO && new == YES) {
      LOGI(@"EnableSystemExtension changed NO -> YES");
      NSTask *t = [[NSTask alloc] init];
-      t.launchPath = [@(kSantaAppPath) stringByAppendingString:@"Contents/MacOS/Santa"];
-      t.arguments = @[ @"--enable-system-extension" ];
+      t.launchPath = [@(kSantaAppPath) stringByAppendingString:@"/Contents/MacOS/Santa"];
+      t.arguments = @[ @"--load-system-extension" ];
      [t launch];
      [t waitUntilExit];
      LOGI(@"The penultimate exit.");
--- a/version.bzl
+++ b/version.bzl
@@ -1,3 +1,3 @@
 """The version for all Santa components."""

-SANTA_VERSION = "1.3"
+SANTA_VERSION = "1.5"
Author	SHA1	Message	Date
Tom Burgin	d116f7b01e	santad: wait for driver connection before adding prefix filters (#443 ) * wait for driver connection before adding prefix filters * version bump * fix travis build	2020-02-21 14:58:12 -05:00
Tom Burgin	63ca34bc54	santad: fix launch path and args for loading the system extension (#442 ) * missing / * version bump * that was close	2020-02-20 20:01:42 -05:00