Fix hardware model and version on Lenovo (osquery#8534)

From Fleet: fleetdm/fleet#21648

This PR fixes an issue where Lenovo laptops report the hardware model and version incorrectly in the BIOS tables, resulting in incorrect values in the `hardware_model` and `hardware_version` columns of the `system_info` table.  This issue affects both Windows and Linux.  See fleetdm/fleet#21648 (comment) for examples of the undesirable output.

The fixes in this PR are:

* For Linux, swap the hardware_model and hardware_version values.  The reported version is something like `ThinkPad L15 Gen 3` which is consistent with the kind of value typically reported as `hardware_model` from other vendors.  The reported version is something like 21C8S3EA00 which appears to be a [product SKU](https://psref.lenovo.com/Detail/ThinkPad_L15_Gen_3_AMD?M=21C8S3EB00), which can serve as the "version" for this model.
* For Windows, retrieve the model name from the Win32_ComputerSystemProduct WMI class, and move the reported `hardware_model` into `hardware_version` as above.

Author: sgress454

osquery/tables/system/linux/system_info.cpp

@@ -121,6 +121,20 @@ QueryData genSystemInfo(QueryContext& context) {
           r["hardware_model"] = dmiString(textAddrs, address[0x05], maxlen);
           r["hardware_version"] = dmiString(textAddrs, address[0x06], maxlen);
           r["hardware_serial"] = dmiString(textAddrs, address[0x07], maxlen);
+
+          // Check if this is a Lenovo model.
+          std::string lcVendor = r["hardware_vendor"];
+          std::transform(
+              lcVendor.begin(), lcVendor.end(), lcVendor.begin(), ::tolower);
+          // Lenovo puts the model in the "Version" string and the product SKU
+          // in the "Model" string, so we'll switch them to be consistent with
+          // other vendors.
+          if (lcVendor == "lenovo") {
+            std::string version = r["hardware_model"];
+            r["hardware_model"] = r["hardware_version"];
+            r["hardware_version"] = version;
+          }
+
           return;
         }
 

osquery/tables/system/windows/system_info.cpp

@@ -56,6 +56,24 @@ QueryData genSystemInfo(QueryContext& context) {
     r["cpu_physical_cores"] = INTEGER(numProcs);
     wmiResults[0].GetString("Manufacturer", r["hardware_vendor"]);
     wmiResults[0].GetString("Model", r["hardware_model"]);
+
+    // For Lenovo models, the hardware_model property is not set propertly.
+    // Instead we can get the required info from the Win32_ComputerSystemProduct
+    // table.
+    std::string lcModel = r["hardware_vendor"];
+    std::transform(lcModel.begin(), lcModel.end(), lcModel.begin(), ::tolower);
+    if (lcModel == "lenovo") {
+      std::string version = r["hardware_model"];
+      const auto wmiSystemProductReq = WmiRequest::CreateWmiRequest(
+          "select * from Win32_ComputerSystemProduct");
+      if (wmiSystemProductReq.isValue() &&
+          !wmiSystemProductReq->results().empty()) {
+        const std::vector<WmiResultItem>& wmiProductResults =
+            wmiSystemProductReq->results();
+        wmiProductResults[0].GetString("Version", r["hardware_model"]);
+        r["hardware_version"] = version;
+      }
+    }
   } else {
     r["cpu_logical_cores"] = "-1";
     r["cpu_sockets"] = "-1";