Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for encodings for non-interactive shell

This commit is contained in:
Oleksii Shevchuk 2017-07-06 19:46:36 +03:00
parent 6c9191bb81
commit 2e19c94689
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pupy/modules/interactive_shell.py
View File

@ -21,9 +21,10 @@ import rpyc
import cmd import cmd
class CmdRepl(cmd.Cmd): class CmdRepl(cmd.Cmd):
def __init__(self, stdout, write_cb, completion, CRLF=False, interpreter=None): def __init__(self, stdout, write_cb, completion, CRLF=False, interpreter=None, codepage=None):
self._write_cb = write_cb self._write_cb = write_cb
self._complete = completion self._complete = completion
self._codepage = codepage
self.prompt = '\r' self.prompt = '\r'
self._crlf = ('\r\n' if CRLF else '\n') self._crlf = ('\r\n' if CRLF else '\n')
self._interpreter = interpreter self._interpreter = interpreter
@ -38,6 +39,9 @@ class CmdRepl(cmd.Cmd):
return return
if not self._complete.is_set(): if not self._complete.is_set():
if self._codepage:
data = data.decode(self._codepage, errors='replace')
self.stdout.write(data) self.stdout.write(data)
self.stdout.flush() self.stdout.flush()
if '\n' in data: if '\n' in data:
@ -68,6 +72,9 @@ class CmdRepl(cmd.Cmd):
pass pass
def default(self, line): def default(self, line):
if self._codepage:
line = line.decode('utf-8').encode(self._codepage)
self._write_cb(line + self._crlf) self._write_cb(line + self._crlf)
self.prompt = '' self.prompt = ''
@ -108,6 +115,7 @@ class InteractiveShell(PupyModule):
def init_argparse(self): def init_argparse(self):
self.arg_parser = PupyArgumentParser(description=self.__doc__) self.arg_parser = PupyArgumentParser(description=self.__doc__)
self.arg_parser.add_argument('-c', '--codepage', help="Decode output with encoding")
self.arg_parser.add_argument('-T', action='store_true', dest='pseudo_tty', help="Disable tty allocation") self.arg_parser.add_argument('-T', action='store_true', dest='pseudo_tty', help="Disable tty allocation")
self.arg_parser.add_argument('-S', '--su', help='Try to change uid (linux only)') self.arg_parser.add_argument('-S', '--su', help='Try to change uid (linux only)')
self.arg_parser.add_argument('-R', default='ttyrec', dest='recorder', self.arg_parser.add_argument('-R', default='ttyrec', dest='recorder',
@ -241,7 +249,8 @@ class InteractiveShell(PupyModule):
self.stdout, self.stdout,
self.pipe.write, self.pipe.write,
self.complete, self.complete,
crlf, interpreter crlf, interpreter,
args.codepage
) )
self.pipe.execute(self.complete.set, repl._con_write) self.pipe.execute(self.complete.set, repl._con_write)