v2.2

- M1 native support
- Safari plugins/extensions
- Improved: UI, OS compatibility, etc.

.gitignore

@@ -1,3 +1,5 @@
 *.xcscheme
 *.xcuserstate
-KnockKnock.xcodeproj/xcuserdata/*
+KnockKnock.xcodeproj/xcuserdata/*
+Carthage/Build
+Carthage/Checkouts

AppDelegate.h

@@ -39,7 +39,10 @@ extern Filter* itemFilter;
 /* PROPERTIES */
 
 //friends
-@property (weak) IBOutlet NSWindow *friends;
+@property (weak) IBOutlet NSWindow* friends;
+
+//close button
+@property (weak) IBOutlet NSButton* closeButton;
 
 //flag for secondary scan
 // ->need to restart shared enumerator 

AppDelegate.m

@@ -108,6 +108,9 @@ -(void)applicationDidFinishLaunching:(NSNotification *)notification
         //show friends window
         [self.friends makeKeyAndOrderFront:self];
 
+        //then make action button first responder
+        [self.friends makeFirstResponder:self.closeButton];
+
         //close after a few seconds
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
 
@@ -246,7 +249,7 @@ -(void)requestFullDiskAcces
             infoAlert.messageText = @"Open 'System Preferences' to give KnockKnock Full Disk Access?";
 
             //detailed test
-            infoAlert.informativeText = @"This allows the app to perform a comprehensive scan.\n\nIn System Preferences:\r ▪ click the 🔒 to authenticate\r ▪ click the ➕ to add KnockKnock.app\n";
+            infoAlert.informativeText = @"This allows the app to perform a comprehensive scan.\n\nIn System Preferences:\r ▪ Click the 🔒 to authenticate\r ▪ Click the ➕ to add KnockKnock.app\n";
 
             //ok button
             [infoAlert addButtonWithTitle:@"OK"];
@@ -481,7 +484,7 @@ -(void)scan
             self.statusText.hidden = NO;
 
             //update
-            [self.statusText setStringValue:[NSString stringWithFormat:@"scanning %@", plugin.name]];
+            [self.statusText setStringValue:[NSString stringWithFormat:@"Scanning: %@", plugin.name]];
 
         });
 
@@ -694,28 +697,18 @@ -(void)itemsProcessed:(PluginBase*)plugin
     // ->reload category table (to trigger title turning red)
     if(0 != plugin.flaggedItems.count)
     {
-        //execute on main (UI) thread
-        dispatch_sync(dispatch_get_main_queue(), ^{
-
-            //reload category table
-            [self.categoryTableController customReload];
-
-        });
+        //reload category table
+        [self.categoryTableController customReload];
     }
 
     //check if active plugin matches
     if(plugin == self.selectedPlugin)
     {
-        //execute on main (UI) thread
-        dispatch_sync(dispatch_get_main_queue(), ^{
-
-            //scroll to top of item table
-            [self.itemTableController scrollToTop];
+        //scroll to top of item table
+        [self.itemTableController scrollToTop];
 
-            //reload item table
-            [self.itemTableController.itemTableView reloadData];
-
-        });
+        //reload item table
+        [self.itemTableController.itemTableView reloadData];
     }
 
     return;
@@ -931,7 +924,7 @@ -(void)stopScanUI:(NSString*)statusMsg
     [self.progressIndicator stopAnimation:nil];
 
     //hide progress indicator
-    self.progressIndicator.hidden = YES;
+    //self.progressIndicator.hidden = YES;
 
     //shift over status msg
     self.statusTextConstraint.constant = 10;
@@ -992,7 +985,7 @@ -(void)displayScanStats
             flaggedItemCount += plugin.flaggedItems.count;
 
             //init detailed msg
-            details = [NSMutableString stringWithFormat:@"■ found %lu items", (unsigned long)itemCount];
+            details = [NSMutableString stringWithFormat:@"■ Found %lu items", (unsigned long)itemCount];
         }
         //otherwise just unknown items
         else
@@ -1013,7 +1006,7 @@ -(void)displayScanStats
             }
 
             //init detailed msg
-            details = [NSMutableString stringWithFormat:@"■ found %lu non-OS items", (unsigned long)itemCount];
+            details = [NSMutableString stringWithFormat:@"■ Found %lu non-OS items", (unsigned long)itemCount];
         }
     }
 
@@ -1026,7 +1019,7 @@ -(void)displayScanStats
         if(YES != self.isConnected)
         {
             //add disconnected msg
-            [details appendFormat:@" \r\n■ unable to query VirusTotal (network)"];
+            [details appendFormat:@" \r\n■ Unable to query VirusTotal (network)"];
         }
         //otherwise
         // ->add details about # of flagged items

Assets.xcassets/FriendsMalwarebytes.imageset/Contents.json → Assets.xcassets/Friends1Password.imageset/Contents.json

