add clipboard delay

Author: mpgn

nxc/protocols/rdp.py

@@ -427,7 +427,7 @@ async def execute_shell(self, payload, get_output, shell_type):
                 await asyncio.sleep(self.args.cmd_delay)
 
                 timeout_counter = 0
-                while not clipboard_ready and timeout_counter < 300:  # 30 second timeout
+                while not clipboard_ready and timeout_counter < (self.args.clipboard_delay * 10):  # Convert seconds to deciseconds
                     try:
                         data = await asyncio.wait_for(self.conn.ext_out_queue.get(), timeout=0.1)
                         if hasattr(data, "type") and data.type.name == "CLIPBOARD_READY":
@@ -568,16 +568,7 @@ async def screen(self):
             buffer.save(filename, "png")
             self.logger.highlight(f"Screenshot saved {filename}")
 
-    def screenshot(self):
-        # Don't take screenshot if we're already taking one during command execution
-        if hasattr(self.args, "execute") and self.args.execute is not None:
-            self.logger.debug("Skipping generic screenshot as -x is specified with --screenshot")
-            return
-        
-        if hasattr(self.args, "ps_execute") and self.args.ps_execute is not None:
-            self.logger.debug("Skipping generic screenshot as -X is specified with --screenshot")
-            return
-            
+    def screenshot(self):            
         asyncio.run(self.screen())
 
     async def nla_screen(self):

nxc/protocols/rdp/proto_args.py

@@ -21,6 +21,7 @@ def proto_args(parser, parents):
     cgroup.add_argument("-x", metavar="COMMAND", dest="execute", help="execute the specified command")
     cgroup.add_argument("-X", metavar="PS_COMMAND", dest="ps_execute", help="execute the specified PowerShell command")
     cgroup.add_argument("--cmd-delay", type=int, default=3, help="Sleep time before executing command")
+    cgroup.add_argument("--clipboard-delay", type=int, default=30, help="Maximum time to wait for clipboard initialization (seconds)")
     cgroup.add_argument("--no-output", action="store_true", help="do not retrieve command output")
 
     return parser