Add more flexibility to account for possible attacker time skew and delete task even when erroring

Author: NeffIsBack

nxc/protocols/smb/atexec.py

@@ -74,8 +74,8 @@ def output_callback(self, data):
         self.__outputBuffer = data
 
     def get_end_boundary(self):
-        # Get current date and time + 5 minutes
-        end_boundary = datetime.now() + timedelta(minutes=5)
+        # Get current date and time + 1 day
+        end_boundary = datetime.now() + timedelta(days=1)
 
         # Format it to match the format in the XML: "YYYY-MM-DDTHH:MM:SS.ssssss"
         return end_boundary.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]
@@ -196,14 +196,17 @@ def execute_handler(self, command):
                 self.logger.fail(str(e))
             return
 
-        done = False
-        while not done:
-            self.logger.debug(f"Calling SchRpcGetLastRunInfo for \\{self.task_name}")
-            resp = tsch.hSchRpcGetLastRunInfo(dce, f"\\{self.task_name}")
-            if resp["pLastRuntime"]["wYear"] != 0:
-                done = True
-            else:
-                sleep(2)
+        try:
+            done = False
+            while not done:
+                self.logger.debug(f"Calling SchRpcGetLastRunInfo for \\{self.task_name}")
+                resp = tsch.hSchRpcGetLastRunInfo(dce, f"\\{self.task_name}")
+                if resp["pLastRuntime"]["wYear"] != 0:
+                    done = True
+                else:
+                    sleep(2)
+        except tsch.DCERPCSessionError as e:
+            self.logger.fail(f"Error retrieving task last run info: {e}")
 
         self.logger.info(f"Deleting task \\{self.task_name}")
         tsch.hSchRpcDelete(dce, f"\\{self.task_name}")