improved UI and JSON output

Author: objective-see

AppDelegate.m

@@ -16,8 +16,12 @@
 
 /* GLOBALS */
 
+//scan ID
 NSString* scanID = nil;
 
+//query VT
+extern BOOL queryVT;
+
 @implementation AppDelegate
 
 @synthesize plugins;
@@ -420,12 +424,9 @@ -(void)startScan
 }
 
 //thread function
-// ->runs in the background to execute each plugin
+// runs in the background to execute each plugin
 -(void)scan
 {
-    //query VT?
-    BOOL queryVT = NO;
-    
     //set scan flag
     self.isConnected = isNetworkConnected();
 

KnockKnock.xcodeproj/project.pbxproj

@@ -1135,7 +1135,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4.0.0;
+				CURRENT_PROJECT_VERSION = 4.0.1;
 				DEVELOPMENT_TEAM = VBG97UB4TA;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1150,7 +1150,7 @@
 					"$(PROJECT_DIR)/Libraries/BTM",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.0.1;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = KnockKnock;
@@ -1167,7 +1167,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4.0.0;
+				CURRENT_PROJECT_VERSION = 4.0.1;
 				DEVELOPMENT_TEAM = VBG97UB4TA;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1182,7 +1182,7 @@
 					"$(PROJECT_DIR)/Libraries/BTM",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 4.0.0;
+				MARKETING_VERSION = 4.0.1;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.objective-see.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = KnockKnock;

PrefsWindowController.h

@@ -63,6 +63,7 @@
 
 //link (how to get a VT key)
 @property (weak) IBOutlet HyperlinkTextField* getAPILink;
+@property (weak) IBOutlet HyperlinkTextField* getAPILinkPopover;
 
 /* METHODS */
 

PrefsWindowController.m

@@ -80,6 +80,9 @@ -(void)windowDidLoad
         self.apiTextField.stringValue = self.vtAPIKey;
     }
 
+    //make url a hyperlink
+    makeTextViewHyperlink(self.getAPILink, [NSURL URLWithString:@"https://docs.virustotal.com/docs/please-give-me-an-api-key"]);
+    
 
     return;
 }
@@ -229,7 +232,7 @@ - (IBAction)showAPIHelp:(id)sender {
     viewController.view = self.getAPIHelp;
 
     //make url a hyperlink
-    makeTextViewHyperlink(self.getAPILink, [NSURL URLWithString:@"https://docs.virustotal.com/docs/please-give-me-an-api-key"]);
+    makeTextViewHyperlink(self.getAPILinkPopover, [NSURL URLWithString:@"https://docs.virustotal.com/docs/please-give-me-an-api-key"]);
 
     //init
     popover.contentViewController = viewController;

Results/File.m

@@ -14,6 +14,11 @@
 #import "utilities.h"
 #import "AppDelegate.h"
 
+/* GLOBALS */
+
+//cmdline scab
+extern BOOL queryVT;
+
 @implementation File
 
 @synthesize path;
@@ -308,12 +313,11 @@ -(NSString*)toJSON
     dict[@"signature(s)"] = self.signingInfo ?: @"unknown";
 
     //include VT?
-    if( [NSProcessInfo.processInfo.arguments containsObject:@"-key"] &&
-        ![NSProcessInfo.processInfo.arguments containsObject:@"-skipVT"] )
-    {
+    if(queryVT) {
+    
         dict[@"VT detection"] = [NSString stringWithFormat:@"%lu/%lu",
-            (unsigned long)[self.vtInfo[VT_RESULTS_POSITIVES] unsignedIntegerValue],
-            (unsigned long)[self.vtInfo[VT_RESULTS_TOTAL] unsignedIntegerValue]];
+                                     (unsigned long)[self.vtInfo[VT_RESULTS_POSITIVES] unsignedIntegerValue],
+                                     (unsigned long)[self.vtInfo[VT_RESULTS_TOTAL] unsignedIntegerValue]];
     }
 
     //serialize

UI/Base.lproj/PrefsWindow.xib

@@ -1,6 +1,18 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "2gz-Tn-4EA.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"Enable this option to show persistent macOS and Apple-installed components.\"; ObjectID = \"2gz-Tn-4EA\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Enable this option to show persistent macOS and Apple-installed components."
+          }
+        }
+      }
+    },
     "7e0-cR-939.title" : {
       "comment" : "Class = \"NSButtonCell\"; title = \"Start at login (+perform scan).\"; ObjectID = \"7e0-cR-939\";",
       "extractionState" : "extracted_with_value",
@@ -13,6 +25,18 @@
         }
       }
     },
