make interactive() exit when recv side disconnects

Gallopsled · Sep 11, 2022 · 4873414 · 4873414
1 parent 6457c33
commit 4873414
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pwnlib/term/keymap.py b/pwnlib/term/keymap.py
@@ -21,7 +21,7 @@ def __init__(self, bindings, on_match = None, on_nomatch = None,
     def handle_input(self):
         self._doread = True
         while self._doread:
-            self.send(key.get())
+            self.send(key.get(1))
 
     def stop(self):
         self._doread = False

diff --git a/pwnlib/tubes/tube.py b/pwnlib/tubes/tube.py
@@ -854,8 +854,8 @@ def recv_thread():
                         stdout.write(cur)
                         stdout.flush()
                 except EOFError:
+                    go.set()
                     self.info('Got EOF while reading in interactive')
-                    break
 
         t = context.Thread(target = recv_thread)
         t.daemon = True
@@ -869,7 +869,7 @@ def recv_thread():
                     stdin = getattr(sys.stdin, 'buffer', sys.stdin)
                     data = stdin.read(1)
 
-                if data:
+                if data != 0:
                     try:
                         self.send(data)
                     except EOFError: