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

Added warning messages for 'KeyboardInterrupt'

Browse Source 
I have added warning messages so that the attacker can use 'C-c' to cancel the session when used from command line (not from local prompt). And added the message for already handled same exception. I have also changed two warning message color from 'red' to 'yellow', because 'yellow' is being used everywhere in the code.
This commit is contained in:
Mitul16 2021-07-18 02:21:16 +05:30
parent 230b3995f5
commit 534002288c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pwncat/__main__.py
View File

@ -277,6 +277,8 @@ def main():
) )
except (ChannelError, PlatformError) as exc: except (ChannelError, PlatformError) as exc:
manager.log(f"connection failed: {exc}") manager.log(f"connection failed: {exc}")
except KeyboardInterrupt:
manager.log("[yellow]warning[/yellow]: cancelled by user")
manager.interactive() manager.interactive()

4
pwncat/commands/__init__.py
View File

@ -523,7 +523,7 @@ class CommandParser:
self.dispatch_line(command) self.dispatch_line(command)
except ChannelClosed as exc: except ChannelClosed as exc:
# A channel was unexpectedly closed # A channel was unexpectedly closed
self.manager.log(f"[red]warning[/red]: {exc.channel}: channel closed") self.manager.log(f"[yellow]warning[/yellow]: {exc.channel}: channel closed")
# Ensure any existing sessions are cleaned from the manager # Ensure any existing sessions are cleaned from the manager
exc.cleanup(self.manager) exc.cleanup(self.manager)
except pwncat.manager.InteractiveExit: except pwncat.manager.InteractiveExit:
@ -593,7 +593,7 @@ class CommandParser:
continue continue
except ChannelClosed as exc: except ChannelClosed as exc:
# A channel was unexpectedly closed # A channel was unexpectedly closed
self.manager.log(f"[red]warning[/red]: {exc.channel}: channel closed") self.manager.log(f"[yellow]warning[/yellow]: {exc.channel}: channel closed")
# Ensure any existing sessions are cleaned from the manager # Ensure any existing sessions are cleaned from the manager
exc.cleanup(self.manager) exc.cleanup(self.manager)
except pwncat.manager.InteractiveExit: except pwncat.manager.InteractiveExit:

2
pwncat/commands/connect.py
View File

@ -244,3 +244,5 @@ class Command(CommandDefinition):
) )
except (ChannelError, PlatformError) as exc: except (ChannelError, PlatformError) as exc:
manager.log(f"connection failed: {exc}") manager.log(f"connection failed: {exc}")
except KeyboardInterrupt:
manager.log("[yellow]warning[/yellow]: cancelled by user")