+    "9UV-0a-N9m.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"Enable this option so KnockKnock launches and scans at each login.\\n\"; ObjectID = \"9UV-0a-N9m\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Enable this option so KnockKnock launches and scans at each login.\n"
+          }
+        }
+      }
+    },
     "CMD-Kc-WiI.title" : {
       "comment" : "Class = \"NSTextFieldCell\"; title = \"API Key:\"; ObjectID = \"CMD-Kc-WiI\";",
       "extractionState" : "extracted_with_value",
@@ -37,6 +61,18 @@
         }
       }
     },
+    "EbR-vz-kge.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"Obtain a key (for free!):\"; ObjectID = \"EbR-vz-kge\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Obtain a key (for free!):"
+          }
+        }
+      }
+    },
     "F0z-JX-Cv5.title" : {
       "comment" : "Class = \"NSWindow\"; title = \"KnockKnock Settings\"; ObjectID = \"F0z-JX-Cv5\";",
       "extractionState" : "extracted_with_value",
@@ -73,6 +109,18 @@
         }
       }
     },
+    "iA8-I3-D7j.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"Enable this option to prevent the app from querying VirusTotal for known malware.\"; ObjectID = \"iA8-I3-D7j\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Enable this option to prevent the app from querying VirusTotal for known malware."
+          }
+        }
+      }
+    },
     "idJ-pd-k6U.title" : {
       "comment" : "Class = \"NSButtonCell\"; title = \"Disable automatic update check.\"; ObjectID = \"idJ-pd-k6U\";",
       "extractionState" : "extracted_with_value",
@@ -109,6 +157,18 @@
         }
       }
     },
+    "k8E-oV-fEv.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"https://docs.virustotal.com/docs/please-give-me-an-api-key\"; ObjectID = \"k8E-oV-fEv\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "https://docs.virustotal.com/docs/please-give-me-an-api-key"
+          }
+        }
+      }
+    },
     "Nua-Eb-VTm.title" : {
       "comment" : "Class = \"NSTextFieldCell\"; title = \"Enter your personal VirusTotal API key. \\nYou can learn more about getting such a key (for free!) here:\"; ObjectID = \"Nua-Eb-VTm\";",
       "extractionState" : "extracted_with_value",
@@ -121,6 +181,18 @@
         }
       }
     },
+    "OWQ-k5-mAX.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"Enable this option to prevent the app from checking for updates automatically.\"; ObjectID = \"OWQ-k5-mAX\";",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Enable this option to prevent the app from checking for updates automatically."
+          }
+        }
+      }
+    },
     "rp9-45-S3R.placeholderString" : {
       "comment" : "Class = \"NSTextFieldCell\"; placeholderString = \"Your API Key\"; ObjectID = \"rp9-45-S3R\";",
       "extractionState" : "extracted_with_value",
@@ -145,14 +217,14 @@
         }
       }
     },
-    "Uce-KH-7DH.title" : {
-      "comment" : "Class = \"NSTextFieldCell\"; title = \"General:\"; ObjectID = \"Uce-KH-7DH\";",
+    "tJm-La-oyS.title" : {
+      "comment" : "Class = \"NSTextFieldCell\"; title = \"With an API key, checks items against VirusTotal for known malware. \"; ObjectID = \"tJm-La-oyS\";",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "General:"
+            "value" : "With an API key, checks items against VirusTotal for known malware. "
           }
         }
       }

UI/mul.lproj/PrefsWindow.xcstrings

@@ -16,8 +16,6 @@
 /* GLOBALS */
 
 //cmdline flag
-extern BOOL cmdlineMode;
-
 extern NSString* scanID;
 
 @implementation VirusTotal

VirusTotal.m

@@ -32,9 +32,13 @@ BOOL cmdlineMode = NO;
 //cmdline flag
 BOOL isVerbose = NO;
 
+//query VT?
+BOOL queryVT = NO;
+
 //(VT) API key for cmdline scan
 NSString* vtAPIKey = nil;
 
+
 /* FUNCTIONS */
 
 //print usage

main.h

@@ -173,9 +173,6 @@ void cmdlineScan(NSArray* args)
     //flag
     BOOL prettyPrint = NO;
 
-    //flag
-    BOOL queryVT = NO;
-    
     //displayed items
     // e.g. ignore apple/trusted if `-apple` not specified
     NSUInteger displayedItems = 0;