Saverr/pwncat
1
0
Fork 0
mirror of https://github.com/calebstewart/pwncat.git synced 2024-11-24 01:25:37 +01:00
Code Projects Releases Wiki Activity

Brought interactive enabling into exception handler

Browse Source
This commit is contained in:
Caleb Stewart 2021-06-17 16:31:52 -04:00
parent af84d1a5a8
commit 65c3dd4864
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pwncat/manager.py
View File

@ -574,9 +574,8 @@ class Manager:
self.log("no active session, returning to local prompt")
continue
self.target.platform.interactive = True
interactive_complete = threading.Event()
output_thread = None
def output_thread_main(target: Session):
@ -597,12 +596,14 @@ class Manager:
except ChannelError:
interactive_complete.set()
output_thread = threading.Thread(
target=output_thread_main, args=[self.target]
)
output_thread.start()
try:
self.target.platform.interactive = True
output_thread = threading.Thread(
target=output_thread_main, args=[self.target]
)
output_thread.start()
try:
self.target.platform.interactive_loop(interactive_complete)
except RawModeExit:
@ -615,10 +616,10 @@ class Manager:
self.target.died()
except Exception:
pwncat.util.console.print_exception()
# Trigger thread to exit
interactive_complete.set()
output_thread.join()
finally:
interactive_complete.set()
if output_thread is not None:
output_thread.join()
def create_session(self, platform: str, channel: Channel = None, **kwargs):
"""