mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Issue #15318: Prevent writing to sys.stdin.
Patch by Roger Serwy and myself.
This commit is contained in:
parent
186396dce6
commit
c882b7c51a
3 changed files with 38 additions and 5 deletions
|
@ -1,6 +1,8 @@
|
||||||
What's New in IDLE 3.2.4?
|
What's New in IDLE 3.2.4?
|
||||||
=========================
|
=========================
|
||||||
|
|
||||||
|
- Issue #15318: Prevent writing to sys.stdin.
|
||||||
|
|
||||||
- Issue #13532, #15319: Check that arguments to sys.stdout.write are strings.
|
- Issue #13532, #15319: Check that arguments to sys.stdout.write are strings.
|
||||||
|
|
||||||
- Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE.
|
- Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE.
|
||||||
|
|
|
@ -12,6 +12,7 @@ import time
|
||||||
import tokenize
|
import tokenize
|
||||||
import traceback
|
import traceback
|
||||||
import types
|
import types
|
||||||
|
import io
|
||||||
|
|
||||||
import linecache
|
import linecache
|
||||||
from code import InteractiveInterpreter
|
from code import InteractiveInterpreter
|
||||||
|
@ -410,6 +411,9 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
||||||
except socket.timeout as err:
|
except socket.timeout as err:
|
||||||
self.display_no_subprocess_error()
|
self.display_no_subprocess_error()
|
||||||
return None
|
return None
|
||||||
|
# Can't regiter self.tkconsole.stdin, since run.py wants to
|
||||||
|
# call non-TextIO methods on it (such as getvar)
|
||||||
|
# XXX should be renamed to "console"
|
||||||
self.rpcclt.register("stdin", self.tkconsole)
|
self.rpcclt.register("stdin", self.tkconsole)
|
||||||
self.rpcclt.register("stdout", self.tkconsole.stdout)
|
self.rpcclt.register("stdout", self.tkconsole.stdout)
|
||||||
self.rpcclt.register("stderr", self.tkconsole.stderr)
|
self.rpcclt.register("stderr", self.tkconsole.stderr)
|
||||||
|
@ -850,13 +854,14 @@ class PyShell(OutputWindow):
|
||||||
self.save_stderr = sys.stderr
|
self.save_stderr = sys.stderr
|
||||||
self.save_stdin = sys.stdin
|
self.save_stdin = sys.stdin
|
||||||
from idlelib import IOBinding
|
from idlelib import IOBinding
|
||||||
|
self.stdin = PseudoInputFile(self)
|
||||||
self.stdout = PseudoFile(self, "stdout", IOBinding.encoding)
|
self.stdout = PseudoFile(self, "stdout", IOBinding.encoding)
|
||||||
self.stderr = PseudoFile(self, "stderr", IOBinding.encoding)
|
self.stderr = PseudoFile(self, "stderr", IOBinding.encoding)
|
||||||
self.console = PseudoFile(self, "console", IOBinding.encoding)
|
self.console = PseudoFile(self, "console", IOBinding.encoding)
|
||||||
if not use_subprocess:
|
if not use_subprocess:
|
||||||
sys.stdout = self.stdout
|
sys.stdout = self.stdout
|
||||||
sys.stderr = self.stderr
|
sys.stderr = self.stderr
|
||||||
sys.stdin = self
|
sys.stdin = self.stdin
|
||||||
try:
|
try:
|
||||||
# page help() text to shell.
|
# page help() text to shell.
|
||||||
import pydoc # import must be done here to capture i/o rebinding.
|
import pydoc # import must be done here to capture i/o rebinding.
|
||||||
|
@ -1256,6 +1261,15 @@ class PseudoFile(object):
|
||||||
def isatty(self):
|
def isatty(self):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
class PseudoInputFile(object):
|
||||||
|
def __init__(self, shell):
|
||||||
|
self.readline = shell.readline
|
||||||
|
self.isatty = shell.isatty
|
||||||
|
|
||||||
|
def write(self, s):
|
||||||
|
raise io.UnsupportedOperation("not writable")
|
||||||
|
writelines = write
|
||||||
|
|
||||||
|
|
||||||
usage_msg = """\
|
usage_msg = """\
|
||||||
|
|
||||||
|
|
|
@ -256,7 +256,7 @@ class _RPCFile(io.TextIOBase):
|
||||||
|
|
||||||
def __getattribute__(self, name):
|
def __getattribute__(self, name):
|
||||||
# When accessing the 'rpc' attribute, or 'write', use ours
|
# When accessing the 'rpc' attribute, or 'write', use ours
|
||||||
if name in ('rpc', 'write'):
|
if name in ('rpc', 'write', 'writelines'):
|
||||||
return io.TextIOBase.__getattribute__(self, name)
|
return io.TextIOBase.__getattribute__(self, name)
|
||||||
# Else only look into the remote object only
|
# Else only look into the remote object only
|
||||||
return getattr(self.rpc, name)
|
return getattr(self.rpc, name)
|
||||||
|
@ -264,20 +264,37 @@ class _RPCFile(io.TextIOBase):
|
||||||
def __setattr__(self, name, value):
|
def __setattr__(self, name, value):
|
||||||
return setattr(self.rpc, name, value)
|
return setattr(self.rpc, name, value)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _ensure_string(func):
|
||||||
|
def f(self, s):
|
||||||
|
if not isinstance(s, str):
|
||||||
|
raise TypeError('must be str, not ' + type(s).__name__)
|
||||||
|
return func(self, s)
|
||||||
|
return f
|
||||||
|
|
||||||
|
class _RPCOutputFile(_RPCFile):
|
||||||
|
@_RPCFile._ensure_string
|
||||||
def write(self, s):
|
def write(self, s):
|
||||||
if not isinstance(s, str):
|
if not isinstance(s, str):
|
||||||
raise TypeError('must be str, not ' + type(s).__name__)
|
raise TypeError('must be str, not ' + type(s).__name__)
|
||||||
return self.rpc.write(s)
|
return self.rpc.write(s)
|
||||||
|
|
||||||
|
class _RPCInputFile(_RPCFile):
|
||||||
|
@_RPCFile._ensure_string
|
||||||
|
def write(self, s):
|
||||||
|
raise io.UnsupportedOperation("not writable")
|
||||||
|
writelines = write
|
||||||
|
|
||||||
class MyHandler(rpc.RPCHandler):
|
class MyHandler(rpc.RPCHandler):
|
||||||
|
|
||||||
def handle(self):
|
def handle(self):
|
||||||
"""Override base method"""
|
"""Override base method"""
|
||||||
executive = Executive(self)
|
executive = Executive(self)
|
||||||
self.register("exec", executive)
|
self.register("exec", executive)
|
||||||
sys.stdin = self.console = self.get_remote_proxy("stdin")
|
self.console = self.get_remote_proxy("stdin")
|
||||||
sys.stdout = _RPCFile(self.get_remote_proxy("stdout"))
|
sys.stdin = _RPCInputFile(self.console)
|
||||||
sys.stderr = _RPCFile(self.get_remote_proxy("stderr"))
|
sys.stdout = _RPCOutputFile(self.get_remote_proxy("stdout"))
|
||||||
|
sys.stderr = _RPCOutputFile(self.get_remote_proxy("stderr"))
|
||||||
# page help() text to shell.
|
# page help() text to shell.
|
||||||
import pydoc # import must be done here to capture i/o binding
|
import pydoc # import must be done here to capture i/o binding
|
||||||
pydoc.pager = pydoc.plainpager
|
pydoc.pager = pydoc.plainpager
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue