diff --git a/Items/Binary.m b/Items/Binary.m index 2ebfc5d..c471df2 100644 --- a/Items/Binary.m +++ b/Items/Binary.m @@ -428,7 +428,7 @@ bail: vtDetectionRatio = [NSString stringWithFormat:@"%lu/%lu", (unsigned long)[self.vtInfo[VT_RESULTS_POSITIVES] unsignedIntegerValue], (unsigned long)[self.vtInfo[VT_RESULTS_TOTAL] unsignedIntegerValue]]; //init json - json = [NSString stringWithFormat:@"\"name\": \"%@\", \"path\": \"%@\", \"hashes\": %@, \"signature(s)\": %@, \"VT detection\": \"%@\"", self.name, self.path, fileHashes, fileSigs, vtDetectionRatio]; + json = [NSString stringWithFormat:@"\"name\": \"%@\", \"path\": \"%@\", \"hashes\": %@, \"signature(s)\": %@, \"VT detection\": \"%@\", \"encrypted\": %d, \"packed\": %d, \"not found\": %d", self.name, self.path, fileHashes, fileSigs, vtDetectionRatio, self.isEncrypted, self.isPacked, self.notFound]; return json; } diff --git a/Task.m b/Task.m index 2a81fc4..9038d9b 100644 --- a/Task.m +++ b/Task.m @@ -735,7 +735,7 @@ bail: } //init json - json = [NSString stringWithFormat:@"\"name\": \"%@\", \"path\": \"%@\", \"pid\": \"%@\", \"hashes\": %@, \"signature(s)\": %@, \"VT detection\": \"%@\", \"dylibs\": [%@], \"files\": [%@], \"connections\": [%@]", self.binary.name, self.binary.path, self.pid, fileHashes, fileSigs, vtDetectionRatio, dylibsJSON, filesJSON, connectionsJSON]; + json = [NSString stringWithFormat:@"\"name\": \"%@\", \"path\": \"%@\", \"pid\": \"%@\", \"command line\": \"%@\", \"hashes\": %@, \"signature(s)\": %@, \"VT detection\": \"%@\", \"encrypted\": %d, \"packed\": %d, \"not found\": %d, \"dylibs\": [%@], \"files\": [%@], \"connections\": [%@]", self.binary.name, self.binary.path, self.pid, taskCommandLine, fileHashes, fileSigs, vtDetectionRatio, self.binary.isEncrypted, self.binary.isPacked, self.binary.notFound, dylibsJSON, filesJSON, connectionsJSON]; return json; } diff --git a/TaskExplorer.xcodeproj/project.xcworkspace/xcuserdata/patrickw.xcuserdatad/UserInterfaceState.xcuserstate b/TaskExplorer.xcodeproj/project.xcworkspace/xcuserdata/patrickw.xcuserdatad/UserInterfaceState.xcuserstate index 93b09cc..d769206 100644 Binary files a/TaskExplorer.xcodeproj/project.xcworkspace/xcuserdata/patrickw.xcuserdatad/UserInterfaceState.xcuserstate and b/TaskExplorer.xcodeproj/project.xcworkspace/xcuserdata/patrickw.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/UI/TaskInfoWindow.xib b/UI/TaskInfoWindow.xib index 38563d5..99b0dae 100644 --- a/UI/TaskInfoWindow.xib +++ b/UI/TaskInfoWindow.xib @@ -1,8 +1,9 @@ - - + + - + + @@ -23,13 +24,14 @@ - + - + + @@ -38,6 +40,7 @@ + @@ -45,7 +48,8 @@ - + + @@ -53,7 +57,8 @@ - + + @@ -61,7 +66,8 @@ - + + @@ -69,7 +75,8 @@ - + + @@ -77,7 +84,8 @@ - + + @@ -85,7 +93,8 @@ - + + @@ -93,7 +102,8 @@ - + + @@ -101,25 +111,26 @@ - + + - + - - - + + - + + @@ -127,7 +138,8 @@ - + + @@ -136,6 +148,7 @@