Merge branch 'beta' into dev

Author: peace-maker

CHANGELOG.md

@@ -143,6 +143,13 @@ The table below shows which release corresponds to each branch, and what date th
 [2257]: https://github.com/Gallopsled/pwntools/pull/2257
 [2225]: https://github.com/Gallopsled/pwntools/pull/2225
 
+## 4.11.2
+- [#2349][2349] Fix term.readline omitting a trailing \n
+- [#2352][2352] add `RETURN_CONST` as an allowed `_const_code` in safeeval
+
+[2349]: https://github.com/Gallopsled/pwntools/pull/2349
+[2352]: https://github.com/Gallopsled/pwntools/pull/2352
+
 ## 4.11.1 (`stable`)
 
 - [#2271][2271] FIX: Generated shebang with path to python invalid if path contains spaces

pwnlib/term/readline.py

@@ -6,6 +6,7 @@
 import io
 import six
 import sys
+import os
 
 from pwnlib.term import keyconsts as kc
 from pwnlib.term import keymap as km
@@ -405,7 +406,7 @@ def readline(_size=-1, prompt='', float=True, priority=10):
                     buffer = (buffer_left + buffer_right)
                     if buffer:
                         history.insert(0, buffer)
-                    return force_to_bytes(buffer)
+                    return force_to_bytes(buffer) + b'\n'
             except KeyboardInterrupt:
                 do_raise = False
                 try:
@@ -436,7 +437,7 @@ def raw_input(prompt='', float=True):
         float(bool): If set to `True`, prompt and input will float to the
                      bottom of the screen when `term.term_mode` is enabled.
     """
-    return readline(-1, prompt, float)
+    return readline(-1, prompt, float).rstrip(os.linesep.encode())
 
 def str_input(prompt='', float=True):
     r"""str_input(prompt='', float=True)
@@ -449,7 +450,7 @@ def str_input(prompt='', float=True):
         float(bool): If set to `True`, prompt and input will float to the
                      bottom of the screen when `term.term_mode` is enabled.
     """
-    return readline(-1, prompt, float).decode()
+    return readline(-1, prompt, float).decode().rstrip(os.linesep)
 
 def eval_input(prompt='', float=True):
     """eval_input(prompt='', float=True)
@@ -475,7 +476,7 @@ def eval_input(prompt='', float=True):
         Favorite object? 20
     """
     from pwnlib.util import safeeval
-    return safeeval.const(readline(-1, prompt, float))
+    return safeeval.const(readline(-1, prompt, float).rstrip(os.linesep.encode()))
 
 def init():
     global safeeval

pwnlib/tubes/ssh.py

@@ -951,15 +951,19 @@ def process(self, argv=None, executable=None, tty=True, cwd=None, env=None, igno
                 python = ssh_process(self, script, tty=True, cwd=cwd, raw=True, level=self.level, timeout=timeout)
 
             try:
-                python.recvline_contains(b'PWNTOOLS')        # Magic flag so that any sh/bash initialization errors are swallowed
-                python.recvline()                           # Python interpreter that was selected
+                python.recvline_contains(b'PWNTOOLS')   # Magic flag so that any sh/bash initialization errors are swallowed
+                try:
+                    if b'python' not in python.recvline():  # Python interpreter that was selected
+                        raise ValueError("Python not found on remote host")
+                except (EOFError, ValueError):
+                    self.warn_once('Could not find a Python interpreter on %s\n' % self.host
+                                   + "Use ssh.system() instead of ssh.process()\n")
+                    h.failure("Process creation failed")
+                    return None
+
                 result = safeeval.const(python.recvline())  # Status flag from the Python script
             except (EOFError, ValueError):
                 h.failure("Process creation failed")
-                self.warn_once('Could not find a Python interpreter on %s\n' % self.host
-                               + "Use ssh.run() instead of ssh.process()\n"
-                                 "The original error message:\n"
-                               + python.recvall().decode())
                 return None
 
             # If an error occurred, try to grab as much output

pwnlib/tubes/tube.py

@@ -900,8 +900,8 @@ def recv_thread():
             while not go.is_set():
                 if term.term_mode:
                     data = term.readline.readline(prompt = prompt, float = True)
-                    if data:
-                        data += self.newline
+                    if data.endswith(b'\n') and self.newline != b'\n':
+                        data = data[:-1] + self.newline
                 else:
                     stdin = getattr(sys.stdin, 'buffer', sys.stdin)
                     data = stdin.read(1)

pwnlib/util/safeeval.py

@@ -6,7 +6,7 @@
     'BUILD_CONST_KEY_MAP', 'BUILD_STRING',
     'LOAD_CONST','RETURN_VALUE','STORE_SUBSCR', 'STORE_MAP',
     'LIST_TO_TUPLE', 'LIST_EXTEND', 'SET_UPDATE', 'DICT_UPDATE', 'DICT_MERGE',
-    'COPY', 'RESUME',
+    'COPY', 'RESUME', 'RETURN_CONST'
     ]
 
 _expr_codes = _const_codes + [