@@ -2,11 +2,11 @@
   "images" : [
     {
       "idiom" : "mac",
-      "filename" : "malwarebytes.pdf"
+      "filename" : "darkMode.png"
     },
     {
       "idiom" : "mac",
-      "filename" : "malwarebytesLight.pdf",
+      "filename" : "lightMode.png",
       "appearances" : [
         {
           "appearance" : "luminosity",
@@ -16,7 +16,7 @@
     },
     {
       "idiom" : "mac",
-      "filename" : "malwarebytesDark.pdf",
+      "filename" : "darkMode.png",
       "appearances" : [
         {
           "appearance" : "luminosity",
@@ -32,4 +32,4 @@
   "properties" : {
     "preserves-vector-representation" : true
   }
-}
+}

Assets.xcassets/FriendsJamf.imageset/Contents.json

@@ -0,0 +1,35 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "darkMode.png"
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "lightMode.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ]
+    },
+    {
+      "idiom" : "mac",
+      "filename" : "darkMode.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Cartfile

@@ -1 +1 @@
-github "getsentry/sentry-cocoa" "4.1.0"
+github "getsentry/sentry-cocoa" "6.2.0"

Cartfile.resolved

@@ -1 +1 @@
-github "getsentry/sentry-cocoa" "4.1.0"
+github "getsentry/sentry-cocoa" "6.2.0"

Consts.h

@@ -18,20 +18,23 @@
 //supported plugins
 static NSString * const SUPPORTED_PLUGINS[] = {@"AuthorizationPlugins", @"BrowserExtensions", @"CronJobs", @"DirectoryServicesPlugins", @"EventRules", @"Extensions", @"Kexts", @"LaunchItems", @"DylibInserts", @"DylibProxies", @"LoginItems", @"LogInOutHooks", @"PeriodicScripts", @"QuicklookPlugins", @"SpotlightImporters", @"StartupScripts"};
 
+//sentry crash reporting URL
+#define SENTRY_DSN @"https://ba5d094e87014a529b25d90bae010b1c@sentry.io/1321683"
+
 //button text, start scan
 #define START_SCAN @"Start Scan"
 
 //button text, stop scan
 #define STOP_SCAN @"Stop Scan"
 
 //status msg
-#define SCAN_MSG_STARTED @"scanning started"
+#define SCAN_MSG_STARTED @"Scanning Started"
 
 //status msg
-#define SCAN_MSG_STOPPED @"scan stopped"
+#define SCAN_MSG_STOPPED @"Scan Stopped"
 
 //status msg
-#define SCAN_MSG_COMPLETE @"scan complete"
+#define SCAN_MSG_COMPLETE @"Scan Complete"
 
 //prefs
 // ->filter out OS/known
@@ -183,10 +186,6 @@ enum Signer{None, Apple, AppStore, DevID, AdHoc};
 //id (tag) for 'show' button
 #define TABLE_ROW_SHOW_BUTTON 107
 
-//ellipis
-// ->for long paths...
-#define ELLIPIS @"..."
-
 //known kexts
 #define WHITE_LISTED_KEXTS @"whitelistedKexts"
 

Filter.m

@@ -154,31 +154,25 @@ -(BOOL)isTrustedKext:(File*)file
     // either list of hashes, or dev id
     id whitelistInfo = nil;
 
+    //ignore any signing issues
+    if(noErr != [file.signingInfo[KEY_SIGNATURE_STATUS] intValue]) goto bail;
+
     //lookup based on name
     whitelistInfo = self.trustedKexts[file.path];
 
-    //hashes?
-    if( (YES == [whitelistInfo isKindOfClass:[NSArray class]]) &&
-        (YES == [whitelistInfo containsObject:[file.hashes[KEY_HASH_MD5] lowercaseString]]) )
+    //dev id?
+    if( (YES == [((NSArray*)whitelistInfo).firstObject hasPrefix:@"Developer ID Application"]) &&
+        (YES == [[file.signingInfo[KEY_SIGNATURE_AUTHORITIES] lastObject] isEqualToString:@"Apple Root CA"]) )
     {
-        //got match
-        isTrusted = YES;
-
-        //bail
-        goto bail;
+        //check
+        isTrusted = [whitelistInfo containsObject:[file.signingInfo[KEY_SIGNATURE_AUTHORITIES] firstObject]];
+        if(YES == isTrusted) goto bail;
     }
-
-    //dev id?
-    // note: these are only for kexts that ship with macOS!
-     if( (YES == [whitelistInfo isKindOfClass:[NSString class]]) &&
-         (YES == [[file.signingInfo[KEY_SIGNATURE_AUTHORITIES] lastObject] isEqualToString:@"Apple Root CA"]) &&
-         (YES == [file.signingInfo[KEY_SIGNATURE_AUTHORITIES] containsObject:whitelistInfo]) )
+    //hash
+    else
     {
-        //got match
-        isTrusted = YES;
-
-        //bail
-        goto bail;
+        isTrusted = [whitelistInfo containsObject:[file.hashes[KEY_HASH_MD5] lowercaseString]];
+        if(YES == isTrusted) goto bail;
     }
 
     //check for apple signature

ItemTableController.m

@@ -117,7 +117,7 @@ -(NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
         self.noItemsLabel.hidden = NO;
 
         //set string
-        self.noItemsLabel.stringValue = [NSString stringWithFormat:@"no %@ found", [selectedPluginObj.name lowercaseString]];
+        self.noItemsLabel.stringValue = [NSString stringWithFormat:@"No %@ found", [selectedPluginObj.name lowercaseString]];
     }
 
     //there *are* items

KKRow.m

@@ -24,7 +24,7 @@ -(void)drawSelectionInRect:(NSRect)dirtyRect
     if(self.selectionHighlightStyle != NSTableViewSelectionHighlightStyleNone)
     {
         //make selection rect
-        selectionRect = NSInsetRect(self.bounds, 2.5, 2.5);
+        selectionRect = NSInsetRect(self.bounds, 10.0, 1.0);
 
         //dark mode highlight
         if(YES == isDarkMode())