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

Changed colors for prompts and corrected sync command to run on all one line

Browse Source
This commit is contained in:
John Hammond 2020-05-07 22:08:17 -04:00
parent b29dcde252
commit 283d313abe
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pwncat/pty.py
View File

@ -63,9 +63,14 @@ class PtyHandler:
self.lhost = None self.lhost = None
self.known_binaries = {} self.known_binaries = {}
self.vars = {"lhost": util.get_ip_addr()} self.vars = {"lhost": util.get_ip_addr()}
self.remote_prefix = "\\[\\033[01;31m\\](remote)\\033[00m\\]"
self.remote_prompt = "\\[\\033[01;32m\\]\\u@\\h\\[\\033[00m\\]:\\[\\033[01;34m\\]\\w\\[\\033[00m\\]\\$" self.remote_prompt = "\\[\\033[01;32m\\]\\u@\\h\\[\\033[00m\\]:\\[\\033[01;34m\\]\\w\\[\\033[00m\\]\\$"
self.prompt = PromptSession( self.prompt = PromptSession(
[("", "(local) "), ("#ff0000", "pwncat"), ("", "$ ")] [
("fg:ansiyellow bold", "(local) "),
("fg:ansimagenta bold", "pwncat"),
("", "$ "),
]
) )
self.binary_aliases = { self.binary_aliases = {
"python": [ "python": [
@ -81,9 +86,9 @@ class PtyHandler:
} }
# We should always get a response within 3 seconds... # We should always get a response within 3 seconds...
self.client.settimeout(3) self.client.settimeout(1)
util.info("probing for prompt...", overlay=False) util.info("probing for prompt...", overlay=True)
start = time.time() start = time.time()
prompt = b"" prompt = b""
try: try:
@ -131,10 +136,10 @@ class PtyHandler:
# Ensure history is disabled # Ensure history is disabled
util.info("disabling remote command history", overlay=True) util.info("disabling remote command history", overlay=True)
self.run("unset HISTFILE") self.run("unset HISTFILE; export HISTCONTROL=ignorespace")
util.info("setting terminal prompt", overlay=True) util.info("setting terminal prompt", overlay=True)
self.run(f'export PS1="(remote) {self.remote_prompt} "') self.run(f'export PS1="{self.remote_prefix} $PS1"')
# Locate interesting binaries # Locate interesting binaries
# The auto-resolving doesn't work correctly until we have a pty # The auto-resolving doesn't work correctly until we have a pty
@ -177,11 +182,11 @@ class PtyHandler:
self.has_prompt = True self.has_prompt = True
util.info("setting terminal prompt", overlay=True) util.info("setting terminal prompt", overlay=True)
self.run(f'export PS1="(remote) {self.remote_prompt} "') self.run(f'export PS1="{self.remote_prefix} $PS1"')
# Make sure HISTFILE is unset in this PTY (it resets when a pty is # Make sure HISTFILE is unset in this PTY (it resets when a pty is
# opened) # opened)
self.run("unset HISTFILE") self.run("unset HISTFILE; export HISTCONTROL=ignorespace")
# Synchronize the terminals # Synchronize the terminals
util.info("synchronizing terminal state", overlay=True) util.info("synchronizing terminal state", overlay=True)
@ -462,9 +467,7 @@ class PtyHandler:
TERM = os.environ.get("TERM", "xterm") TERM = os.environ.get("TERM", "xterm")
columns, rows = os.get_terminal_size(0) columns, rows = os.get_terminal_size(0)
self.run(f"stty rows {rows}") self.run(f"stty rows {rows}; stty columns {columns}; export TERM='{TERM}'")
self.run(f"stty columns {columns}")
self.run(f'export TERM="{TERM}"')
def do_set(self, argv): def do_set(self, argv):
""" Set or view the currently assigned variables """ """ Set or view the currently assigned variables """
@ -512,7 +515,7 @@ class PtyHandler:
EOL = b"\r" if has_pty else b"\n" EOL = b"\r" if has_pty else b"\n"
if wait: if wait:
command = f"echo _PWNCAT_DELIM_; {cmd}; echo _PWNCAT_DELIM_" command = f" echo _PWNCAT_DELIM_; {cmd}; echo _PWNCAT_DELIM_"
else: else:
command = cmd command = cmd

2
pwncat/util.py
View File

@ -56,7 +56,7 @@ def enter_raw_mode():
""" """
info("setting terminal to raw mode and disabling echo", overlay=True) info("setting terminal to raw mode and disabling echo", overlay=True)
success("pwncat is ready\n", overlay=True) success("pwncat is ready 🐈\n", overlay=True)
# Ensure we don't have any weird buffering issues # Ensure we don't have any weird buffering issues
sys.stdout.flush() sys.stdout.flush()