[SMB] WMI Quqery: Bug fix of while condition

Signed-off-by: XiaoliChan <30458572+XiaoliChan@users.noreply.github.com>

Author: XiaoliChan

nxc/modules/wcc.py

@@ -399,8 +399,8 @@ def check_laps(self):
         return success, reasons
 
     def check_last_successful_update(self):
-        records = self.connection.wmi_query(wmi_query="Select TimeGenerated FROM Win32_ReliabilityRecords Where EventIdentifier=19", namespace="root\\cimv2")
-        if isinstance(records, bool) or len(records) == 0:
+        records = self.connection.wmi_query(wql="Select TimeGenerated FROM Win32_ReliabilityRecords Where EventIdentifier=19", namespace="root\\cimv2")
+        if not records:
             return False, ["No update found"]
         most_recent_update_date = records[0]["TimeGenerated"]["value"]
         most_recent_update_date = most_recent_update_date.split(".")[0]

nxc/protocols/smb.py

@@ -1718,10 +1718,10 @@ def pass_pol(self):
         return PassPolDump(self).dump()
 
     @requires_admin
-    def wmi_query(self, wmi_query=None, namespace=None, callback_func=None):
+    def wmi_query(self, wql=None, namespace=None, callback_func=None):
         records = []
-        if not wmi_query:
-            wmi_query = self.args.wmi_query.strip("\n")
+        if not wql:
+            wql = self.args.wmi_query.strip("\n")
 
         if not namespace:
             namespace = self.args.wmi_namespace
@@ -1742,31 +1742,29 @@ def wmi_query(self, wmi_query=None, namespace=None, callback_func=None):
             iWbemLevel1Login = IWbemLevel1Login(iInterface)
             iWbemServices = iWbemLevel1Login.NTLMLogin(namespace, NULL, NULL)
             iWbemLevel1Login.RemRelease()
-            iEnumWbemClassObject = iWbemServices.ExecQuery(wmi_query)
+            iEnumWbemClassObject = iWbemServices.ExecQuery(wql)
         except Exception as e:
             self.logger.fail(f"Execute WQL error: {e}")
             if "iWbemLevel1Login" in locals():
                 dcom.disconnect()
         else:
-            self.logger.info(f"Executing WQL syntax: {wmi_query}")
-            while True:
-                try:
-                    if not callback_func:
+            self.logger.info(f"Executing WQL syntax: {wql}")
+            try:
+                if not callback_func:
+                    while True:
                         wmi_results = iEnumWbemClassObject.Next(0xFFFFFFFF, 1)[0]
                         record = wmi_results.getProperties()
                         records.append(record)
                         for k, v in record.items():
                             if k != "TimeGenerated":  # from the wcc module, but this is a small hack to get it to stop spamming - TODO: add in method to disable output for this function
                                 self.logger.highlight(f"{k} => {v['value']}")
-                    else:
-                        callback_func(iEnumWbemClassObject, records)
-                except Exception as e:
-                    if str(e).find("S_FALSE") < 0:
-                        raise e
-                    else:
-                        break
+                else:
+                    callback_func(iEnumWbemClassObject, records)
+            except Exception as e:
+                if str(e).find("S_FALSE") < 0:
+                    self.logger.debug(e)
             dcom.disconnect()
-        return records if records else False
+        return records
 
     def spider(
         self,