fixes to windows cli --json option bug

Author: kernelwernel

auxiliary/test_cli.ps1

@@ -24,7 +24,9 @@ function Fail-Test([string]$desc) { Write-Host "  FAIL  $desc"; $script:fail++ }
 # runtime uses WriteFile (not WriteConsoleW) for std::cout.  Without it, when
 # the parent process has a console, the CRT routes output through WriteConsoleW
 # which silently fails on a pipe handle and the captured output is empty.
-function invoke_bin([string[]]$binArgs, [bool]$captureStderr = $true) {
+function invoke_bin([string[]]$binArgs, [bool]$captureStderr = $true, [int]$timeoutMs = -1) {
+    if ($timeoutMs -lt 0) { $timeoutMs = $script:TIMEOUT_SECS * 1000 }
+
     $psi = [System.Diagnostics.ProcessStartInfo]::new($script:BIN)
     foreach ($a in $binArgs) { $psi.ArgumentList.Add($a) }
     $psi.UseShellExecute        = $false
@@ -36,7 +38,7 @@ function invoke_bin([string[]]$binArgs, [bool]$captureStderr = $true) {
     $outTask = $proc.StandardOutput.ReadToEndAsync()
     $errTask = $proc.StandardError.ReadToEndAsync()
 
-    if (-not $proc.WaitForExit($script:TIMEOUT_SECS * 1000)) {
+    if (-not $proc.WaitForExit($timeoutMs)) {
         $proc.Kill()
         return $null, -99
     }
@@ -211,7 +213,7 @@ Write-Host ""
 Write-Host "--json"
 $tmpJson = [System.IO.Path]::GetTempFileName() + ".json"
 try {
-    $out, $code = invoke_bin @("--json", "--output", $tmpJson)
+    $out, $code = invoke_bin @("--json", "--output", $tmpJson) $true 30000
     if ($code -eq -99) {
         Fail-Test "--json timed out"
         Fail-Test "--json output missing expected keys"

src/cli/output.cpp

@@ -318,58 +318,47 @@ bool parse_disable_token(const char* token) {
 }
 
 void generate_json(const char* output) {
+    const VM::vmaware vm(VM::MULTIPLE);
+
     std::vector<std::string> json;
 
     json.emplace_back("{");
     json.emplace_back("\n\t\"is_detected\": ");
-
-    if (VM::detect()) {
-        json.emplace_back("true,");
-    }
-    else {
-        json.emplace_back("false,");
-    }
+    json.emplace_back(vm.is_vm ? "true," : "false,");
 
     json.emplace_back("\n\t\"brand\": \"");
-    json.push_back(VM::brand());
+    json.push_back(vm.brand);
     json.emplace_back("\",");
 
     json.emplace_back("\n\t\"conclusion\": \"");
-    json.push_back(VM::conclusion());
+    json.push_back(vm.conclusion);
     json.emplace_back("\",");
 
     json.emplace_back("\n\t\"percentage\": ");
-    json.push_back(std::to_string(static_cast<int>(VM::percentage())));
+    json.push_back(std::to_string(static_cast<int>(vm.percentage)));
     json.emplace_back(",");
 
     json.emplace_back("\n\t\"detected_technique_count\": ");
     json.push_back(std::to_string(VM::technique_count));
     json.emplace_back(",");
 
     json.emplace_back("\n\t\"vm_type\": \"");
-    json.push_back(VM::type());
+    json.push_back(vm.type);
     json.emplace_back("\",");
 
     json.emplace_back("\n\t\"is_hardened\": ");
-
-    if (VM::is_hardened()) {
-        json.emplace_back("true,");
-    } else {
-        json.emplace_back("false,");
-    }
+    json.emplace_back(vm.is_hardened ? "true," : "false,");
 
     json.emplace_back("\n\t\"detected_techniques\": [");
 
-    const auto detected_status = VM::detected_enums();
-
-    if (detected_status.empty()) {
+    if (vm.detected_techniques.empty()) {
         json.emplace_back("]\n}");
     } else {
-        for (size_t i = 0; i < detected_status.size(); i++) {
+        for (size_t i = 0; i < vm.detected_techniques.size(); i++) {
             json.emplace_back("\n\t\t\"");
-            json.push_back(VM::flag_to_string(detected_status[i]));
+            json.push_back(VM::flag_to_string(vm.detected_techniques[i]));
 
-            if (i == detected_status.size() - 1) {
+            if (i == vm.detected_techniques.size() - 1) {
                 json.emplace_back("\"");
             } else {
                 json.emplace_back("\",");