From b5ce7f52a4acabf1cfeab2055970c6f7d997637b Mon Sep 17 00:00:00 2001
From: trevorbryant <trevorbryant@gmail.com>
Date: Mon, 5 Oct 2020 15:25:38 -0400
Subject: [PATCH] fix sudo timeout, fix set-password login, other exceptions

---
 pwncat/remote/victim.py | 42 +++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pwncat/remote/victim.py b/pwncat/remote/victim.py
index 288b578..e576bf2 100644
--- a/pwncat/remote/victim.py
+++ b/pwncat/remote/victim.py
@@ -1773,7 +1773,7 @@ class Victim:
             pipe = self.subprocess(sudo_command, **kwargs)
         else:
             sdelim, edelim = pwncat.victim.process(sudo_command, delim=True)
-
+        
         output = self.peek_output(some=True).lower()
         if (
             b"[sudo]" in output
@@ -1783,7 +1783,8 @@ class Victim:
         ):
 
             if send_password and password is None:
-                self.client.send(util.CTRL_C)
+                self.client.send(util.CTRL_C*2)
+                self.flush_output()
                 raise PermissionError(f"{self.current_user.name}: no known password")
 
             self.flush_output()
@@ -1791,23 +1792,28 @@ class Victim:
             if send_password:
                 self.client.send(password.encode("utf-8") + b"\n")
 
-            old_timeout = pwncat.victim.client.gettimeout()
-            pwncat.victim.client.settimeout(5)
-            output = pwncat.victim.peek_output(some=True)
-            pwncat.victim.client.settimeout(old_timeout)
+                old_timeout = pwncat.victim.client.gettimeout()
+                pwncat.victim.client.settimeout(5)
+                output = pwncat.victim.peek_output(some=True)
+                pwncat.victim.client.settimeout(old_timeout)
 
-            if (
-                b"[sudo]" in output
-                or b"password for " in output
-                or b"sorry," in output
-                or b"Sorry," in output
-                or b"sudo: " in output
-            ):
-                pwncat.victim.client.send(util.CTRL_C)
-                pwncat.victim.recvuntil(b"\n")
-                raise PermissionError(
-                    f"{self.current_user.name}: incorrect password/permissions"
-                )
+                if (
+                    b"[sudo]" in output
+                    or b"password for " in output
+                    or b"sorry," in output
+                    or b"Sorry," in output
+                    or b"sudo: " in output
+                ):
+                    pwncat.victim.client.send(util.CTRL_C)
+                    pwncat.victim.recvuntil(b"\n")
+                    raise PermissionError(
+                        f"{self.current_user.name}: incorrect password/permissions"
+                    )
+            else:
+                self.client.send(util.CTRL_C*2)
+                self.flush_output()
+                raise PermissionError(f"{self.current_user.name}: no known password")
+ 
 
         if stream:
             return pipe