|
|
|
# Copyright 2019, David Wilson
|
|
|
|
#
|
|
|
|
# Redistribution and use in source and binary forms, with or without
|
|
|
|
# modification, are permitted provided that the following conditions are met:
|
|
|
|
#
|
|
|
|
# 1. Redistributions of source code must retain the above copyright notice,
|
|
|
|
# this list of conditions and the following disclaimer.
|
|
|
|
#
|
|
|
|
# 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
|
|
# this list of conditions and the following disclaimer in the documentation
|
|
|
|
# and/or other materials provided with the distribution.
|
|
|
|
#
|
|
|
|
# 3. Neither the name of the copyright holder nor the names of its contributors
|
|
|
|
# may be used to endorse or promote products derived from this software without
|
|
|
|
# specific prior written permission.
|
|
|
|
#
|
|
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
|
|
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
# POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
|
|
|
# !mitogen: minify_safe
|
|
|
|
|
|
|
|
"""
|
|
|
|
This module implements most package functionality, but remains separate from
|
|
|
|
non-essential code in order to reduce its size, since it is also serves as the
|
|
|
|
bootstrap implementation sent to every new slave context.
|
|
|
|
"""
|
|
|
|
|
|
|
|
import binascii
|
|
|
|
import collections
|
|
|
|
import encodings.latin_1
|
|
|
|
import encodings.utf_8
|
|
|
|
import errno
|
|
|
|
import fcntl
|
|
|
|
import itertools
|
|
|
|
import linecache
|
|
|
|
import logging
|
|
|
|
import os
|
|
|
|
import pickle as py_pickle
|
|
|
|
import pstats
|
|
|
|
import signal
|
|
|
|
import socket
|
|
|
|
import struct
|
|
|
|
import sys
|
|
|
|
import syslog
|
|
|
|
import threading
|
|
|
|
import time
|
|
|
|
import traceback
|
|
|
|
import warnings
|
|
|
|
import weakref
|
|
|
|
import zlib
|
|
|
|
|
|
|
|
# Python >3.7 deprecated the imp module.
|
|
|
|
warnings.filterwarnings('ignore', message='the imp module is deprecated')
|
|
|
|
import imp
|
|
|
|
|
|
|
|
# Absolute imports for <2.5.
|
|
|
|
select = __import__('select')
|
|
|
|
|
|
|
|
try:
|
|
|
|
import cProfile
|
|
|
|
except ImportError:
|
|
|
|
cProfile = None
|
|
|
|
|
|
|
|
try:
|
|
|
|
import thread
|
|
|
|
except ImportError:
|
|
|
|
import threading as thread
|
|
|
|
|
|
|
|
try:
|
|
|
|
import cPickle as pickle
|
|
|
|
except ImportError:
|
|
|
|
import pickle
|
|
|
|
|
|
|
|
try:
|
|
|
|
from cStringIO import StringIO as BytesIO
|
|
|
|
except ImportError:
|
|
|
|
from io import BytesIO
|
|
|
|
|
|
|
|
try:
|
|
|
|
BaseException
|
|
|
|
except NameError:
|
|
|
|
BaseException = Exception
|
|
|
|
|
|
|
|
try:
|
|
|
|
ModuleNotFoundError
|
|
|
|
except NameError:
|
|
|
|
ModuleNotFoundError = ImportError
|
|
|
|
|
|
|
|
# TODO: usage of 'import' after setting __name__, but before fixing up
|
|
|
|
# sys.modules generates a warning. This happens when profiling = True.
|
|
|
|
warnings.filterwarnings('ignore',
|
|
|
|
"Parent module 'mitogen' not found while handling absolute import")
|
|
|
|
|
|
|
|
LOG = logging.getLogger('mitogen')
|
|
|
|
IOLOG = logging.getLogger('mitogen.io')
|
|
|
|
IOLOG.setLevel(logging.INFO)
|
|
|
|
|
|
|
|
# str.encode() may take import lock. Deadlock possible if broker calls
|
|
|
|
# .encode() on behalf of thread currently waiting for module.
|
|
|
|
LATIN1_CODEC = encodings.latin_1.Codec()
|
|
|
|
|
|
|
|
_v = False
|
|
|
|
_vv = False
|
|
|
|
|
|
|
|
GET_MODULE = 100
|
|
|
|
CALL_FUNCTION = 101
|
|
|
|
FORWARD_LOG = 102
|
|
|
|
ADD_ROUTE = 103
|
|
|
|
DEL_ROUTE = 104
|
|
|
|
ALLOCATE_ID = 105
|
|
|
|
SHUTDOWN = 106
|
|
|
|
LOAD_MODULE = 107
|
|
|
|
FORWARD_MODULE = 108
|
|
|
|
DETACHING = 109
|
|
|
|
CALL_SERVICE = 110
|
|
|
|
STUB_CALL_SERVICE = 111
|
|
|
|
|
|
|
|
#: Special value used to signal disconnection or the inability to route a
|
|
|
|
#: message, when it appears in the `reply_to` field. Usually causes
|
|
|
|
#: :class:`mitogen.core.ChannelError` to be raised when it is received.
|
|
|
|
#:
|
|
|
|
#: It indicates the sender did not know how to process the message, or wishes
|
|
|
|
#: no further messages to be delivered to it. It is used when:
|
|
|
|
#:
|
|
|
|
#: * a remote receiver is disconnected or explicitly closed.
|
|
|
|
#: * a related message could not be delivered due to no route existing for it.
|
|
|
|
#: * a router is being torn down, as a sentinel value to notify
|
|
|
|
#: :meth:`mitogen.core.Router.add_handler` callbacks to clean up.
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
IS_DEAD = 999
|
|
|
|
|
|
|
|
try:
|
|
|
|
BaseException
|
|
|
|
except NameError:
|
|
|
|
BaseException = Exception
|
|
|
|
|
|
|
|
PY24 = sys.version_info < (2, 5)
|
|
|
|
PY3 = sys.version_info > (3,)
|
|
|
|
if PY3:
|
|
|
|
b = str.encode
|
|
|
|
BytesType = bytes
|
|
|
|
UnicodeType = str
|
|
|
|
FsPathTypes = (str,)
|
|
|
|
BufferType = lambda buf, start: memoryview(buf)[start:]
|
|
|
|
long = int
|
|
|
|
else:
|
|
|
|
b = str
|
|
|
|
BytesType = str
|
|
|
|
FsPathTypes = (str, unicode)
|
|
|
|
BufferType = buffer
|
|
|
|
UnicodeType = unicode
|
|
|
|
|
|
|
|
AnyTextType = (BytesType, UnicodeType)
|
|
|
|
|
|
|
|
try:
|
|
|
|
next
|
|
|
|
except NameError:
|
|
|
|
next = lambda it: it.next()
|
|
|
|
|
|
|
|
# #550: prehistoric WSL did not advertise itself in uname output.
|
|
|
|
try:
|
|
|
|
fp = open('/proc/sys/kernel/osrelease')
|
|
|
|
IS_WSL = 'Microsoft' in fp.read()
|
|
|
|
fp.close()
|
|
|
|
except IOError:
|
|
|
|
IS_WSL = False
|
|
|
|
|
|
|
|
|
|
|
|
#: Default size for calls to :meth:`Side.read` or :meth:`Side.write`, and the
|
|
|
|
#: size of buffers configured by :func:`mitogen.parent.create_socketpair`. This
|
|
|
|
#: value has many performance implications, 128KiB seems to be a sweet spot.
|
|
|
|
#:
|
|
|
|
#: * When set low, large messages cause many :class:`Broker` IO loop
|
|
|
|
#: iterations, burning CPU and reducing throughput.
|
|
|
|
#: * When set high, excessive RAM is reserved by the OS for socket buffers (2x
|
|
|
|
#: per child), and an identically sized temporary userspace buffer is
|
|
|
|
#: allocated on each read that requires zeroing, and over a particular size
|
|
|
|
#: may require two system calls to allocate/deallocate.
|
|
|
|
#:
|
|
|
|
#: Care must be taken to ensure the underlying kernel object and receiving
|
|
|
|
#: program support the desired size. For example,
|
|
|
|
#:
|
|
|
|
#: * Most UNIXes have TTYs with fixed 2KiB-4KiB buffers, making them unsuitable
|
|
|
|
#: for efficient IO.
|
|
|
|
#: * Different UNIXes have varying presets for pipes, which may not be
|
|
|
|
#: configurable. On recent Linux the default pipe buffer size is 64KiB, but
|
|
|
|
#: under memory pressure may be as low as 4KiB for unprivileged processes.
|
|
|
|
#: * When communication is via an intermediary process, its internal buffers
|
|
|
|
#: effect the speed OS buffers will drain. For example OpenSSH uses 64KiB
|
|
|
|
#: reads.
|
|
|
|
#:
|
|
|
|
#: An ideal :class:`Message` has a size that is a multiple of
|
|
|
|
#: :data:`CHUNK_SIZE` inclusive of headers, to avoid wasting IO loop iterations
|
|
|
|
#: writing small trailer chunks.
|
|
|
|
CHUNK_SIZE = 131072
|
|
|
|
|
|
|
|
_tls = threading.local()
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == 'mitogen.core':
|
|
|
|
# When loaded using import mechanism, ExternalContext.main() will not have
|
|
|
|
# a chance to set the synthetic mitogen global, so just import it here.
|
|
|
|
import mitogen
|
|
|
|
else:
|
|
|
|
# When loaded as __main__, ensure classes and functions gain a __module__
|
|
|
|
# attribute consistent with the host process, so that pickling succeeds.
|
|
|
|
__name__ = 'mitogen.core'
|
|
|
|
|
|
|
|
|
|
|
|
class Error(Exception):
|
|
|
|
"""
|
|
|
|
Base for all exceptions raised by Mitogen.
|
|
|
|
|
|
|
|
:param str fmt:
|
|
|
|
Exception text, or format string if `args` is non-empty.
|
|
|
|
:param tuple args:
|
|
|
|
Format string arguments.
|
|
|
|
"""
|
|
|
|
def __init__(self, fmt=None, *args):
|
|
|
|
if args:
|
|
|
|
fmt %= args
|
|
|
|
if fmt and not isinstance(fmt, UnicodeType):
|
|
|
|
fmt = fmt.decode('utf-8')
|
|
|
|
Exception.__init__(self, fmt)
|
|
|
|
|
|
|
|
|
|
|
|
class LatchError(Error):
|
|
|
|
"""
|
|
|
|
Raised when an attempt is made to use a :class:`mitogen.core.Latch` that
|
|
|
|
has been marked closed.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
class Blob(BytesType):
|
|
|
|
"""
|
|
|
|
A serializable bytes subclass whose content is summarized in repr() output,
|
|
|
|
making it suitable for logging binary data.
|
|
|
|
"""
|
|
|
|
def __repr__(self):
|
|
|
|
return '[blob: %d bytes]' % len(self)
|
|
|
|
|
|
|
|
def __reduce__(self):
|
|
|
|
return (Blob, (BytesType(self),))
|
|
|
|
|
|
|
|
|
|
|
|
class Secret(UnicodeType):
|
|
|
|
"""
|
|
|
|
A serializable unicode subclass whose content is masked in repr() output,
|
|
|
|
making it suitable for logging passwords.
|
|
|
|
"""
|
|
|
|
def __repr__(self):
|
|
|
|
return '[secret]'
|
|
|
|
|
|
|
|
if not PY3:
|
|
|
|
# TODO: what is this needed for in 2.x?
|
|
|
|
def __str__(self):
|
|
|
|
return UnicodeType(self)
|
|
|
|
|
|
|
|
def __reduce__(self):
|
|
|
|
return (Secret, (UnicodeType(self),))
|
|
|
|
|
|
|
|
|
|
|
|
class Kwargs(dict):
|
|
|
|
"""
|
|
|
|
A serializable dict subclass that indicates its keys should be coerced to
|
|
|
|
Unicode on Python 3 and bytes on Python<2.6.
|
|
|
|
|
|
|
|
Python 2 produces keyword argument dicts whose keys are bytes, requiring a
|
|
|
|
helper to ensure compatibility with Python 3 where Unicode is required,
|
|
|
|
whereas Python 3 produces keyword argument dicts whose keys are Unicode,
|
|
|
|
requiring a helper for Python 2.4/2.5, where bytes are required.
|
|
|
|
"""
|
|
|
|
if PY3:
|
|
|
|
def __init__(self, dct):
|
|
|
|
for k, v in dct.items():
|
|
|
|
if type(k) is bytes:
|
|
|
|
self[k.decode()] = v
|
|
|
|
else:
|
|
|
|
self[k] = v
|
|
|
|
elif sys.version_info < (2, 6, 5):
|
|
|
|
def __init__(self, dct):
|
|
|
|
for k, v in dct.iteritems():
|
|
|
|
if type(k) is unicode:
|
|
|
|
k, _ = encodings.utf_8.encode(k)
|
|
|
|
self[k] = v
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Kwargs(%s)' % (dict.__repr__(self),)
|
|
|
|
|
|
|
|
def __reduce__(self):
|
|
|
|
return (Kwargs, (dict(self),))
|
|
|
|
|
|
|
|
|
|
|
|
class CallError(Error):
|
|
|
|
"""
|
|
|
|
Serializable :class:`Error` subclass raised when :meth:`Context.call()
|
|
|
|
<mitogen.parent.Context.call>` fails. A copy of the traceback from the
|
|
|
|
external context is appended to the exception message.
|
|
|
|
"""
|
|
|
|
def __init__(self, fmt=None, *args):
|
|
|
|
if not isinstance(fmt, BaseException):
|
|
|
|
Error.__init__(self, fmt, *args)
|
|
|
|
else:
|
|
|
|
e = fmt
|
|
|
|
cls = e.__class__
|
|
|
|
fmt = '%s.%s: %s' % (cls.__module__, cls.__name__, e)
|
|
|
|
tb = sys.exc_info()[2]
|
|
|
|
if tb:
|
|
|
|
fmt += '\n'
|
|
|
|
fmt += ''.join(traceback.format_tb(tb))
|
|
|
|
Error.__init__(self, fmt)
|
|
|
|
|
|
|
|
def __reduce__(self):
|
|
|
|
return (_unpickle_call_error, (self.args[0],))
|
|
|
|
|
|
|
|
|
|
|
|
def _unpickle_call_error(s):
|
|
|
|
if not (type(s) is UnicodeType and len(s) < 10000):
|
|
|
|
raise TypeError('cannot unpickle CallError: bad input')
|
|
|
|
return CallError(s)
|
|
|
|
|
|
|
|
|
|
|
|
class ChannelError(Error):
|
|
|
|
"""
|
|
|
|
Raised when a channel dies or has been closed.
|
|
|
|
"""
|
|
|
|
remote_msg = 'Channel closed by remote end.'
|
|
|
|
local_msg = 'Channel closed by local end.'
|
|
|
|
|
|
|
|
|
|
|
|
class StreamError(Error):
|
|
|
|
"""
|
|
|
|
Raised when a stream cannot be established.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
class TimeoutError(Error):
|
|
|
|
"""
|
|
|
|
Raised when a timeout occurs on a stream.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
def to_text(o):
|
|
|
|
"""
|
|
|
|
Coerce `o` to Unicode by decoding it from UTF-8 if it is an instance of
|
|
|
|
:class:`bytes`, otherwise pass it to the :class:`str` constructor. The
|
|
|
|
returned object is always a plain :class:`str`, any subclass is removed.
|
|
|
|
"""
|
|
|
|
if isinstance(o, BytesType):
|
|
|
|
return o.decode('utf-8')
|
|
|
|
return UnicodeType(o)
|
|
|
|
|
|
|
|
|
|
|
|
# Documented in api.rst to work around Sphinx limitation.
|
|
|
|
now = getattr(time, 'monotonic', time.time)
|
|
|
|
|
|
|
|
|
|
|
|
# Python 2.4
|
|
|
|
try:
|
|
|
|
any
|
|
|
|
except NameError:
|
|
|
|
def any(it):
|
|
|
|
for elem in it:
|
|
|
|
if elem:
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def _partition(s, sep, find):
|
|
|
|
"""
|
|
|
|
(str|unicode).(partition|rpartition) for Python 2.4/2.5.
|
|
|
|
"""
|
|
|
|
idx = find(sep)
|
|
|
|
if idx != -1:
|
|
|
|
left = s[0:idx]
|
|
|
|
return left, sep, s[len(left)+len(sep):]
|
|
|
|
|
|
|
|
|
|
|
|
if hasattr(UnicodeType, 'rpartition'):
|
|
|
|
str_partition = UnicodeType.partition
|
|
|
|
str_rpartition = UnicodeType.rpartition
|
|
|
|
bytes_partition = BytesType.partition
|
|
|
|
else:
|
|
|
|
def str_partition(s, sep):
|
|
|
|
return _partition(s, sep, s.find) or (s, u'', u'')
|
|
|
|
def str_rpartition(s, sep):
|
|
|
|
return _partition(s, sep, s.rfind) or (u'', u'', s)
|
|
|
|
def bytes_partition(s, sep):
|
|
|
|
return _partition(s, sep, s.find) or (s, '', '')
|
|
|
|
|
|
|
|
|
|
|
|
def _has_parent_authority(context_id):
|
|
|
|
return (
|
|
|
|
(context_id == mitogen.context_id) or
|
|
|
|
(context_id in mitogen.parent_ids)
|
|
|
|
)
|
|
|
|
|
|
|
|
def has_parent_authority(msg, _stream=None):
|
|
|
|
"""
|
|
|
|
Policy function for use with :class:`Receiver` and
|
|
|
|
:meth:`Router.add_handler` that requires incoming messages to originate
|
|
|
|
from a parent context, or on a :class:`Stream` whose :attr:`auth_id
|
|
|
|
<Stream.auth_id>` has been set to that of a parent context or the current
|
|
|
|
context.
|
|
|
|
"""
|
|
|
|
return _has_parent_authority(msg.auth_id)
|
|
|
|
|
|
|
|
|
|
|
|
def _signals(obj, signal):
|
|
|
|
return (
|
|
|
|
obj.__dict__
|
|
|
|
.setdefault('_signals', {})
|
|
|
|
.setdefault(signal, [])
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
def listen(obj, name, func):
|
|
|
|
"""
|
|
|
|
Arrange for `func()` to be invoked when signal `name` is fired on `obj`.
|
|
|
|
"""
|
|
|
|
_signals(obj, name).append(func)
|
|
|
|
|
|
|
|
|
|
|
|
def unlisten(obj, name, func):
|
|
|
|
"""
|
|
|
|
Remove `func()` from the list of functions invoked when signal `name` is
|
|
|
|
fired by `obj`.
|
|
|
|
|
|
|
|
:raises ValueError:
|
|
|
|
`func()` was not on the list.
|
|
|
|
"""
|
|
|
|
_signals(obj, name).remove(func)
|
|
|
|
|
|
|
|
|
|
|
|
def fire(obj, name, *args, **kwargs):
|
|
|
|
"""
|
|
|
|
Arrange for `func(*args, **kwargs)` to be invoked for every function
|
|
|
|
registered for signal `name` on `obj`.
|
|
|
|
"""
|
|
|
|
for func in _signals(obj, name):
|
|
|
|
func(*args, **kwargs)
|
|
|
|
|
|
|
|
|
|
|
|
def takes_econtext(func):
|
|
|
|
"""
|
|
|
|
Decorator that marks a function or class method to automatically receive a
|
|
|
|
kwarg named `econtext`, referencing the
|
|
|
|
:class:`mitogen.core.ExternalContext` active in the context in which the
|
|
|
|
function is being invoked in. The decorator is only meaningful when the
|
|
|
|
function is invoked via :data:`CALL_FUNCTION <mitogen.core.CALL_FUNCTION>`.
|
|
|
|
|
|
|
|
When the function is invoked directly, `econtext` must still be passed to
|
|
|
|
it explicitly.
|
|
|
|
"""
|
|
|
|
func.mitogen_takes_econtext = True
|
|
|
|
return func
|
|
|
|
|
|
|
|
|
|
|
|
def takes_router(func):
|
|
|
|
"""
|
|
|
|
Decorator that marks a function or class method to automatically receive a
|
|
|
|
kwarg named `router`, referencing the :class:`mitogen.core.Router` active
|
|
|
|
in the context in which the function is being invoked in. The decorator is
|
|
|
|
only meaningful when the function is invoked via :data:`CALL_FUNCTION
|
|
|
|
<mitogen.core.CALL_FUNCTION>`.
|
|
|
|
|
|
|
|
When the function is invoked directly, `router` must still be passed to it
|
|
|
|
explicitly.
|
|
|
|
"""
|
|
|
|
func.mitogen_takes_router = True
|
|
|
|
return func
|
|
|
|
|
|
|
|
|
|
|
|
def is_blacklisted_import(importer, fullname):
|
|
|
|
"""
|
|
|
|
Return :data:`True` if `fullname` is part of a blacklisted package, or if
|
|
|
|
any packages have been whitelisted and `fullname` is not part of one.
|
|
|
|
|
|
|
|
NB:
|
|
|
|
- If a package is on both lists, then it is treated as blacklisted.
|
|
|
|
- If any package is whitelisted, then all non-whitelisted packages are
|
|
|
|
treated as blacklisted.
|
|
|
|
"""
|
|
|
|
return ((not any(fullname.startswith(s) for s in importer.whitelist)) or
|
|
|
|
(any(fullname.startswith(s) for s in importer.blacklist)))
|
|
|
|
|
|
|
|
|
|
|
|
def set_cloexec(fd):
|
|
|
|
"""
|
|
|
|
Set the file descriptor `fd` to automatically close on :func:`os.execve`.
|
|
|
|
This has no effect on file descriptors inherited across :func:`os.fork`,
|
|
|
|
they must be explicitly closed through some other means, such as
|
|
|
|
:func:`mitogen.fork.on_fork`.
|
|
|
|
"""
|
|
|
|
flags = fcntl.fcntl(fd, fcntl.F_GETFD)
|
|
|
|
assert fd > 2
|
|
|
|
fcntl.fcntl(fd, fcntl.F_SETFD, flags | fcntl.FD_CLOEXEC)
|
|
|
|
|
|
|
|
|
|
|
|
def set_nonblock(fd):
|
|
|
|
"""
|
|
|
|
Set the file descriptor `fd` to non-blocking mode. For most underlying file
|
|
|
|
types, this causes :func:`os.read` or :func:`os.write` to raise
|
|
|
|
:class:`OSError` with :data:`errno.EAGAIN` rather than block the thread
|
|
|
|
when the underlying kernel buffer is exhausted.
|
|
|
|
"""
|
|
|
|
flags = fcntl.fcntl(fd, fcntl.F_GETFL)
|
|
|
|
fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
|
|
|
|
|
|
|
|
|
|
|
|
def set_block(fd):
|
|
|
|
"""
|
|
|
|
Inverse of :func:`set_nonblock`, i.e. cause `fd` to block the thread when
|
|
|
|
the underlying kernel buffer is exhausted.
|
|
|
|
"""
|
|
|
|
flags = fcntl.fcntl(fd, fcntl.F_GETFL)
|
|
|
|
fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~os.O_NONBLOCK)
|
|
|
|
|
|
|
|
|
|
|
|
def io_op(func, *args):
|
|
|
|
"""
|
|
|
|
Wrap `func(*args)` that may raise :class:`select.error`, :class:`IOError`,
|
|
|
|
or :class:`OSError`, trapping UNIX error codes relating to disconnection
|
|
|
|
and retry events in various subsystems:
|
|
|
|
|
|
|
|
* When a signal is delivered to the process on Python 2, system call retry
|
|
|
|
is signalled through :data:`errno.EINTR`. The invocation is automatically
|
|
|
|
restarted.
|
|
|
|
* When performing IO against a TTY, disconnection of the remote end is
|
|
|
|
signalled by :data:`errno.EIO`.
|
|
|
|
* When performing IO against a socket, disconnection of the remote end is
|
|
|
|
signalled by :data:`errno.ECONNRESET`.
|
|
|
|
* When performing IO against a pipe, disconnection of the remote end is
|
|
|
|
signalled by :data:`errno.EPIPE`.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
Tuple of `(return_value, disconnect_reason)`, where `return_value` is
|
|
|
|
the return value of `func(*args)`, and `disconnected` is an exception
|
|
|
|
instance when disconnection was detected, otherwise :data:`None`.
|
|
|
|
"""
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
return func(*args), None
|
|
|
|
except (select.error, OSError, IOError):
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
_vv and IOLOG.debug('io_op(%r) -> OSError: %s', func, e)
|
|
|
|
if e.args[0] == errno.EINTR:
|
|
|
|
continue
|
|
|
|
if e.args[0] in (errno.EIO, errno.ECONNRESET, errno.EPIPE):
|
|
|
|
return None, e
|
|
|
|
raise
|
|
|
|
|
|
|
|
|
|
|
|
class PidfulStreamHandler(logging.StreamHandler):
|
|
|
|
"""
|
|
|
|
A :class:`logging.StreamHandler` subclass used when
|
|
|
|
:meth:`Router.enable_debug() <mitogen.master.Router.enable_debug>` has been
|
|
|
|
called, or the `debug` parameter was specified during context construction.
|
|
|
|
Verifies the process ID has not changed on each call to :meth:`emit`,
|
|
|
|
reopening the associated log file when a change is detected.
|
|
|
|
|
|
|
|
This ensures logging to the per-process output files happens correctly even
|
|
|
|
when uncooperative third party components call :func:`os.fork`.
|
|
|
|
"""
|
|
|
|
#: PID that last opened the log file.
|
|
|
|
open_pid = None
|
|
|
|
|
|
|
|
#: Output path template.
|
|
|
|
template = '/tmp/mitogen.%s.%s.log'
|
|
|
|
|
|
|
|
def _reopen(self):
|
|
|
|
self.acquire()
|
|
|
|
try:
|
|
|
|
if self.open_pid == os.getpid():
|
|
|
|
return
|
|
|
|
ts = time.strftime('%Y%m%d_%H%M%S')
|
|
|
|
path = self.template % (os.getpid(), ts)
|
|
|
|
self.stream = open(path, 'w', 1)
|
|
|
|
set_cloexec(self.stream.fileno())
|
|
|
|
self.stream.write('Parent PID: %s\n' % (os.getppid(),))
|
|
|
|
self.stream.write('Created by:\n\n%s\n' % (
|
|
|
|
''.join(traceback.format_stack()),
|
|
|
|
))
|
|
|
|
self.open_pid = os.getpid()
|
|
|
|
finally:
|
|
|
|
self.release()
|
|
|
|
|
|
|
|
def emit(self, record):
|
|
|
|
if self.open_pid != os.getpid():
|
|
|
|
self._reopen()
|
|
|
|
logging.StreamHandler.emit(self, record)
|
|
|
|
|
|
|
|
|
|
|
|
def enable_debug_logging():
|
|
|
|
global _v, _vv
|
|
|
|
_v = True
|
|
|
|
_vv = True
|
|
|
|
root = logging.getLogger()
|
|
|
|
root.setLevel(logging.DEBUG)
|
|
|
|
IOLOG.setLevel(logging.DEBUG)
|
|
|
|
handler = PidfulStreamHandler()
|
|
|
|
handler.formatter = logging.Formatter(
|
|
|
|
'%(asctime)s %(levelname).1s %(name)s: %(message)s',
|
|
|
|
'%H:%M:%S'
|
|
|
|
)
|
|
|
|
root.handlers.insert(0, handler)
|
|
|
|
|
|
|
|
|
|
|
|
_profile_hook = lambda name, func, *args: func(*args)
|
|
|
|
_profile_fmt = os.environ.get(
|
|
|
|
'MITOGEN_PROFILE_FMT',
|
|
|
|
'/tmp/mitogen.stats.%(pid)s.%(identity)s.%(now)s.%(ext)s',
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
def _profile_hook(name, func, *args):
|
|
|
|
"""
|
|
|
|
Call `func(*args)` and return its result. This function is replaced by
|
|
|
|
:func:`_real_profile_hook` when :func:`enable_profiling` is called. This
|
|
|
|
interface is obsolete and will be replaced by a signals-based integration
|
|
|
|
later on.
|
|
|
|
"""
|
|
|
|
return func(*args)
|
|
|
|
|
|
|
|
|
|
|
|
def _real_profile_hook(name, func, *args):
|
|
|
|
profiler = cProfile.Profile()
|
|
|
|
profiler.enable()
|
|
|
|
try:
|
|
|
|
return func(*args)
|
|
|
|
finally:
|
|
|
|
path = _profile_fmt % {
|
|
|
|
'now': int(1e6 * now()),
|
|
|
|
'identity': name,
|
|
|
|
'pid': os.getpid(),
|
|
|
|
'ext': '%s'
|
|
|
|
}
|
|
|
|
profiler.dump_stats(path % ('pstats',))
|
|
|
|
profiler.create_stats()
|
|
|
|
fp = open(path % ('log',), 'w')
|
|
|
|
try:
|
|
|
|
stats = pstats.Stats(profiler, stream=fp)
|
|
|
|
stats.sort_stats('cumulative')
|
|
|
|
stats.print_stats()
|
|
|
|
finally:
|
|
|
|
fp.close()
|
|
|
|
|
|
|
|
|
|
|
|
def enable_profiling(econtext=None):
|
|
|
|
global _profile_hook
|
|
|
|
_profile_hook = _real_profile_hook
|
|
|
|
|
|
|
|
|
|
|
|
def import_module(modname):
|
|
|
|
"""
|
|
|
|
Import `module` and return the attribute named `attr`.
|
|
|
|
"""
|
|
|
|
return __import__(modname, None, None, [''])
|
|
|
|
|
|
|
|
|
|
|
|
def pipe():
|
|
|
|
"""
|
|
|
|
Create a UNIX pipe pair using :func:`os.pipe`, wrapping the returned
|
|
|
|
descriptors in Python file objects in order to manage their lifetime and
|
|
|
|
ensure they are closed when their last reference is discarded and they have
|
|
|
|
not been closed explicitly.
|
|
|
|
"""
|
|
|
|
rfd, wfd = os.pipe()
|
|
|
|
return (
|
|
|
|
os.fdopen(rfd, 'rb', 0),
|
|
|
|
os.fdopen(wfd, 'wb', 0)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
def iter_split(buf, delim, func):
|
|
|
|
"""
|
|
|
|
Invoke `func(s)` for each `delim`-delimited chunk in the potentially large
|
|
|
|
`buf`, avoiding intermediate lists and quadratic string operations. Return
|
|
|
|
the trailing undelimited portion of `buf`, or any unprocessed portion of
|
|
|
|
`buf` after `func(s)` returned :data:`False`.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
`(trailer, cont)`, where `cont` is :data:`False` if the last call to
|
|
|
|
`func(s)` returned :data:`False`.
|
|
|
|
"""
|
|
|
|
dlen = len(delim)
|
|
|
|
start = 0
|
|
|
|
cont = True
|
|
|
|
while cont:
|
|
|
|
nl = buf.find(delim, start)
|
|
|
|
if nl == -1:
|
|
|
|
break
|
|
|
|
cont = not func(buf[start:nl]) is False
|
|
|
|
start = nl + dlen
|
|
|
|
return buf[start:], cont
|
|
|
|
|
|
|
|
|
|
|
|
class Py24Pickler(py_pickle.Pickler):
|
|
|
|
"""
|
|
|
|
Exceptions were classic classes until Python 2.5. Sadly for 2.4, cPickle
|
|
|
|
offers little control over how a classic instance is pickled. Therefore 2.4
|
|
|
|
uses a pure-Python pickler, so CallError can be made to look as it does on
|
|
|
|
newer Pythons.
|
|
|
|
|
|
|
|
This mess will go away once proper serialization exists.
|
|
|
|
"""
|
|
|
|
@classmethod
|
|
|
|
def dumps(cls, obj, protocol):
|
|
|
|
bio = BytesIO()
|
|
|
|
self = cls(bio, protocol=protocol)
|
|
|
|
self.dump(obj)
|
|
|
|
return bio.getvalue()
|
|
|
|
|
|
|
|
def save_exc_inst(self, obj):
|
|
|
|
if isinstance(obj, CallError):
|
|
|
|
func, args = obj.__reduce__()
|
|
|
|
self.save(func)
|
|
|
|
self.save(args)
|
|
|
|
self.write(py_pickle.REDUCE)
|
|
|
|
else:
|
|
|
|
py_pickle.Pickler.save_inst(self, obj)
|
|
|
|
|
|
|
|
if PY24:
|
|
|
|
dispatch = py_pickle.Pickler.dispatch.copy()
|
|
|
|
dispatch[py_pickle.InstanceType] = save_exc_inst
|
|
|
|
|
|
|
|
|
|
|
|
if PY3:
|
|
|
|
# In 3.x Unpickler is a class exposing find_class as an overridable, but it
|
|
|
|
# cannot be overridden without subclassing.
|
|
|
|
class _Unpickler(pickle.Unpickler):
|
|
|
|
def find_class(self, module, func):
|
|
|
|
return self.find_global(module, func)
|
|
|
|
pickle__dumps = pickle.dumps
|
|
|
|
elif PY24:
|
|
|
|
# On Python 2.4, we must use a pure-Python pickler.
|
|
|
|
pickle__dumps = Py24Pickler.dumps
|
|
|
|
_Unpickler = pickle.Unpickler
|
|
|
|
else:
|
|
|
|
pickle__dumps = pickle.dumps
|
|
|
|
# In 2.x Unpickler is a function exposing a writeable find_global
|
|
|
|
# attribute.
|
|
|
|
_Unpickler = pickle.Unpickler
|
|
|
|
|
|
|
|
|
|
|
|
class Message(object):
|
|
|
|
"""
|
|
|
|
Messages are the fundamental unit of communication, comprising fields from
|
|
|
|
the :ref:`stream-protocol` header, an optional reference to the receiving
|
|
|
|
:class:`mitogen.core.Router` for ingress messages, and helper methods for
|
|
|
|
deserialization and generating replies.
|
|
|
|
"""
|
|
|
|
#: Integer target context ID. :class:`Router` delivers messages locally
|
|
|
|
#: when their :attr:`dst_id` matches :data:`mitogen.context_id`, otherwise
|
|
|
|
#: they are routed up or downstream.
|
|
|
|
dst_id = None
|
|
|
|
|
|
|
|
#: Integer source context ID. Used as the target of replies if any are
|
|
|
|
#: generated.
|
|
|
|
src_id = None
|
|
|
|
|
|
|
|
#: Context ID under whose authority the message is acting. See
|
|
|
|
#: :ref:`source-verification`.
|
|
|
|
auth_id = None
|
|
|
|
|
|
|
|
#: Integer target handle in the destination context. This is one of the
|
|
|
|
#: :ref:`standard-handles`, or a dynamically generated handle used to
|
|
|
|
#: receive a one-time reply, such as the return value of a function call.
|
|
|
|
handle = None
|
|
|
|
|
|
|
|
#: Integer target handle to direct any reply to this message. Used to
|
|
|
|
#: receive a one-time reply, such as the return value of a function call.
|
|
|
|
#: :data:`IS_DEAD` has a special meaning when it appears in this field.
|
|
|
|
reply_to = None
|
|
|
|
|
|
|
|
#: Raw message data bytes.
|
|
|
|
data = b('')
|
|
|
|
|
|
|
|
_unpickled = object()
|
|
|
|
|
|
|
|
#: The :class:`Router` responsible for routing the message. This is
|
|
|
|
#: :data:`None` for locally originated messages.
|
|
|
|
router = None
|
|
|
|
|
|
|
|
#: The :class:`Receiver` over which the message was last received. Part of
|
|
|
|
#: the :class:`mitogen.select.Select` interface. Defaults to :data:`None`.
|
|
|
|
receiver = None
|
|
|
|
|
|
|
|
HEADER_FMT = '>hLLLLLL'
|
|
|
|
HEADER_LEN = struct.calcsize(HEADER_FMT)
|
|
|
|
HEADER_MAGIC = 0x4d49 # 'MI'
|
|
|
|
|
|
|
|
def __init__(self, **kwargs):
|
|
|
|
"""
|
|
|
|
Construct a message from from the supplied `kwargs`. :attr:`src_id` and
|
|
|
|
:attr:`auth_id` are always set to :data:`mitogen.context_id`.
|
|
|
|
"""
|
|
|
|
self.src_id = mitogen.context_id
|
|
|
|
self.auth_id = mitogen.context_id
|
|
|
|
vars(self).update(kwargs)
|
|
|
|
assert isinstance(self.data, BytesType)
|
|
|
|
|
|
|
|
def pack(self):
|
|
|
|
return (
|
|
|
|
struct.pack(self.HEADER_FMT, self.HEADER_MAGIC, self.dst_id,
|
|
|
|
self.src_id, self.auth_id, self.handle,
|
|
|
|
self.reply_to or 0, len(self.data))
|
|
|
|
+ self.data
|
|
|
|
)
|
|
|
|
|
|
|
|
def _unpickle_context(self, context_id, name):
|
|
|
|
return _unpickle_context(context_id, name, router=self.router)
|
|
|
|
|
|
|
|
def _unpickle_sender(self, context_id, dst_handle):
|
|
|
|
return _unpickle_sender(self.router, context_id, dst_handle)
|
|
|
|
|
|
|
|
def _unpickle_bytes(self, s, encoding):
|
|
|
|
s, n = LATIN1_CODEC.encode(s)
|
|
|
|
return s
|
|
|
|
|
|
|
|
def _find_global(self, module, func):
|
|
|
|
"""
|
|
|
|
Return the class implementing `module_name.class_name` or raise
|
|
|
|
`StreamError` if the module is not whitelisted.
|
|
|
|
"""
|
|
|
|
if module == __name__:
|
|
|
|
if func == '_unpickle_call_error' or func == 'CallError':
|
|
|
|
return _unpickle_call_error
|
|
|
|
elif func == '_unpickle_sender':
|
|
|
|
return self._unpickle_sender
|
|
|
|
elif func == '_unpickle_context':
|
|
|
|
return self._unpickle_context
|
|
|
|
elif func == 'Blob':
|
|
|
|
return Blob
|
|
|
|
elif func == 'Secret':
|
|
|
|
return Secret
|
|
|
|
elif func == 'Kwargs':
|
|
|
|
return Kwargs
|
|
|
|
elif module == '_codecs' and func == 'encode':
|
|
|
|
return self._unpickle_bytes
|
|
|
|
elif module == '__builtin__' and func == 'bytes':
|
|
|
|
return BytesType
|
|
|
|
raise StreamError('cannot unpickle %r/%r', module, func)
|
|
|
|
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
@property
|
|
|
|
def is_dead(self):
|
|
|
|
"""
|
|
|
|
:data:`True` if :attr:`reply_to` is set to the magic value
|
|
|
|
:data:`IS_DEAD`, indicating the sender considers the channel dead. Dead
|
|
|
|
messages can be raised in a variety of circumstances, see
|
|
|
|
:data:`IS_DEAD` for more information.
|
|
|
|
"""
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
return self.reply_to == IS_DEAD
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def dead(cls, reason=None, **kwargs):
|
|
|
|
"""
|
|
|
|
Syntax helper to construct a dead message.
|
|
|
|
"""
|
|
|
|
kwargs['data'], _ = encodings.utf_8.encode(reason or u'')
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
return cls(reply_to=IS_DEAD, **kwargs)
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def pickled(cls, obj, **kwargs):
|
|
|
|
"""
|
|
|
|
Construct a pickled message, setting :attr:`data` to the serialization
|
|
|
|
of `obj`, and setting remaining fields using `kwargs`.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
The new message.
|
|
|
|
"""
|
|
|
|
self = cls(**kwargs)
|
|
|
|
try:
|
|
|
|
self.data = pickle__dumps(obj, protocol=2)
|
|
|
|
except pickle.PicklingError:
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
self.data = pickle__dumps(CallError(e), protocol=2)
|
|
|
|
return self
|
|
|
|
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
def reply(self, msg, router=None, **kwargs):
|
|
|
|
"""
|
|
|
|
Compose a reply to this message and send it using :attr:`router`, or
|
|
|
|
`router` is :attr:`router` is :data:`None`.
|
|
|
|
|
|
|
|
:param obj:
|
|
|
|
Either a :class:`Message`, or an object to be serialized in order
|
|
|
|
to construct a new message.
|
|
|
|
:param router:
|
|
|
|
Optional router to use if :attr:`router` is :data:`None`.
|
|
|
|
:param kwargs:
|
|
|
|
Optional keyword parameters overriding message fields in the reply.
|
|
|
|
"""
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
if not isinstance(msg, Message):
|
|
|
|
msg = Message.pickled(msg)
|
|
|
|
msg.dst_id = self.src_id
|
|
|
|
msg.handle = self.reply_to
|
|
|
|
vars(msg).update(kwargs)
|
|
|
|
if msg.handle:
|
|
|
|
(self.router or router).route(msg)
|
|
|
|
else:
|
|
|
|
LOG.debug('dropping reply to message with no return address: %r',
|
|
|
|
msg)
|
|
|
|
|
|
|
|
if PY3:
|
|
|
|
UNPICKLER_KWARGS = {'encoding': 'bytes'}
|
|
|
|
else:
|
|
|
|
UNPICKLER_KWARGS = {}
|
|
|
|
|
|
|
|
def _throw_dead(self):
|
|
|
|
if len(self.data):
|
|
|
|
raise ChannelError(self.data.decode('utf-8', 'replace'))
|
|
|
|
elif self.src_id == mitogen.context_id:
|
|
|
|
raise ChannelError(ChannelError.local_msg)
|
|
|
|
else:
|
|
|
|
raise ChannelError(ChannelError.remote_msg)
|
|
|
|
|
|
|
|
def unpickle(self, throw=True, throw_dead=True):
|
|
|
|
"""
|
|
|
|
Unpickle :attr:`data`, optionally raising any exceptions present.
|
|
|
|
|
|
|
|
:param bool throw_dead:
|
|
|
|
If :data:`True`, raise exceptions, otherwise it is the caller's
|
|
|
|
responsibility.
|
|
|
|
|
|
|
|
:raises CallError:
|
|
|
|
The serialized data contained CallError exception.
|
|
|
|
:raises ChannelError:
|
|
|
|
The `is_dead` field was set.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.unpickle()', self)
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
if throw_dead and self.is_dead:
|
|
|
|
self._throw_dead()
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
|
|
|
|
obj = self._unpickled
|
|
|
|
if obj is Message._unpickled:
|
|
|
|
fp = BytesIO(self.data)
|
|
|
|
unpickler = _Unpickler(fp, **self.UNPICKLER_KWARGS)
|
|
|
|
unpickler.find_global = self._find_global
|
|
|
|
try:
|
|
|
|
# Must occur off the broker thread.
|
|
|
|
try:
|
|
|
|
obj = unpickler.load()
|
|
|
|
except:
|
|
|
|
LOG.error('raw pickle was: %r', self.data)
|
|
|
|
raise
|
|
|
|
self._unpickled = obj
|
|
|
|
except (TypeError, ValueError):
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
raise StreamError('invalid message: %s', e)
|
|
|
|
|
|
|
|
if throw:
|
|
|
|
if isinstance(obj, CallError):
|
|
|
|
raise obj
|
|
|
|
|
|
|
|
return obj
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Message(%r, %r, %r, %r, %r, %r..%d)' % (
|
|
|
|
self.dst_id, self.src_id, self.auth_id, self.handle,
|
|
|
|
self.reply_to, (self.data or '')[:50], len(self.data)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
class Sender(object):
|
|
|
|
"""
|
|
|
|
Senders are used to send pickled messages to a handle in another context,
|
|
|
|
it is the inverse of :class:`mitogen.core.Receiver`.
|
|
|
|
|
|
|
|
Senders may be serialized, making them convenient to wire up data flows.
|
|
|
|
See :meth:`mitogen.core.Receiver.to_sender` for more information.
|
|
|
|
|
|
|
|
:param mitogen.core.Context context:
|
|
|
|
Context to send messages to.
|
|
|
|
:param int dst_handle:
|
|
|
|
Destination handle to send messages to.
|
|
|
|
"""
|
|
|
|
def __init__(self, context, dst_handle):
|
|
|
|
self.context = context
|
|
|
|
self.dst_handle = dst_handle
|
|
|
|
|
|
|
|
def send(self, data):
|
|
|
|
"""
|
|
|
|
Send `data` to the remote end.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.send(%r..)', self, repr(data)[:100])
|
|
|
|
self.context.send(Message.pickled(data, handle=self.dst_handle))
|
|
|
|
|
|
|
|
explicit_close_msg = 'Sender was explicitly closed'
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
"""
|
|
|
|
Send a dead message to the remote, causing :meth:`ChannelError` to be
|
|
|
|
raised in any waiting thread.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.close()', self)
|
|
|
|
self.context.send(
|
|
|
|
Message.dead(
|
|
|
|
reason=self.explicit_close_msg,
|
|
|
|
handle=self.dst_handle
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Sender(%r, %r)' % (self.context, self.dst_handle)
|
|
|
|
|
|
|
|
def __reduce__(self):
|
|
|
|
return _unpickle_sender, (self.context.context_id, self.dst_handle)
|
|
|
|
|
|
|
|
|
|
|
|
def _unpickle_sender(router, context_id, dst_handle):
|
|
|
|
if not (isinstance(router, Router) and
|
|
|
|
isinstance(context_id, (int, long)) and context_id >= 0 and
|
|
|
|
isinstance(dst_handle, (int, long)) and dst_handle > 0):
|
|
|
|
raise TypeError('cannot unpickle Sender: bad input or missing router')
|
|
|
|
return Sender(Context(router, context_id), dst_handle)
|
|
|
|
|
|
|
|
|
|
|
|
class Receiver(object):
|
|
|
|
"""
|
|
|
|
Receivers maintain a thread-safe queue of messages sent to a handle of this
|
|
|
|
context from another context.
|
|
|
|
|
|
|
|
:param mitogen.core.Router router:
|
|
|
|
Router to register the handler on.
|
|
|
|
|
|
|
|
:param int handle:
|
|
|
|
If not :data:`None`, an explicit handle to register, otherwise an
|
|
|
|
unused handle is chosen.
|
|
|
|
|
|
|
|
:param bool persist:
|
|
|
|
If :data:`False`, unregister the handler after one message is received.
|
|
|
|
Single-message receivers are intended for RPC-like transactions, such
|
|
|
|
as in the case of :meth:`mitogen.parent.Context.call_async`.
|
|
|
|
|
|
|
|
:param mitogen.core.Context respondent:
|
|
|
|
Context this receiver is receiving from. If not :data:`None`, arranges
|
|
|
|
for the receiver to receive a dead message if messages can no longer be
|
|
|
|
routed to the context due to disconnection, and ignores messages that
|
|
|
|
did not originate from the respondent context.
|
|
|
|
"""
|
|
|
|
#: If not :data:`None`, a function invoked as `notify(receiver)` after a
|
|
|
|
#: message has been received. The function is invoked on :class:`Broker`
|
|
|
|
#: thread, therefore it must not block. Used by
|
|
|
|
#: :class:`mitogen.select.Select` to efficiently implement waiting on
|
|
|
|
#: multiple event sources.
|
|
|
|
notify = None
|
|
|
|
|
|
|
|
raise_channelerror = True
|
|
|
|
|
|
|
|
def __init__(self, router, handle=None, persist=True,
|
|
|
|
respondent=None, policy=None, overwrite=False):
|
|
|
|
self.router = router
|
|
|
|
#: The handle.
|
|
|
|
self.handle = handle # Avoid __repr__ crash in add_handler()
|
core: race during Receiver construction.
It's possible for a message to arrive after .add_handler() but before
Latch construction.
This is papering over a bigger problem with service pool instantiation.
https://travis-ci.org/dw/mitogen/jobs/390409832#L2901
TASK [Spin up a few interpreters] **********************************************
changed: [target] => (item=1)
ERROR! [pid 5355] 14:47:50.224945 E mitogen.ctx.ssh.localhost:2201.sudo.mitogen__user2: mitogen: Router(Broker(0x7f1e93911450))._invoke(Message(19100, 19095, 19095, 110, 1005, '\x80\x02U\x1fmitogen.service.PushFileServiceq\x01U\x11store_and_f'..8955)): <bound method Receiver._on_receive of Receiver(Router(Broker(0x7f1e93911450)), 110)> crashed
Traceback (most recent call last):
File "<stdin>", line 1471, in _invoke
File "<stdin>", line 491, in _on_receive
AttributeError: 'Receiver' object has no attribute '_latch'
6 years ago
|
|
|
self._latch = Latch() # Must exist prior to .add_handler()
|
|
|
|
self.handle = router.add_handler(
|
|
|
|
fn=self._on_receive,
|
|
|
|
handle=handle,
|
|
|
|
policy=policy,
|
|
|
|
persist=persist,
|
|
|
|
respondent=respondent,
|
|
|
|
overwrite=overwrite,
|
|
|
|
)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Receiver(%r, %r)' % (self.router, self.handle)
|
|
|
|
|
|
|
|
def __enter__(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
def __exit__(self, _1, _2, _3):
|
|
|
|
self.close()
|
|
|
|
|
|
|
|
def to_sender(self):
|
|
|
|
"""
|
|
|
|
Return a :class:`Sender` configured to deliver messages to this
|
|
|
|
receiver. As senders are serializable, this makes it convenient to pass
|
|
|
|
`(context_id, handle)` pairs around::
|
|
|
|
|
|
|
|
def deliver_monthly_report(sender):
|
|
|
|
for line in open('monthly_report.txt'):
|
|
|
|
sender.send(line)
|
|
|
|
sender.close()
|
|
|
|
|
|
|
|
@mitogen.main()
|
|
|
|
def main(router):
|
|
|
|
remote = router.ssh(hostname='mainframe')
|
|
|
|
recv = mitogen.core.Receiver(router)
|
|
|
|
remote.call(deliver_monthly_report, recv.to_sender())
|
|
|
|
for msg in recv:
|
|
|
|
print(msg)
|
|
|
|
"""
|
|
|
|
return Sender(self.router.myself(), self.handle)
|
|
|
|
|
|
|
|
def _on_receive(self, msg):
|
|
|
|
"""
|
|
|
|
Callback registered for the handle with :class:`Router`; appends data
|
|
|
|
to the internal queue.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r._on_receive(%r)', self, msg)
|
|
|
|
self._latch.put(msg)
|
|
|
|
if self.notify:
|
|
|
|
self.notify(self)
|
|
|
|
|
|
|
|
closed_msg = 'the Receiver has been closed'
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
"""
|
|
|
|
Unregister the receiver's handle from its associated router, and cause
|
|
|
|
:class:`ChannelError` to be raised in any thread waiting in :meth:`get`
|
|
|
|
on this receiver.
|
|
|
|
"""
|
|
|
|
if self.handle:
|
|
|
|
self.router.del_handler(self.handle)
|
|
|
|
self.handle = None
|
|
|
|
self._latch.close()
|
|
|
|
|
|
|
|
def size(self):
|
|
|
|
"""
|
|
|
|
Return the number of items currently buffered.
|
|
|
|
|
|
|
|
As with :class:`Queue.Queue`, `0` may be returned even though a
|
|
|
|
subsequent call to :meth:`get` will succeed, since a message may be
|
|
|
|
posted at any moment between :meth:`size` and :meth:`get`.
|
|
|
|
|
|
|
|
As with :class:`Queue.Queue`, `>0` may be returned even though a
|
|
|
|
subsequent call to :meth:`get` will block, since another waiting thread
|
|
|
|
may be woken at any moment between :meth:`size` and :meth:`get`.
|
|
|
|
|
|
|
|
:raises LatchError:
|
|
|
|
The underlying latch has already been marked closed.
|
|
|
|
"""
|
|
|
|
return self._latch.size()
|
|
|
|
|
|
|
|
def empty(self):
|
|
|
|
"""
|
|
|
|
Return `size() == 0`.
|
|
|
|
|
|
|
|
.. deprecated:: 0.2.8
|
|
|
|
Use :meth:`size` instead.
|
|
|
|
|
|
|
|
:raises LatchError:
|
|
|
|
The latch has already been marked closed.
|
|
|
|
"""
|
|
|
|
return self._latch.empty()
|
|
|
|
|
|
|
|
def get(self, timeout=None, block=True, throw_dead=True):
|
|
|
|
"""
|
|
|
|
Sleep waiting for a message to arrive on this receiver.
|
|
|
|
|
|
|
|
:param float timeout:
|
|
|
|
If not :data:`None`, specifies a timeout in seconds.
|
|
|
|
|
|
|
|
:raises mitogen.core.ChannelError:
|
|
|
|
The remote end indicated the channel should be closed,
|
|
|
|
communication with it was lost, or :meth:`close` was called in the
|
|
|
|
local process.
|
|
|
|
|
|
|
|
:raises mitogen.core.TimeoutError:
|
|
|
|
Timeout was reached.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
:class:`Message` that was received.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.get(timeout=%r, block=%r)', self, timeout, block)
|
|
|
|
try:
|
|
|
|
msg = self._latch.get(timeout=timeout, block=block)
|
|
|
|
except LatchError:
|
|
|
|
raise ChannelError(self.closed_msg)
|
|
|
|
if msg.is_dead and throw_dead:
|
|
|
|
msg._throw_dead()
|
|
|
|
return msg
|
|
|
|
|
|
|
|
def __iter__(self):
|
|
|
|
"""
|
|
|
|
Yield consecutive :class:`Message` instances delivered to this receiver
|
|
|
|
until :class:`ChannelError` is raised.
|
|
|
|
"""
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
msg = self.get()
|
|
|
|
except ChannelError:
|
|
|
|
return
|
|
|
|
yield msg
|
|
|
|
|
|
|
|
|
|
|
|
class Channel(Sender, Receiver):
|
|
|
|
"""
|
|
|
|
A channel inherits from :class:`mitogen.core.Sender` and
|
|
|
|
`mitogen.core.Receiver` to provide bidirectional functionality.
|
|
|
|
|
|
|
|
.. deprecated:: 0.2.0
|
|
|
|
This class is incomplete and obsolete, it will be removed in Mitogen
|
|
|
|
0.3.
|
|
|
|
|
|
|
|
Channels were an early attempt at syntax sugar. It is always easier to pass
|
|
|
|
around unidirectional pairs of senders/receivers, even though the syntax is
|
|
|
|
baroque:
|
|
|
|
|
|
|
|
.. literalinclude:: ../examples/ping_pong.py
|
|
|
|
|
|
|
|
Since all handles aren't known until after both ends are constructed, for
|
|
|
|
both ends to communicate through a channel, it is necessary for one end to
|
|
|
|
retrieve the handle allocated to the other and reconfigure its own channel
|
|
|
|
to match. Currently this is a manual task.
|
|
|
|
"""
|
|
|
|
def __init__(self, router, context, dst_handle, handle=None):
|
|
|
|
Sender.__init__(self, context, dst_handle)
|
|
|
|
Receiver.__init__(self, router, handle)
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
Receiver.close(self)
|
|
|
|
Sender.close(self)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Channel(%s, %s)' % (
|
|
|
|
Sender.__repr__(self),
|
|
|
|
Receiver.__repr__(self)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
class Importer(object):
|
|
|
|
"""
|
|
|
|
Import protocol implementation that fetches modules from the parent
|
|
|
|
process.
|
|
|
|
|
|
|
|
:param context: Context to communicate via.
|
|
|
|
"""
|
|
|
|
# The Mitogen package is handled specially, since the child context must
|
|
|
|
# construct it manually during startup.
|
|
|
|
MITOGEN_PKG_CONTENT = [
|
|
|
|
'buildah',
|
|
|
|
'compat',
|
|
|
|
'debug',
|
|
|
|
'doas',
|
|
|
|
'docker',
|
|
|
|
'kubectl',
|
|
|
|
'fakessh',
|
|
|
|
'fork',
|
|
|
|
'jail',
|
|
|
|
'lxc',
|
|
|
|
'lxd',
|
|
|
|
'master',
|
|
|
|
'minify',
|
|
|
|
'os_fork',
|
|
|
|
'parent',
|
|
|
|
'select',
|
|
|
|
'service',
|
|
|
|
'setns',
|
|
|
|
'ssh',
|
|
|
|
'su',
|
|
|
|
'sudo',
|
|
|
|
'utils',
|
|
|
|
]
|
|
|
|
|
|
|
|
ALWAYS_BLACKLIST = [
|
|
|
|
# 2.x generates needless imports for 'builtins', while 3.x does the
|
|
|
|
# same for '__builtin__'. The correct one is built-in, the other always
|
|
|
|
# a negative round-trip.
|
|
|
|
'builtins',
|
|
|
|
'__builtin__',
|
|
|
|
'thread',
|
|
|
|
|
|
|
|
# org.python.core imported by copy, pickle, xml.sax; breaks Jython, but
|
|
|
|
# very unlikely to trigger a bug report.
|
|
|
|
'org',
|
|
|
|
]
|
|
|
|
|
|
|
|
if PY3:
|
|
|
|
ALWAYS_BLACKLIST += ['cStringIO']
|
|
|
|
|
|
|
|
def __init__(self, router, context, core_src, whitelist=(), blacklist=()):
|
|
|
|
self._log = logging.getLogger('mitogen.importer')
|
|
|
|
self._context = context
|
|
|
|
self._present = {'mitogen': self.MITOGEN_PKG_CONTENT}
|
|
|
|
self._lock = threading.Lock()
|
|
|
|
self.whitelist = list(whitelist) or ['']
|
|
|
|
self.blacklist = list(blacklist) + self.ALWAYS_BLACKLIST
|
|
|
|
|
|
|
|
# Preserve copies of the original server-supplied whitelist/blacklist
|
|
|
|
# for later use by children.
|
|
|
|
self.master_whitelist = self.whitelist[:]
|
|
|
|
self.master_blacklist = self.blacklist[:]
|
|
|
|
|
|
|
|
# Presence of an entry in this map indicates in-flight GET_MODULE.
|
|
|
|
self._callbacks = {}
|
|
|
|
self._cache = {}
|
|
|
|
if core_src:
|
|
|
|
self._update_linecache('x/mitogen/core.py', core_src)
|
|
|
|
self._cache['mitogen.core'] = (
|
|
|
|
'mitogen.core',
|
|
|
|
None,
|
|
|
|
'x/mitogen/core.py',
|
|
|
|
zlib.compress(core_src, 9),
|
|
|
|
[],
|
|
|
|
)
|
|
|
|
self._install_handler(router)
|
|
|
|
|
|
|
|
def _update_linecache(self, path, data):
|
|
|
|
"""
|
|
|
|
The Python 2.4 linecache module, used to fetch source code for
|
|
|
|
tracebacks and :func:`inspect.getsource`, does not support PEP-302,
|
|
|
|
meaning it needs extra help to for Mitogen-loaded modules. Directly
|
|
|
|
populate its cache if a loaded module belongs to the Mitogen package.
|
|
|
|
"""
|
|
|
|
if PY24 and 'mitogen' in path:
|
|
|
|
linecache.cache[path] = (
|
|
|
|
len(data),
|
|
|
|
0.0,
|
|
|
|
[line+'\n' for line in data.splitlines()],
|
|
|
|
path,
|
|
|
|
)
|
|
|
|
|
|
|
|
def _install_handler(self, router):
|
|
|
|
router.add_handler(
|
|
|
|
fn=self._on_load_module,
|
|
|
|
handle=LOAD_MODULE,
|
|
|
|
policy=has_parent_authority,
|
|
|
|
)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Importer'
|
|
|
|
|
importer: avoid duplicate module load(!); closes #113.
Amazed this one managed to scrape through for so long. Calling
__import__ from within find_module() was causing the target module, in
this case cookielib, to be loaded *then overwritten* by a subsequent
duplicate load higher in the stack.
The result is that cookielib was loaded twice, and, per usual Python
import semantics, a reference to the partially initialized first
cookielib was installed in sys.modules while its code executed.
At the end of cookielib on 2.x, it imports _LWPCookieJar, which in turn
imports the partially built cookielib from sys.modules, then subclasses
the CookieJar from /that/ module.
Everything is wonderful. Then the call returns back up into the import
mechanism which restarts the entire process -- only this time,
_LWPCookieJar is /not/ reinitialized, so the copy in sys.modules is
still left with types pointing at the old module!
So the duplicate import creates a new CookieJar which is not the base
class of LWPCookieJar. Tada! 3 hours debugging.
This is probably a performance fix in disguise, didn't realize things
were so broken. It may also be a regression elsewhere. Urgently need to
finish the tests.
7 years ago
|
|
|
def builtin_find_module(self, fullname):
|
|
|
|
# imp.find_module() will always succeed for __main__, because it is a
|
|
|
|
# built-in module. That means it exists on a special linked list deep
|
|
|
|
# within the bowels of the interpreter. We must special case it.
|
|
|
|
if fullname == '__main__':
|
|
|
|
raise ModuleNotFoundError()
|
|
|
|
|
|
|
|
parent, _, modname = str_rpartition(fullname, '.')
|
importer: avoid duplicate module load(!); closes #113.
Amazed this one managed to scrape through for so long. Calling
__import__ from within find_module() was causing the target module, in
this case cookielib, to be loaded *then overwritten* by a subsequent
duplicate load higher in the stack.
The result is that cookielib was loaded twice, and, per usual Python
import semantics, a reference to the partially initialized first
cookielib was installed in sys.modules while its code executed.
At the end of cookielib on 2.x, it imports _LWPCookieJar, which in turn
imports the partially built cookielib from sys.modules, then subclasses
the CookieJar from /that/ module.
Everything is wonderful. Then the call returns back up into the import
mechanism which restarts the entire process -- only this time,
_LWPCookieJar is /not/ reinitialized, so the copy in sys.modules is
still left with types pointing at the old module!
So the duplicate import creates a new CookieJar which is not the base
class of LWPCookieJar. Tada! 3 hours debugging.
This is probably a performance fix in disguise, didn't realize things
were so broken. It may also be a regression elsewhere. Urgently need to
finish the tests.
7 years ago
|
|
|
if parent:
|
|
|
|
path = sys.modules[parent].__path__
|
|
|
|
else:
|
|
|
|
path = None
|
|
|
|
|
importer: avoid duplicate module load(!); closes #113.
Amazed this one managed to scrape through for so long. Calling
__import__ from within find_module() was causing the target module, in
this case cookielib, to be loaded *then overwritten* by a subsequent
duplicate load higher in the stack.
The result is that cookielib was loaded twice, and, per usual Python
import semantics, a reference to the partially initialized first
cookielib was installed in sys.modules while its code executed.
At the end of cookielib on 2.x, it imports _LWPCookieJar, which in turn
imports the partially built cookielib from sys.modules, then subclasses
the CookieJar from /that/ module.
Everything is wonderful. Then the call returns back up into the import
mechanism which restarts the entire process -- only this time,
_LWPCookieJar is /not/ reinitialized, so the copy in sys.modules is
still left with types pointing at the old module!
So the duplicate import creates a new CookieJar which is not the base
class of LWPCookieJar. Tada! 3 hours debugging.
This is probably a performance fix in disguise, didn't realize things
were so broken. It may also be a regression elsewhere. Urgently need to
finish the tests.
7 years ago
|
|
|
fp, pathname, description = imp.find_module(modname, path)
|
|
|
|
if fp:
|
|
|
|
fp.close()
|
|
|
|
|
|
|
|
def find_module(self, fullname, path=None):
|
|
|
|
if hasattr(_tls, 'running'):
|
|
|
|
return None
|
|
|
|
|
|
|
|
_tls.running = True
|
|
|
|
try:
|
|
|
|
#_v and self._log.debug('Python requested %r', fullname)
|
|
|
|
fullname = to_text(fullname)
|
|
|
|
pkgname, dot, _ = str_rpartition(fullname, '.')
|
|
|
|
pkg = sys.modules.get(pkgname)
|
|
|
|
if pkgname and getattr(pkg, '__loader__', None) is not self:
|
|
|
|
self._log.debug('%s is submodule of a locally loaded package',
|
|
|
|
fullname)
|
|
|
|
return None
|
|
|
|
|
|
|
|
suffix = fullname[len(pkgname+dot):]
|
|
|
|
if pkgname and suffix not in self._present.get(pkgname, ()):
|
|
|
|
self._log.debug('%s has no submodule %s', pkgname, suffix)
|
|
|
|
return None
|
|
|
|
|
|
|
|
# #114: explicitly whitelisted prefixes override any
|
|
|
|
# system-installed package.
|
|
|
|
if self.whitelist != ['']:
|
|
|
|
if any(fullname.startswith(s) for s in self.whitelist):
|
|
|
|
return self
|
|
|
|
|
|
|
|
try:
|
importer: avoid duplicate module load(!); closes #113.
Amazed this one managed to scrape through for so long. Calling
__import__ from within find_module() was causing the target module, in
this case cookielib, to be loaded *then overwritten* by a subsequent
duplicate load higher in the stack.
The result is that cookielib was loaded twice, and, per usual Python
import semantics, a reference to the partially initialized first
cookielib was installed in sys.modules while its code executed.
At the end of cookielib on 2.x, it imports _LWPCookieJar, which in turn
imports the partially built cookielib from sys.modules, then subclasses
the CookieJar from /that/ module.
Everything is wonderful. Then the call returns back up into the import
mechanism which restarts the entire process -- only this time,
_LWPCookieJar is /not/ reinitialized, so the copy in sys.modules is
still left with types pointing at the old module!
So the duplicate import creates a new CookieJar which is not the base
class of LWPCookieJar. Tada! 3 hours debugging.
This is probably a performance fix in disguise, didn't realize things
were so broken. It may also be a regression elsewhere. Urgently need to
finish the tests.
7 years ago
|
|
|
self.builtin_find_module(fullname)
|
|
|
|
_vv and self._log.debug('%r is available locally', fullname)
|
|
|
|
except ImportError:
|
|
|
|
_vv and self._log.debug('we will try to load %r', fullname)
|
|
|
|
return self
|
|
|
|
finally:
|
|
|
|
del _tls.running
|
|
|
|
|
|
|
|
blacklisted_msg = (
|
|
|
|
'%r is present in the Mitogen importer blacklist, therefore this '
|
|
|
|
'context will not attempt to request it from the master, as the '
|
|
|
|
'request will always be refused.'
|
|
|
|
)
|
|
|
|
pkg_resources_msg = (
|
|
|
|
'pkg_resources is prohibited from importing __main__, as it causes '
|
|
|
|
'problems in applications whose main module is not designed to be '
|
|
|
|
're-imported by children.'
|
|
|
|
)
|
|
|
|
absent_msg = (
|
|
|
|
'The Mitogen master process was unable to serve %r. It may be a '
|
|
|
|
'native Python extension, or it may be missing entirely. Check the '
|
|
|
|
'importer debug logs on the master for more information.'
|
|
|
|
)
|
|
|
|
|
|
|
|
def _refuse_imports(self, fullname):
|
|
|
|
if is_blacklisted_import(self, fullname):
|
|
|
|
raise ModuleNotFoundError(self.blacklisted_msg % (fullname,))
|
|
|
|
|
|
|
|
f = sys._getframe(2)
|
|
|
|
requestee = f.f_globals['__name__']
|
|
|
|
|
|
|
|
if fullname == '__main__' and requestee == 'pkg_resources':
|
|
|
|
# Anything that imports pkg_resources will eventually cause
|
|
|
|
# pkg_resources to try and scan __main__ for its __requires__
|
|
|
|
# attribute (pkg_resources/__init__.py::_build_master()). This
|
|
|
|
# breaks any app that is not expecting its __main__ to suddenly be
|
|
|
|
# sucked over a network and injected into a remote process, like
|
|
|
|
# py.test.
|
|
|
|
raise ModuleNotFoundError(self.pkg_resources_msg)
|
|
|
|
|
|
|
|
if fullname == 'pbr':
|
|
|
|
# It claims to use pkg_resources to read version information, which
|
|
|
|
# would result in PEP-302 being used, but it actually does direct
|
|
|
|
# filesystem access. So instead smodge the environment to override
|
|
|
|
# any version that was defined. This will probably break something
|
|
|
|
# later.
|
|
|
|
os.environ['PBR_VERSION'] = '0.0.0'
|
|
|
|
|
|
|
|
def _on_load_module(self, msg):
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
if msg.is_dead:
|
|
|
|
return
|
|
|
|
|
|
|
|
tup = msg.unpickle()
|
|
|
|
fullname = tup[0]
|
|
|
|
_v and self._log.debug('received %s', fullname)
|
|
|
|
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
self._cache[fullname] = tup
|
|
|
|
if tup[2] is not None and PY24:
|
|
|
|
self._update_linecache(
|
|
|
|
path='master:' + tup[2],
|
|
|
|
data=zlib.decompress(tup[3])
|
|
|
|
)
|
|
|
|
callbacks = self._callbacks.pop(fullname, [])
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
for callback in callbacks:
|
|
|
|
callback()
|
|
|
|
|
|
|
|
def _request_module(self, fullname, callback):
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
present = fullname in self._cache
|
|
|
|
if not present:
|
|
|
|
funcs = self._callbacks.get(fullname)
|
|
|
|
if funcs is not None:
|
|
|
|
_v and self._log.debug('existing request for %s in flight',
|
|
|
|
fullname)
|
|
|
|
funcs.append(callback)
|
|
|
|
else:
|
|
|
|
_v and self._log.debug('sending new %s request to parent',
|
|
|
|
fullname)
|
|
|
|
self._callbacks[fullname] = [callback]
|
|
|
|
self._context.send(
|
|
|
|
Message(data=b(fullname), handle=GET_MODULE)
|
|
|
|
)
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
if present:
|
|
|
|
callback()
|
|
|
|
|
|
|
|
def load_module(self, fullname):
|
|
|
|
fullname = to_text(fullname)
|
|
|
|
_v and self._log.debug('requesting %s', fullname)
|
|
|
|
self._refuse_imports(fullname)
|
|
|
|
|
|
|
|
event = threading.Event()
|
|
|
|
self._request_module(fullname, event.set)
|
|
|
|
event.wait()
|
|
|
|
|
|
|
|
ret = self._cache[fullname]
|
|
|
|
if ret[2] is None:
|
|
|
|
raise ModuleNotFoundError(self.absent_msg % (fullname,))
|
|
|
|
|
|
|
|
pkg_present = ret[1]
|
|
|
|
mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
|
|
|
|
mod.__file__ = self.get_filename(fullname)
|
|
|
|
mod.__loader__ = self
|
|
|
|
if pkg_present is not None: # it's a package.
|
|
|
|
mod.__path__ = []
|
|
|
|
mod.__package__ = fullname
|
|
|
|
self._present[fullname] = pkg_present
|
|
|
|
else:
|
|
|
|
mod.__package__ = str_rpartition(fullname, '.')[0] or None
|
|
|
|
|
|
|
|
if mod.__package__ and not PY3:
|
|
|
|
# 2.x requires __package__ to be exactly a string.
|
|
|
|
mod.__package__, _ = encodings.utf_8.encode(mod.__package__)
|
|
|
|
|
|
|
|
source = self.get_source(fullname)
|
|
|
|
try:
|
|
|
|
code = compile(source, mod.__file__, 'exec', 0, 1)
|
|
|
|
except SyntaxError:
|
|
|
|
LOG.exception('while importing %r', fullname)
|
|
|
|
raise
|
|
|
|
|
|
|
|
if PY3:
|
|
|
|
exec(code, vars(mod))
|
|
|
|
else:
|
|
|
|
exec('exec code in vars(mod)')
|
|
|
|
|
|
|
|
# #590: if a module replaces itself in sys.modules during import, below
|
|
|
|
# is necessary. This matches PyImport_ExecCodeModuleEx()
|
|
|
|
return sys.modules.get(fullname, mod)
|
|
|
|
|
|
|
|
def get_filename(self, fullname):
|
|
|
|
if fullname in self._cache:
|
|
|
|
path = self._cache[fullname][2]
|
|
|
|
if path is None:
|
|
|
|
# If find_loader() returns self but a subsequent master RPC
|
|
|
|
# reveals the module can't be loaded, and so load_module()
|
|
|
|
# throws ImportError, on Python 3.x it is still possible for
|
|
|
|
# the loader to be called to fetch metadata.
|
|
|
|
raise ModuleNotFoundError(self.absent_msg % (fullname,))
|
|
|
|
return u'master:' + self._cache[fullname][2]
|
|
|
|
|
|
|
|
def get_source(self, fullname):
|
|
|
|
if fullname in self._cache:
|
|
|
|
compressed = self._cache[fullname][3]
|
|
|
|
if compressed is None:
|
|
|
|
raise ModuleNotFoundError(self.absent_msg % (fullname,))
|
|
|
|
|
|
|
|
source = zlib.decompress(self._cache[fullname][3])
|
|
|
|
if PY3:
|
|
|
|
return to_text(source)
|
|
|
|
return source
|
|
|
|
|
|
|
|
|
|
|
|
class LogHandler(logging.Handler):
|
|
|
|
"""
|
|
|
|
A :class:`logging.Handler` subclass that arranges for :data:`FORWARD_LOG`
|
|
|
|
messages to be sent to a parent context in response to logging messages
|
|
|
|
generated by the current context. This is installed by default in child
|
|
|
|
contexts during bootstrap, so that :mod:`logging` events can be viewed and
|
|
|
|
managed centrally in the master process.
|
|
|
|
|
|
|
|
The handler is initially *corked* after construction, such that it buffers
|
|
|
|
messages until :meth:`uncork` is called. This allows logging to be
|
|
|
|
installed prior to communication with the target being available, and
|
|
|
|
avoids any possible race where early log messages might be dropped.
|
|
|
|
|
|
|
|
:param mitogen.core.Context context:
|
|
|
|
The context to send log messages towards. At present this is always
|
|
|
|
the master process.
|
|
|
|
"""
|
|
|
|
def __init__(self, context):
|
|
|
|
logging.Handler.__init__(self)
|
|
|
|
self.context = context
|
|
|
|
self.local = threading.local()
|
|
|
|
self._buffer = []
|
|
|
|
# Private synchronization is needed while corked, to ensure no
|
|
|
|
# concurrent call to _send() exists during uncork().
|
|
|
|
self._buffer_lock = threading.Lock()
|
|
|
|
|
|
|
|
def uncork(self):
|
|
|
|
"""
|
|
|
|
#305: during startup :class:`LogHandler` may be installed before it is
|
|
|
|
possible to route messages, therefore messages are buffered until
|
|
|
|
:meth:`uncork` is called by :class:`ExternalContext`.
|
|
|
|
"""
|
|
|
|
self._buffer_lock.acquire()
|
|
|
|
try:
|
|
|
|
self._send = self.context.send
|
|
|
|
for msg in self._buffer:
|
|
|
|
self._send(msg)
|
|
|
|
self._buffer = None
|
|
|
|
finally:
|
|
|
|
self._buffer_lock.release()
|
|
|
|
|
|
|
|
def _send(self, msg):
|
|
|
|
self._buffer_lock.acquire()
|
|
|
|
try:
|
|
|
|
if self._buffer is None:
|
|
|
|
# uncork() may run concurrent to _send()
|
|
|
|
self._send(msg)
|
|
|
|
else:
|
|
|
|
self._buffer.append(msg)
|
|
|
|
finally:
|
|
|
|
self._buffer_lock.release()
|
|
|
|
|
|
|
|
def emit(self, rec):
|
|
|
|
"""
|
|
|
|
Send a :data:`FORWARD_LOG` message towards the target context.
|
|
|
|
"""
|
|
|
|
if rec.name == 'mitogen.io' or \
|
|
|
|
getattr(self.local, 'in_emit', False):
|
|
|
|
return
|
|
|
|
|
|
|
|
self.local.in_emit = True
|
|
|
|
try:
|
|
|
|
msg = self.format(rec)
|
|
|
|
encoded = '%s\x00%s\x00%s' % (rec.name, rec.levelno, msg)
|
|
|
|
if isinstance(encoded, UnicodeType):
|
|
|
|
# Logging package emits both :(
|
|
|
|
encoded = encoded.encode('utf-8')
|
|
|
|
self._send(Message(data=encoded, handle=FORWARD_LOG))
|
|
|
|
finally:
|
|
|
|
self.local.in_emit = False
|
|
|
|
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
class Stream(object):
|
|
|
|
"""
|
|
|
|
A :class:`Stream` is one readable and optionally one writeable file
|
|
|
|
descriptor (represented by :class:`Side`) aggregated alongside an
|
|
|
|
associated :class:`Protocol` that knows how to respond to IO readiness
|
|
|
|
events for those descriptors.
|
|
|
|
|
|
|
|
Streams are registered with :class:`Broker`, and callbacks are invoked on
|
|
|
|
the broker thread in response to IO activity. When registered using
|
|
|
|
:meth:`Broker.start_receive` or :meth:`Broker._start_transmit`, the broker
|
|
|
|
may call any of :meth:`on_receive`, :meth:`on_transmit`,
|
|
|
|
:meth:`on_shutdown` or :meth:`on_disconnect`.
|
|
|
|
|
|
|
|
It is expected that the :class:`Protocol` associated with a stream will
|
|
|
|
change over its life. For example during connection setup, the initial
|
|
|
|
protocol may be :class:`mitogen.parent.BootstrapProtocol` that knows how to
|
|
|
|
enter SSH and sudo passwords and transmit the :mod:`mitogen.core` source to
|
|
|
|
the target, before handing off to :class:`MitogenProtocol` when the target
|
|
|
|
process is initialized.
|
|
|
|
|
|
|
|
Streams connecting to children are in turn aggregated by
|
|
|
|
:class:`mitogen.parent.Connection`, which contains additional logic for
|
|
|
|
managing any child process, and a reference to any separate ``stderr``
|
|
|
|
:class:`Stream` connected to that process.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
#: A :class:`Side` representing the stream's receive file descriptor.
|
|
|
|
receive_side = None
|
|
|
|
|
|
|
|
#: A :class:`Side` representing the stream's transmit file descriptor.
|
|
|
|
transmit_side = None
|
|
|
|
|
|
|
|
#: A :class:`Protocol` representing the protocol active on the stream.
|
|
|
|
protocol = None
|
|
|
|
|
|
|
|
#: In parents, the :class:`mitogen.parent.Connection` instance.
|
|
|
|
conn = None
|
|
|
|
|
|
|
|
#: The stream name. This is used in the :meth:`__repr__` output in any log
|
|
|
|
#: messages, it may be any descriptive string.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
name = u'default'
|
|
|
|
|
|
|
|
def set_protocol(self, protocol):
|
|
|
|
"""
|
|
|
|
Bind a :class:`Protocol` to this stream, by updating
|
|
|
|
:attr:`Protocol.stream` to refer to this stream, and updating this
|
|
|
|
stream's :attr:`Stream.protocol` to the refer to the protocol. Any
|
|
|
|
prior protocol's :attr:`Protocol.stream` is set to :data:`None`.
|
|
|
|
"""
|
|
|
|
if self.protocol:
|
|
|
|
self.protocol.stream = None
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.protocol = protocol
|
|
|
|
self.protocol.stream = self
|
|
|
|
|
|
|
|
def accept(self, rfp, wfp):
|
|
|
|
"""
|
|
|
|
Attach a pair of file objects to :attr:`receive_side` and
|
|
|
|
:attr:`transmit_side`, after wrapping them in :class:`Side` instances.
|
|
|
|
:class:`Side` will call :func:`set_nonblock` and :func:`set_cloexec`
|
|
|
|
on the underlying file descriptors during construction.
|
|
|
|
|
|
|
|
The same file object may be used for both sides. The default
|
|
|
|
:meth:`on_disconnect` is handles the possibility that only one
|
|
|
|
descriptor may need to be closed.
|
|
|
|
|
|
|
|
:param file rfp:
|
|
|
|
The file object to receive from.
|
|
|
|
:param file wfp:
|
|
|
|
The file object to transmit to.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.receive_side = Side(self, rfp)
|
|
|
|
self.transmit_side = Side(self, wfp)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return "<Stream %s #%04x>" % (self.name, id(self) & 0xffff,)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
|
|
|
|
def on_receive(self, broker):
|
|
|
|
"""
|
|
|
|
Invoked by :class:`Broker` when the stream's :attr:`receive_side` has
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
been marked readable using :meth:`Broker.start_receive` and the broker
|
|
|
|
has detected the associated file descriptor is ready for reading.
|
|
|
|
|
|
|
|
Subclasses must implement this if they are registered using
|
|
|
|
:meth:`Broker.start_receive`, and the method must invoke
|
|
|
|
:meth:`on_disconnect` if reading produces an empty string.
|
|
|
|
|
|
|
|
The default implementation reads :attr:`Protocol.read_size` bytes and
|
|
|
|
passes the resulting bytestring to :meth:`Protocol.on_receive`. If the
|
|
|
|
bytestring is 0 bytes, invokes :meth:`on_disconnect` instead.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
"""
|
|
|
|
buf = self.receive_side.read(self.protocol.read_size)
|
|
|
|
if not buf:
|
|
|
|
LOG.debug('%r: empty read, disconnecting', self.receive_side)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
return self.on_disconnect(broker)
|
|
|
|
|
|
|
|
self.protocol.on_receive(broker, buf)
|
|
|
|
|
|
|
|
def on_transmit(self, broker):
|
|
|
|
"""
|
|
|
|
Invoked by :class:`Broker` when the stream's :attr:`transmit_side` has
|
|
|
|
been marked writeable using :meth:`Broker._start_transmit` and the
|
|
|
|
broker has detected the associated file descriptor is ready for
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
writing.
|
|
|
|
|
|
|
|
Subclasses must implement they are ever registerd with
|
|
|
|
:meth:`Broker._start_transmit`.
|
|
|
|
|
|
|
|
The default implementation invokes :meth:`Protocol.on_transmit`.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
"""
|
|
|
|
self.protocol.on_transmit(broker)
|
|
|
|
|
|
|
|
def on_shutdown(self, broker):
|
|
|
|
"""
|
|
|
|
Invoked by :meth:`Broker.shutdown` to allow the stream time to
|
|
|
|
gracefully shutdown.
|
|
|
|
|
|
|
|
The default implementation emits a ``shutdown`` signal before
|
|
|
|
invoking :meth:`on_disconnect`.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
"""
|
|
|
|
fire(self, 'shutdown')
|
|
|
|
self.protocol.on_shutdown(broker)
|
|
|
|
|
|
|
|
def on_disconnect(self, broker):
|
|
|
|
"""
|
|
|
|
Invoked by :class:`Broker` to force disconnect the stream during
|
|
|
|
shutdown, invoked by the default :meth:`on_shutdown` implementation,
|
|
|
|
and usually invoked by any subclass :meth:`on_receive` implementation
|
|
|
|
in response to a 0-byte read.
|
|
|
|
|
|
|
|
The base implementation fires a ``disconnect`` event, then closes
|
|
|
|
:attr:`receive_side` and :attr:`transmit_side` after unregistering the
|
|
|
|
stream from the broker.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
"""
|
|
|
|
fire(self, 'disconnect')
|
|
|
|
self.protocol.on_disconnect(broker)
|
|
|
|
|
|
|
|
|
|
|
|
class Protocol(object):
|
|
|
|
"""
|
|
|
|
Implement the program behaviour associated with activity on a
|
|
|
|
:class:`Stream`. The protocol in use may vary over a stream's life, for
|
|
|
|
example to allow :class:`mitogen.parent.BootstrapProtocol` to initialize
|
|
|
|
the connected child before handing it off to :class:`MitogenProtocol`. A
|
|
|
|
stream's active protocol is tracked in the :attr:`Stream.protocol`
|
|
|
|
attribute, and modified via :meth:`Stream.set_protocol`.
|
|
|
|
|
|
|
|
Protocols do not handle IO, they are entirely reliant on the interface
|
|
|
|
provided by :class:`Stream` and :class:`Side`, allowing the underlying IO
|
|
|
|
implementation to be replaced without modifying behavioural logic.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
stream_class = Stream
|
|
|
|
|
|
|
|
#: The :class:`Stream` this protocol is currently bound to, or
|
|
|
|
#: :data:`None`.
|
|
|
|
stream = None
|
|
|
|
|
|
|
|
#: The size of the read buffer used by :class:`Stream` when this is the
|
|
|
|
#: active protocol for the stream.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
read_size = CHUNK_SIZE
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def build_stream(cls, *args, **kwargs):
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
stream = cls.stream_class()
|
|
|
|
stream.set_protocol(cls(*args, **kwargs))
|
|
|
|
return stream
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return '%s(%s)' % (
|
|
|
|
self.__class__.__name__,
|
|
|
|
self.stream and self.stream.name,
|
|
|
|
)
|
|
|
|
|
|
|
|
def on_shutdown(self, broker):
|
|
|
|
_v and LOG.debug('%r: shutting down', self)
|
|
|
|
self.stream.on_disconnect(broker)
|
|
|
|
|
|
|
|
def on_disconnect(self, broker):
|
|
|
|
# Normally both sides an FD, so it is important that tranmit_side is
|
|
|
|
# deregistered from Poller before closing the receive side, as pollers
|
|
|
|
# like epoll and kqueue unregister all events on FD close, causing
|
|
|
|
# subsequent attempt to unregister the transmit side to fail.
|
|
|
|
LOG.debug('%r: disconnecting', self)
|
|
|
|
broker.stop_receive(self.stream)
|
|
|
|
if self.stream.transmit_side:
|
|
|
|
broker._stop_transmit(self.stream)
|
|
|
|
|
|
|
|
self.stream.receive_side.close()
|
|
|
|
if self.stream.transmit_side:
|
|
|
|
self.stream.transmit_side.close()
|
|
|
|
|
|
|
|
|
|
|
|
class DelimitedProtocol(Protocol):
|
|
|
|
"""
|
|
|
|
Provide a :meth:`Protocol.on_receive` implementation for protocols that are
|
|
|
|
delimited by a fixed string, like text based protocols. Each message is
|
|
|
|
passed to :meth:`on_line_received` as it arrives, with incomplete messages
|
|
|
|
passed to :meth:`on_partial_line_received`.
|
|
|
|
|
|
|
|
When emulating user input it is often necessary to respond to incomplete
|
|
|
|
lines, such as when a "Password: " prompt is sent.
|
|
|
|
:meth:`on_partial_line_received` may be called repeatedly with an
|
|
|
|
increasingly complete message. When a complete message is finally received,
|
|
|
|
:meth:`on_line_received` will be called once for it before the buffer is
|
|
|
|
discarded.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
|
|
|
|
If :func:`on_line_received` returns :data:`False`, remaining data is passed
|
|
|
|
unprocessed to the stream's current protocol's :meth:`on_receive`. This
|
|
|
|
allows switching from line-oriented to binary while the input buffer
|
|
|
|
contains both kinds of data.
|
|
|
|
"""
|
|
|
|
#: The delimiter. Defaults to newline.
|
|
|
|
delimiter = b('\n')
|
|
|
|
_trailer = b('')
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
def on_receive(self, broker, buf):
|
|
|
|
_vv and IOLOG.debug('%r.on_receive()', self)
|
|
|
|
stream = self.stream
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._trailer, cont = mitogen.core.iter_split(
|
|
|
|
buf=self._trailer + buf,
|
|
|
|
delim=self.delimiter,
|
|
|
|
func=self.on_line_received,
|
|
|
|
)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
|
|
|
|
if self._trailer:
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if cont:
|
|
|
|
self.on_partial_line_received(self._trailer)
|
|
|
|
else:
|
|
|
|
assert stream.protocol is not self
|
|
|
|
stream.protocol.on_receive(broker, self._trailer)
|
|
|
|
|
|
|
|
def on_line_received(self, line):
|
|
|
|
"""
|
|
|
|
Receive a line from the stream.
|
|
|
|
|
|
|
|
:param bytes line:
|
|
|
|
The encoded line, excluding the delimiter.
|
|
|
|
:returns:
|
|
|
|
:data:`False` to indicate this invocation modified the stream's
|
|
|
|
active protocol, and any remaining buffered data should be passed
|
|
|
|
to the new protocol's :meth:`on_receive` method.
|
|
|
|
|
|
|
|
Any other return value is ignored.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
def on_partial_line_received(self, line):
|
|
|
|
"""
|
|
|
|
Receive a trailing unterminated partial line from the stream.
|
|
|
|
|
|
|
|
:param bytes line:
|
|
|
|
The encoded partial line.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
class BufferedWriter(object):
|
|
|
|
"""
|
|
|
|
Implement buffered output while avoiding quadratic string operations. This
|
|
|
|
is currently constructed by each protocol, in future it may become fixed
|
|
|
|
for each stream instead.
|
|
|
|
"""
|
|
|
|
def __init__(self, broker, protocol):
|
|
|
|
self._broker = broker
|
|
|
|
self._protocol = protocol
|
|
|
|
self._buf = collections.deque()
|
|
|
|
self._len = 0
|
|
|
|
|
|
|
|
def write(self, s):
|
|
|
|
"""
|
|
|
|
Transmit `s` immediately, falling back to enqueuing it and marking the
|
|
|
|
stream writeable if no OS buffer space is available.
|
|
|
|
"""
|
|
|
|
if not self._len:
|
|
|
|
# Modifying epoll/Kqueue state is expensive, as are needless broker
|
|
|
|
# loops. Rather than wait for writeability, just write immediately,
|
|
|
|
# and fall back to the broker loop on error or full buffer.
|
|
|
|
try:
|
|
|
|
n = self._protocol.stream.transmit_side.write(s)
|
|
|
|
if n:
|
|
|
|
if n == len(s):
|
|
|
|
return
|
|
|
|
s = s[n:]
|
|
|
|
except OSError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
self._broker._start_transmit(self._protocol.stream)
|
|
|
|
self._buf.append(s)
|
|
|
|
self._len += len(s)
|
|
|
|
|
|
|
|
def on_transmit(self, broker):
|
|
|
|
"""
|
|
|
|
Respond to stream writeability by retrying previously buffered
|
|
|
|
:meth:`write` calls.
|
|
|
|
"""
|
|
|
|
if self._buf:
|
|
|
|
buf = self._buf.popleft()
|
|
|
|
written = self._protocol.stream.transmit_side.write(buf)
|
|
|
|
if not written:
|
|
|
|
_v and LOG.debug('disconnected during write to %r', self)
|
|
|
|
self._protocol.stream.on_disconnect(broker)
|
|
|
|
return
|
|
|
|
elif written != len(buf):
|
|
|
|
self._buf.appendleft(BufferType(buf, written))
|
|
|
|
|
|
|
|
_vv and IOLOG.debug('transmitted %d bytes to %r', written, self)
|
|
|
|
self._len -= written
|
|
|
|
|
|
|
|
if not self._buf:
|
|
|
|
broker._stop_transmit(self._protocol.stream)
|
|
|
|
|
|
|
|
|
|
|
|
class Side(object):
|
|
|
|
"""
|
|
|
|
Represent one side of a :class:`Stream`. This allows unidirectional (e.g.
|
|
|
|
pipe) and bidirectional (e.g. socket) streams to operate identically.
|
|
|
|
|
|
|
|
Sides are also responsible for tracking the open/closed state of the
|
|
|
|
underlying FD, preventing erroneous duplicate calls to :func:`os.close` due
|
|
|
|
to duplicate :meth:`Stream.on_disconnect` calls, which would otherwise risk
|
|
|
|
silently succeeding by closing an unrelated descriptor. For this reason, it
|
|
|
|
is crucial only one file object exists per unique descriptor.
|
|
|
|
|
|
|
|
:param mitogen.core.Stream stream:
|
|
|
|
The stream this side is associated with.
|
|
|
|
:param object fp:
|
|
|
|
The file or socket object managing the underlying file descriptor. Any
|
|
|
|
object may be used that supports `fileno()` and `close()` methods.
|
|
|
|
:param bool cloexec:
|
|
|
|
If :data:`True`, the descriptor has its :data:`fcntl.FD_CLOEXEC` flag
|
|
|
|
enabled using :func:`fcntl.fcntl`.
|
|
|
|
:param bool keep_alive:
|
|
|
|
If :data:`True`, the continued existence of this side will extend the
|
|
|
|
shutdown grace period until it has been unregistered from the broker.
|
|
|
|
:param bool blocking:
|
|
|
|
If :data:`False`, the descriptor has its :data:`os.O_NONBLOCK` flag
|
|
|
|
enabled using :func:`fcntl.fcntl`.
|
|
|
|
"""
|
|
|
|
_fork_refs = weakref.WeakValueDictionary()
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
closed = False
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
def __init__(self, stream, fp, cloexec=True, keep_alive=True, blocking=False):
|
|
|
|
#: The :class:`Stream` for which this is a read or write side.
|
|
|
|
self.stream = stream
|
|
|
|
# File or socket object responsible for the lifetime of its underlying
|
|
|
|
# file descriptor.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.fp = fp
|
|
|
|
#: Integer file descriptor to perform IO on, or :data:`None` if
|
|
|
|
#: :meth:`close` has been called. This is saved separately from the
|
|
|
|
#: file object, since :meth:`file.fileno` cannot be called on it after
|
|
|
|
#: it has been closed.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.fd = fp.fileno()
|
|
|
|
#: If :data:`True`, causes presence of this side in
|
|
|
|
#: :class:`Broker`'s active reader set to defer shutdown until the
|
|
|
|
#: side is disconnected.
|
|
|
|
self.keep_alive = keep_alive
|
|
|
|
self._fork_refs[id(self)] = self
|
|
|
|
if cloexec:
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
set_cloexec(self.fd)
|
|
|
|
if not blocking:
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
set_nonblock(self.fd)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return '<Side of %s fd %s>' % (
|
|
|
|
self.stream.name or repr(self.stream),
|
|
|
|
self.fd
|
|
|
|
)
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def _on_fork(cls):
|
|
|
|
while cls._fork_refs:
|
|
|
|
_, side = cls._fork_refs.popitem()
|
|
|
|
_vv and IOLOG.debug('Side._on_fork() closing %r', side)
|
|
|
|
side.close()
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
"""
|
|
|
|
Call :meth:`file.close` on :attr:`fp` if it is not :data:`None`,
|
|
|
|
then set it to :data:`None`.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.close()', self)
|
|
|
|
if not self.closed:
|
|
|
|
self.closed = True
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.fp.close()
|
|
|
|
|
|
|
|
def read(self, n=CHUNK_SIZE):
|
|
|
|
"""
|
|
|
|
Read up to `n` bytes from the file descriptor, wrapping the underlying
|
|
|
|
:func:`os.read` call with :func:`io_op` to trap common disconnection
|
|
|
|
conditions.
|
|
|
|
|
|
|
|
:meth:`read` always behaves as if it is reading from a regular UNIX
|
|
|
|
file; socket, pipe, and TTY disconnection errors are masked and result
|
|
|
|
in a 0-sized read like a regular file.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
Bytes read, or the empty string to indicate disconnection was
|
|
|
|
detected.
|
|
|
|
"""
|
|
|
|
if self.closed:
|
|
|
|
# Refuse to touch the handle after closed, it may have been reused
|
|
|
|
# by another thread. TODO: synchronize read()/write()/close().
|
|
|
|
return b('')
|
|
|
|
s, disconnected = io_op(os.read, self.fd, n)
|
|
|
|
if disconnected:
|
|
|
|
LOG.debug('%r: disconnected during read: %s', self, disconnected)
|
|
|
|
return b('')
|
|
|
|
return s
|
|
|
|
|
|
|
|
def write(self, s):
|
|
|
|
"""
|
|
|
|
Write as much of the bytes from `s` as possible to the file descriptor,
|
|
|
|
wrapping the underlying :func:`os.write` call with :func:`io_op` to
|
|
|
|
trap common disconnection conditions.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
Number of bytes written, or :data:`None` if disconnection was
|
|
|
|
detected.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if self.closed:
|
|
|
|
# Don't touch the handle after close, it may be reused elsewhere.
|
|
|
|
return None
|
|
|
|
|
|
|
|
written, disconnected = io_op(os.write, self.fd, s)
|
|
|
|
if disconnected:
|
|
|
|
LOG.debug('%r: disconnected during write: %s', self, disconnected)
|
|
|
|
return None
|
|
|
|
return written
|
|
|
|
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
class MitogenProtocol(Protocol):
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
:class:`Protocol` implementing mitogen's :ref:`stream protocol
|
|
|
|
<stream-protocol>`.
|
|
|
|
"""
|
|
|
|
#: If not :data:`False`, indicates the stream has :attr:`auth_id` set and
|
|
|
|
#: its value is the same as :data:`mitogen.context_id` or appears in
|
|
|
|
#: :data:`mitogen.parent_ids`.
|
|
|
|
is_privileged = False
|
|
|
|
|
|
|
|
def __init__(self, router, remote_id, auth_id=None,
|
|
|
|
local_id=None, parent_ids=None):
|
|
|
|
self._router = router
|
|
|
|
self.remote_id = remote_id
|
|
|
|
#: If not :data:`None`, :class:`Router` stamps this into
|
|
|
|
#: :attr:`Message.auth_id` of every message received on this stream.
|
|
|
|
self.auth_id = auth_id
|
|
|
|
|
|
|
|
if parent_ids is None:
|
|
|
|
parent_ids = mitogen.parent_ids
|
|
|
|
if local_id is None:
|
|
|
|
local_id = mitogen.context_id
|
|
|
|
|
|
|
|
self.is_privileged = (
|
|
|
|
(remote_id in parent_ids) or
|
|
|
|
auth_id in ([local_id] + parent_ids)
|
|
|
|
)
|
|
|
|
self.sent_modules = set(['mitogen', 'mitogen.core'])
|
|
|
|
self._input_buf = collections.deque()
|
|
|
|
self._input_buf_len = 0
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._writer = BufferedWriter(router.broker, self)
|
|
|
|
|
|
|
|
#: Routing records the dst_id of every message arriving from this
|
|
|
|
#: stream. Any arriving DEL_ROUTE is rebroadcast for any such ID.
|
|
|
|
self.egress_ids = set()
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
def on_receive(self, broker, buf):
|
|
|
|
"""
|
|
|
|
Handle the next complete message on the stream. Raise
|
|
|
|
:class:`StreamError` on failure.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.on_receive()', self)
|
|
|
|
if self._input_buf and self._input_buf_len < 128:
|
|
|
|
self._input_buf[0] += buf
|
|
|
|
else:
|
|
|
|
self._input_buf.append(buf)
|
|
|
|
|
|
|
|
self._input_buf_len += len(buf)
|
|
|
|
while self._receive_one(broker):
|
|
|
|
pass
|
|
|
|
|
|
|
|
corrupt_msg = (
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
'%s: Corruption detected: frame signature incorrect. This likely means'
|
|
|
|
' some external process is interfering with the connection. Received:'
|
|
|
|
'\n\n'
|
|
|
|
'%r'
|
|
|
|
)
|
|
|
|
|
|
|
|
def _receive_one(self, broker):
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if self._input_buf_len < Message.HEADER_LEN:
|
|
|
|
return False
|
|
|
|
|
|
|
|
msg = Message()
|
|
|
|
msg.router = self._router
|
|
|
|
(magic, msg.dst_id, msg.src_id, msg.auth_id,
|
|
|
|
msg.handle, msg.reply_to, msg_len) = struct.unpack(
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
Message.HEADER_FMT,
|
|
|
|
self._input_buf[0][:Message.HEADER_LEN],
|
|
|
|
)
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if magic != Message.HEADER_MAGIC:
|
|
|
|
LOG.error(self.corrupt_msg, self.stream.name, self._input_buf[0][:2048])
|
|
|
|
self.stream.on_disconnect(broker)
|
|
|
|
return False
|
|
|
|
|
|
|
|
if msg_len > self._router.max_message_size:
|
|
|
|
LOG.error('%r: Maximum message size exceeded (got %d, max %d)',
|
|
|
|
self, msg_len, self._router.max_message_size)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.stream.on_disconnect(broker)
|
|
|
|
return False
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
total_len = msg_len + Message.HEADER_LEN
|
|
|
|
if self._input_buf_len < total_len:
|
|
|
|
_vv and IOLOG.debug(
|
|
|
|
'%r: Input too short (want %d, got %d)',
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self, msg_len, self._input_buf_len - Message.HEADER_LEN
|
|
|
|
)
|
|
|
|
return False
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
start = Message.HEADER_LEN
|
|
|
|
prev_start = start
|
|
|
|
remain = total_len
|
|
|
|
bits = []
|
|
|
|
while remain:
|
|
|
|
buf = self._input_buf.popleft()
|
|
|
|
bit = buf[start:remain]
|
|
|
|
bits.append(bit)
|
|
|
|
remain -= len(bit) + start
|
|
|
|
prev_start = start
|
|
|
|
start = 0
|
|
|
|
|
|
|
|
msg.data = b('').join(bits)
|
|
|
|
self._input_buf.appendleft(buf[prev_start+len(bit):])
|
|
|
|
self._input_buf_len -= total_len
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._router._async_route(msg, self.stream)
|
|
|
|
return True
|
|
|
|
|
|
|
|
def pending_bytes(self):
|
|
|
|
"""
|
|
|
|
Return the number of bytes queued for transmission on this stream. This
|
|
|
|
can be used to limit the amount of data buffered in RAM by an otherwise
|
|
|
|
unlimited consumer.
|
|
|
|
|
|
|
|
For an accurate result, this method should be called from the Broker
|
|
|
|
thread, for example by using :meth:`Broker.defer_sync`.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
return self._writer._len
|
|
|
|
|
|
|
|
def on_transmit(self, broker):
|
|
|
|
"""
|
|
|
|
Transmit buffered messages.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.on_transmit()', self)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._writer.on_transmit(broker)
|
|
|
|
|
|
|
|
def _send(self, msg):
|
|
|
|
_vv and IOLOG.debug('%r._send(%r)', self, msg)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._writer.write(msg.pack())
|
|
|
|
|
|
|
|
def send(self, msg):
|
|
|
|
"""
|
|
|
|
Send `data` to `handle`, and tell the broker we have output. May be
|
|
|
|
called from any thread.
|
|
|
|
"""
|
|
|
|
self._router.broker.defer(self._send, msg)
|
|
|
|
|
|
|
|
def on_shutdown(self, broker):
|
|
|
|
"""
|
|
|
|
Disable :class:`Protocol` immediate disconnect behaviour.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
_v and LOG.debug('%r: shutting down', self)
|
|
|
|
|
|
|
|
|
|
|
|
class Context(object):
|
|
|
|
"""
|
|
|
|
Represent a remote context regardless of the underlying connection method.
|
|
|
|
Context objects are simple facades that emit messages through an
|
|
|
|
associated router, and have :ref:`signals` raised against them in response
|
|
|
|
to various events relating to the context.
|
|
|
|
|
|
|
|
**Note:** This is the somewhat limited core version, used by child
|
|
|
|
contexts. The master subclass is documented below this one.
|
|
|
|
|
|
|
|
Contexts maintain no internal state and are thread-safe.
|
|
|
|
|
|
|
|
Prefer :meth:`Router.context_by_id` over constructing context objects
|
|
|
|
explicitly, as that method is deduplicating, and returns the only context
|
|
|
|
instance :ref:`signals` will be raised on.
|
|
|
|
|
|
|
|
:param mitogen.core.Router router:
|
|
|
|
Router to emit messages through.
|
|
|
|
:param int context_id:
|
|
|
|
Context ID.
|
|
|
|
:param str name:
|
|
|
|
Context name.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
name = None
|
|
|
|
remote_name = None
|
|
|
|
|
|
|
|
def __init__(self, router, context_id, name=None):
|
|
|
|
self.router = router
|
|
|
|
self.context_id = context_id
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if name:
|
|
|
|
self.name = to_text(name)
|
|
|
|
|
|
|
|
def __reduce__(self):
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
return _unpickle_context, (self.context_id, self.name)
|
|
|
|
|
|
|
|
def on_disconnect(self):
|
|
|
|
_v and LOG.debug('%r: disconnecting', self)
|
|
|
|
fire(self, 'disconnect')
|
|
|
|
|
|
|
|
def send_async(self, msg, persist=False):
|
|
|
|
"""
|
|
|
|
Arrange for `msg` to be delivered to this context, with replies
|
|
|
|
directed to a newly constructed receiver. :attr:`dst_id
|
|
|
|
<Message.dst_id>` is set to the target context ID, and :attr:`reply_to
|
|
|
|
<Message.reply_to>` is set to the newly constructed receiver's handle.
|
|
|
|
|
|
|
|
:param bool persist:
|
|
|
|
If :data:`False`, the handler will be unregistered after a single
|
|
|
|
message has been received.
|
|
|
|
|
|
|
|
:param mitogen.core.Message msg:
|
|
|
|
The message.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
:class:`Receiver` configured to receive any replies sent to the
|
|
|
|
message's `reply_to` handle.
|
|
|
|
"""
|
|
|
|
receiver = Receiver(self.router, persist=persist, respondent=self)
|
|
|
|
msg.dst_id = self.context_id
|
|
|
|
msg.reply_to = receiver.handle
|
|
|
|
|
|
|
|
_v and LOG.debug('sending message to %r: %r', self, msg)
|
|
|
|
self.send(msg)
|
|
|
|
return receiver
|
|
|
|
|
|
|
|
def call_service_async(self, service_name, method_name, **kwargs):
|
|
|
|
_v and LOG.debug('calling service %s.%s of %r, args: %r',
|
|
|
|
service_name, method_name, self, kwargs)
|
|
|
|
if isinstance(service_name, BytesType):
|
|
|
|
service_name = service_name.encode('utf-8')
|
|
|
|
elif not isinstance(service_name, UnicodeType):
|
|
|
|
service_name = service_name.name() # Service.name()
|
|
|
|
tup = (service_name, to_text(method_name), Kwargs(kwargs))
|
|
|
|
msg = Message.pickled(tup, handle=CALL_SERVICE)
|
|
|
|
return self.send_async(msg)
|
|
|
|
|
|
|
|
def send(self, msg):
|
|
|
|
"""
|
|
|
|
Arrange for `msg` to be delivered to this context. :attr:`dst_id
|
|
|
|
<Message.dst_id>` is set to the target context ID.
|
|
|
|
|
|
|
|
:param Message msg:
|
|
|
|
Message.
|
|
|
|
"""
|
|
|
|
msg.dst_id = self.context_id
|
|
|
|
self.router.route(msg)
|
|
|
|
|
|
|
|
def call_service(self, service_name, method_name, **kwargs):
|
|
|
|
recv = self.call_service_async(service_name, method_name, **kwargs)
|
|
|
|
return recv.get().unpickle()
|
|
|
|
|
|
|
|
def send_await(self, msg, deadline=None):
|
|
|
|
"""
|
|
|
|
Like :meth:`send_async`, but expect a single reply (`persist=False`)
|
|
|
|
delivered within `deadline` seconds.
|
|
|
|
|
|
|
|
:param mitogen.core.Message msg:
|
|
|
|
The message.
|
|
|
|
:param float deadline:
|
|
|
|
If not :data:`None`, seconds before timing out waiting for a reply.
|
|
|
|
:returns:
|
|
|
|
Deserialized reply.
|
|
|
|
:raises TimeoutError:
|
|
|
|
No message was received and `deadline` passed.
|
|
|
|
"""
|
|
|
|
receiver = self.send_async(msg)
|
|
|
|
response = receiver.get(deadline)
|
|
|
|
data = response.unpickle()
|
|
|
|
_vv and IOLOG.debug('%r._send_await() -> %r', self, data)
|
|
|
|
return data
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Context(%s, %r)' % (self.context_id, self.name)
|
|
|
|
|
|
|
|
|
|
|
|
def _unpickle_context(context_id, name, router=None):
|
|
|
|
if not (isinstance(context_id, (int, long)) and context_id >= 0 and (
|
|
|
|
(name is None) or
|
|
|
|
(isinstance(name, UnicodeType) and len(name) < 100))
|
|
|
|
):
|
|
|
|
raise TypeError('cannot unpickle Context: bad input')
|
|
|
|
|
|
|
|
if isinstance(router, Router):
|
|
|
|
return router.context_by_id(context_id, name=name)
|
|
|
|
return Context(None, context_id, name) # For plain Jane pickle.
|
|
|
|
|
|
|
|
|
|
|
|
class Poller(object):
|
|
|
|
"""
|
|
|
|
A poller manages OS file descriptors the user is waiting to become
|
|
|
|
available for IO. The :meth:`poll` method blocks the calling thread
|
|
|
|
until one or more become ready. The default implementation is based on
|
|
|
|
:func:`select.poll`.
|
|
|
|
|
|
|
|
Each descriptor has an associated `data` element, which is unique for each
|
|
|
|
readiness type, and defaults to being the same as the file descriptor. The
|
|
|
|
:meth:`poll` method yields the data associated with a descriptor, rather
|
|
|
|
than the descriptor itself, allowing concise loops like::
|
|
|
|
|
|
|
|
p = Poller()
|
|
|
|
p.start_receive(conn.fd, data=conn.on_read)
|
|
|
|
p.start_transmit(conn.fd, data=conn.on_write)
|
|
|
|
|
|
|
|
for callback in p.poll():
|
|
|
|
callback() # invoke appropriate bound instance method
|
|
|
|
|
|
|
|
Pollers may be modified while :meth:`poll` is yielding results. Removals
|
|
|
|
are processed immediately, causing pending events for the descriptor to be
|
|
|
|
discarded.
|
|
|
|
|
|
|
|
The :meth:`close` method must be called when a poller is discarded to avoid
|
|
|
|
a resource leak.
|
|
|
|
|
|
|
|
Pollers may only be used by one thread at a time.
|
|
|
|
"""
|
|
|
|
SUPPORTED = True
|
|
|
|
|
|
|
|
# This changed from select() to poll() in Mitogen 0.2.4. Since poll() has
|
|
|
|
# no upper FD limit, it is suitable for use with Latch, which must handle
|
|
|
|
# FDs larger than select's limit during many-host runs. We want this
|
|
|
|
# because poll() requires no setup and teardown: just a single system call,
|
|
|
|
# which is important because Latch.get() creates a Poller on each
|
|
|
|
# invocation. In a microbenchmark, poll() vs. epoll_ctl() is 30% faster in
|
|
|
|
# this scenario. If select() must return in future, it is important
|
|
|
|
# Latch.poller_class is set from parent.py to point to the industrial
|
|
|
|
# strength poller for the OS, otherwise Latch will fail randomly.
|
|
|
|
|
|
|
|
#: Increments on every poll(). Used to version _rfds and _wfds.
|
|
|
|
_generation = 1
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self._rfds = {}
|
|
|
|
self._wfds = {}
|
|
|
|
|
|
|
|
def __repr__(self):
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
return '%s' % (type(self).__name__,)
|
|
|
|
|
|
|
|
def _update(self, fd):
|
|
|
|
"""
|
|
|
|
Required by PollPoller subclass.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
@property
|
|
|
|
def readers(self):
|
|
|
|
"""
|
|
|
|
Return a list of `(fd, data)` tuples for every FD registered for
|
|
|
|
receive readiness.
|
|
|
|
"""
|
|
|
|
return list((fd, data) for fd, (data, gen) in self._rfds.items())
|
|
|
|
|
|
|
|
@property
|
|
|
|
def writers(self):
|
|
|
|
"""
|
|
|
|
Return a list of `(fd, data)` tuples for every FD registered for
|
|
|
|
transmit readiness.
|
|
|
|
"""
|
|
|
|
return list((fd, data) for fd, (data, gen) in self._wfds.items())
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
"""
|
|
|
|
Close any underlying OS resource used by the poller.
|
|
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
|
|
def start_receive(self, fd, data=None):
|
|
|
|
"""
|
|
|
|
Cause :meth:`poll` to yield `data` when `fd` is readable.
|
|
|
|
"""
|
|
|
|
self._rfds[fd] = (data or fd, self._generation)
|
|
|
|
self._update(fd)
|
|
|
|
|
|
|
|
def stop_receive(self, fd):
|
|
|
|
"""
|
|
|
|
Stop yielding readability events for `fd`.
|
|
|
|
|
|
|
|
Redundant calls to :meth:`stop_receive` are silently ignored, this may
|
|
|
|
change in future.
|
|
|
|
"""
|
|
|
|
self._rfds.pop(fd, None)
|
|
|
|
self._update(fd)
|
|
|
|
|
|
|
|
def start_transmit(self, fd, data=None):
|
|
|
|
"""
|
|
|
|
Cause :meth:`poll` to yield `data` when `fd` is writeable.
|
|
|
|
"""
|
|
|
|
self._wfds[fd] = (data or fd, self._generation)
|
|
|
|
self._update(fd)
|
|
|
|
|
|
|
|
def stop_transmit(self, fd):
|
|
|
|
"""
|
|
|
|
Stop yielding writeability events for `fd`.
|
|
|
|
|
|
|
|
Redundant calls to :meth:`stop_transmit` are silently ignored, this may
|
|
|
|
change in future.
|
|
|
|
"""
|
|
|
|
self._wfds.pop(fd, None)
|
|
|
|
self._update(fd)
|
|
|
|
|
|
|
|
def _poll(self, timeout):
|
|
|
|
(rfds, wfds, _), _ = io_op(select.select,
|
|
|
|
self._rfds,
|
|
|
|
self._wfds,
|
|
|
|
(), timeout
|
|
|
|
)
|
|
|
|
|
|
|
|
for fd in rfds:
|
|
|
|
_vv and IOLOG.debug('%r: POLLIN for %r', self, fd)
|
|
|
|
data, gen = self._rfds.get(fd, (None, None))
|
|
|
|
if gen and gen < self._generation:
|
|
|
|
yield data
|
|
|
|
|
|
|
|
for fd in wfds:
|
|
|
|
_vv and IOLOG.debug('%r: POLLOUT for %r', self, fd)
|
|
|
|
data, gen = self._wfds.get(fd, (None, None))
|
|
|
|
if gen and gen < self._generation:
|
|
|
|
yield data
|
|
|
|
|
|
|
|
def poll(self, timeout=None):
|
|
|
|
"""
|
|
|
|
Block the calling thread until one or more FDs are ready for IO.
|
|
|
|
|
|
|
|
:param float timeout:
|
|
|
|
If not :data:`None`, seconds to wait without an event before
|
|
|
|
returning an empty iterable.
|
|
|
|
:returns:
|
|
|
|
Iterable of `data` elements associated with ready FDs.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.poll(%r)', self, timeout)
|
|
|
|
self._generation += 1
|
|
|
|
return self._poll(timeout)
|
|
|
|
|
|
|
|
|
|
|
|
class Latch(object):
|
|
|
|
"""
|
|
|
|
A latch is a :class:`Queue.Queue`-like object that supports mutation and
|
|
|
|
waiting from multiple threads, however unlike :class:`Queue.Queue`,
|
|
|
|
waiting threads always remain interruptible, so CTRL+C always succeeds, and
|
|
|
|
waits where a timeout is set experience no wake up latency. These
|
|
|
|
properties are not possible in combination using the built-in threading
|
|
|
|
primitives available in Python 2.x.
|
|
|
|
|
|
|
|
Latches implement queues using the UNIX self-pipe trick, and a per-thread
|
|
|
|
:func:`socket.socketpair` that is lazily created the first time any
|
|
|
|
latch attempts to sleep on a thread, and dynamically associated with the
|
|
|
|
waiting Latch only for duration of the wait.
|
|
|
|
|
|
|
|
See :ref:`waking-sleeping-threads` for further discussion.
|
|
|
|
"""
|
|
|
|
#: The :class:`Poller` implementation to use for waiting. Since the poller
|
|
|
|
#: will be very short-lived, we prefer :class:`mitogen.parent.PollPoller`
|
|
|
|
#: if it is available, or :class:`mitogen.core.Poller` otherwise, since
|
|
|
|
#: these implementations require no system calls to create, configure or
|
|
|
|
#: destroy.
|
|
|
|
poller_class = Poller
|
|
|
|
|
|
|
|
#: If not :data:`None`, a function invoked as `notify(latch)` after a
|
|
|
|
#: successful call to :meth:`put`. The function is invoked on the
|
|
|
|
#: :meth:`put` caller's thread, which may be the :class:`Broker` thread,
|
|
|
|
#: therefore it must not block. Used by :class:`mitogen.select.Select` to
|
|
|
|
#: efficiently implement waiting on multiple event sources.
|
|
|
|
notify = None
|
|
|
|
|
|
|
|
# The _cls_ prefixes here are to make it crystal clear in the code which
|
|
|
|
# state mutation isn't covered by :attr:`_lock`.
|
|
|
|
|
|
|
|
#: List of reusable :func:`socket.socketpair` tuples. The list is mutated
|
|
|
|
#: from multiple threads, the only safe operations are `append()` and
|
|
|
|
#: `pop()`.
|
|
|
|
_cls_idle_socketpairs = []
|
|
|
|
|
|
|
|
#: List of every socket object that must be closed by :meth:`_on_fork`.
|
|
|
|
#: Inherited descriptors cannot be reused, as the duplicated handles
|
|
|
|
#: reference the same underlying kernel object in use by the parent.
|
|
|
|
_cls_all_sockets = []
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
self.closed = False
|
|
|
|
self._lock = threading.Lock()
|
|
|
|
#: List of unconsumed enqueued items.
|
|
|
|
self._queue = []
|
|
|
|
#: List of `(wsock, cookie)` awaiting an element, where `wsock` is the
|
|
|
|
#: socketpair's write side, and `cookie` is the string to write.
|
|
|
|
self._sleeping = []
|
|
|
|
#: Number of elements of :attr:`_sleeping` that have already been
|
|
|
|
#: woken, and have a corresponding element index from :attr:`_queue`
|
|
|
|
#: assigned to them.
|
|
|
|
self._waking = 0
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def _on_fork(cls):
|
|
|
|
"""
|
|
|
|
Clean up any files belonging to the parent process after a fork.
|
|
|
|
"""
|
|
|
|
cls._cls_idle_socketpairs = []
|
|
|
|
while cls._cls_all_sockets:
|
|
|
|
cls._cls_all_sockets.pop().close()
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
"""
|
|
|
|
Mark the latch as closed, and cause every sleeping thread to be woken,
|
|
|
|
with :class:`mitogen.core.LatchError` raised in each thread.
|
|
|
|
"""
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
self.closed = True
|
|
|
|
while self._waking < len(self._sleeping):
|
|
|
|
wsock, cookie = self._sleeping[self._waking]
|
|
|
|
self._wake(wsock, cookie)
|
|
|
|
self._waking += 1
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
def size(self):
|
|
|
|
"""
|
|
|
|
Return the number of items currently buffered.
|
|
|
|
|
|
|
|
As with :class:`Queue.Queue`, `0` may be returned even though a
|
|
|
|
subsequent call to :meth:`get` will succeed, since a message may be
|
|
|
|
posted at any moment between :meth:`size` and :meth:`get`.
|
|
|
|
|
|
|
|
As with :class:`Queue.Queue`, `>0` may be returned even though a
|
|
|
|
subsequent call to :meth:`get` will block, since another waiting thread
|
|
|
|
may be woken at any moment between :meth:`size` and :meth:`get`.
|
|
|
|
|
|
|
|
:raises LatchError:
|
|
|
|
The latch has already been marked closed.
|
|
|
|
"""
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
if self.closed:
|
|
|
|
raise LatchError()
|
|
|
|
return len(self._queue)
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
def empty(self):
|
|
|
|
"""
|
|
|
|
Return `size() == 0`.
|
|
|
|
|
|
|
|
.. deprecated:: 0.2.8
|
|
|
|
Use :meth:`size` instead.
|
|
|
|
|
|
|
|
:raises LatchError:
|
|
|
|
The latch has already been marked closed.
|
|
|
|
"""
|
|
|
|
return self.size() == 0
|
|
|
|
|
|
|
|
def _get_socketpair(self):
|
|
|
|
"""
|
|
|
|
Return an unused socketpair, creating one if none exist.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
return self._cls_idle_socketpairs.pop() # pop() must be atomic
|
|
|
|
except IndexError:
|
|
|
|
rsock, wsock = socket.socketpair()
|
|
|
|
set_cloexec(rsock.fileno())
|
|
|
|
set_cloexec(wsock.fileno())
|
|
|
|
self._cls_all_sockets.extend((rsock, wsock))
|
|
|
|
return rsock, wsock
|
|
|
|
|
|
|
|
COOKIE_MAGIC, = struct.unpack('L', b('LTCH') * (struct.calcsize('L')//4))
|
|
|
|
COOKIE_FMT = '>Qqqq' # #545: id() and get_ident() may exceed long on armhfp.
|
|
|
|
COOKIE_SIZE = struct.calcsize(COOKIE_FMT)
|
|
|
|
|
|
|
|
def _make_cookie(self):
|
|
|
|
"""
|
|
|
|
Return a string encoding the ID of the process, instance and thread.
|
|
|
|
This disambiguates legitimate wake-ups, accidental writes to the FD,
|
|
|
|
and buggy internal FD sharing.
|
|
|
|
"""
|
|
|
|
return struct.pack(self.COOKIE_FMT, self.COOKIE_MAGIC,
|
|
|
|
os.getpid(), id(self), thread.get_ident())
|
|
|
|
|
|
|
|
def get(self, timeout=None, block=True):
|
|
|
|
"""
|
|
|
|
Return the next enqueued object, or sleep waiting for one.
|
|
|
|
|
|
|
|
:param float timeout:
|
|
|
|
If not :data:`None`, specifies a timeout in seconds.
|
|
|
|
|
|
|
|
:param bool block:
|
|
|
|
If :data:`False`, immediately raise
|
|
|
|
:class:`mitogen.core.TimeoutError` if the latch is empty.
|
|
|
|
|
|
|
|
:raises mitogen.core.LatchError:
|
|
|
|
:meth:`close` has been called, and the object is no longer valid.
|
|
|
|
|
|
|
|
:raises mitogen.core.TimeoutError:
|
|
|
|
Timeout was reached.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
The de-queued object.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.get(timeout=%r, block=%r)',
|
|
|
|
self, timeout, block)
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
if self.closed:
|
|
|
|
raise LatchError()
|
|
|
|
i = len(self._sleeping)
|
|
|
|
if len(self._queue) > i:
|
|
|
|
_vv and IOLOG.debug('%r.get() -> %r', self, self._queue[i])
|
|
|
|
return self._queue.pop(i)
|
|
|
|
if not block:
|
|
|
|
raise TimeoutError()
|
|
|
|
rsock, wsock = self._get_socketpair()
|
|
|
|
cookie = self._make_cookie()
|
|
|
|
self._sleeping.append((wsock, cookie))
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
poller = self.poller_class()
|
|
|
|
poller.start_receive(rsock.fileno())
|
|
|
|
try:
|
|
|
|
return self._get_sleep(poller, timeout, block, rsock, wsock, cookie)
|
|
|
|
finally:
|
|
|
|
poller.close()
|
|
|
|
|
|
|
|
def _get_sleep(self, poller, timeout, block, rsock, wsock, cookie):
|
|
|
|
"""
|
|
|
|
When a result is not immediately available, sleep waiting for
|
|
|
|
:meth:`put` to write a byte to our socket pair.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug(
|
|
|
|
'%r._get_sleep(timeout=%r, block=%r, fd=%d/%d)',
|
|
|
|
self, timeout, block, rsock.fileno(), wsock.fileno()
|
|
|
|
)
|
|
|
|
|
|
|
|
e = None
|
|
|
|
woken = None
|
|
|
|
try:
|
|
|
|
woken = list(poller.poll(timeout))
|
|
|
|
except Exception:
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
i = self._sleeping.index((wsock, cookie))
|
|
|
|
del self._sleeping[i]
|
|
|
|
if not woken:
|
|
|
|
raise e or TimeoutError()
|
|
|
|
|
|
|
|
got_cookie = rsock.recv(self.COOKIE_SIZE)
|
|
|
|
self._cls_idle_socketpairs.append((rsock, wsock))
|
|
|
|
|
|
|
|
assert cookie == got_cookie, (
|
|
|
|
"Cookie incorrect; got %r, expected %r" \
|
|
|
|
% (binascii.hexlify(got_cookie),
|
|
|
|
binascii.hexlify(cookie))
|
|
|
|
)
|
|
|
|
assert i < self._waking, (
|
|
|
|
"Cookie correct, but no queue element assigned."
|
|
|
|
)
|
|
|
|
self._waking -= 1
|
|
|
|
if self.closed:
|
|
|
|
raise LatchError()
|
|
|
|
_vv and IOLOG.debug('%r.get() wake -> %r', self, self._queue[i])
|
|
|
|
return self._queue.pop(i)
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
def put(self, obj=None):
|
|
|
|
"""
|
|
|
|
Enqueue an object, waking the first thread waiting for a result, if one
|
|
|
|
exists.
|
|
|
|
|
|
|
|
:param obj:
|
|
|
|
Object to enqueue. Defaults to :data:`None` as a convenience when
|
|
|
|
using :class:`Latch` only for synchronization.
|
|
|
|
:raises mitogen.core.LatchError:
|
|
|
|
:meth:`close` has been called, and the object is no longer valid.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.put(%r)', self, obj)
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
if self.closed:
|
|
|
|
raise LatchError()
|
|
|
|
self._queue.append(obj)
|
|
|
|
|
core: wake Latch outside of lock.
Given:
- thread A asleep in Latch._get_sleep()
- thread B calling Latch.put()
Previously,
- B takes lock,
- B wakes socket by dropping GIL and writing to it
- A wakes from poll(), acquires GIL only to find Latch._lock is held
- A drops GIL, sleeps on futex() for _lock
- B wakes, acquires GIL, releases _lock
- A wakes from futex(), acquires lock
Now,
- B takes lock, updates state, releases lock
- B wakes socket by droppping GIL and writing to it
- A wakes from poll(), acquires GIL and _lock
- Everyone lives happily ever after.
6 years ago
|
|
|
wsock = None
|
|
|
|
if self._waking < len(self._sleeping):
|
|
|
|
wsock, cookie = self._sleeping[self._waking]
|
|
|
|
self._waking += 1
|
|
|
|
_vv and IOLOG.debug('%r.put() -> waking wfd=%r',
|
|
|
|
self, wsock.fileno())
|
|
|
|
elif self.notify:
|
|
|
|
self.notify(self)
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
core: wake Latch outside of lock.
Given:
- thread A asleep in Latch._get_sleep()
- thread B calling Latch.put()
Previously,
- B takes lock,
- B wakes socket by dropping GIL and writing to it
- A wakes from poll(), acquires GIL only to find Latch._lock is held
- A drops GIL, sleeps on futex() for _lock
- B wakes, acquires GIL, releases _lock
- A wakes from futex(), acquires lock
Now,
- B takes lock, updates state, releases lock
- B wakes socket by droppping GIL and writing to it
- A wakes from poll(), acquires GIL and _lock
- Everyone lives happily ever after.
6 years ago
|
|
|
if wsock:
|
|
|
|
self._wake(wsock, cookie)
|
|
|
|
|
|
|
|
def _wake(self, wsock, cookie):
|
|
|
|
written, disconnected = io_op(os.write, wsock.fileno(), cookie)
|
|
|
|
assert written == len(cookie) and not disconnected
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Latch(%#x, size=%d, t=%r)' % (
|
|
|
|
id(self),
|
|
|
|
len(self._queue),
|
|
|
|
threading.currentThread().getName(),
|
|
|
|
)
|
|
|
|
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
class Waker(Protocol):
|
|
|
|
"""
|
|
|
|
:class:`Protocol` implementing the `UNIX self-pipe trick`_. Used to wake
|
|
|
|
:class:`Broker` when another thread needs to modify its state, by enqueing
|
|
|
|
a function call to run on the :class:`Broker` thread.
|
|
|
|
|
|
|
|
.. _UNIX self-pipe trick: https://cr.yp.to/docs/selfpipe.html
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
read_size = 1
|
|
|
|
broker_ident = None
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
@classmethod
|
|
|
|
def build_stream(cls, broker):
|
|
|
|
stream = super(Waker, cls).build_stream(broker)
|
|
|
|
stream.accept(*pipe())
|
|
|
|
return stream
|
|
|
|
|
|
|
|
def __init__(self, broker):
|
|
|
|
self._broker = broker
|
|
|
|
self._lock = threading.Lock()
|
|
|
|
self._deferred = []
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Waker(fd=%r/%r)' % (
|
|
|
|
self.stream.receive_side and self.stream.receive_side.fd,
|
|
|
|
self.stream.transmit_side and self.stream.transmit_side.fd,
|
|
|
|
)
|
|
|
|
|
|
|
|
@property
|
|
|
|
def keep_alive(self):
|
|
|
|
"""
|
|
|
|
Prevent immediate Broker shutdown while deferred functions remain.
|
|
|
|
"""
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
return len(self._deferred)
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
def on_receive(self, broker, buf):
|
|
|
|
"""
|
|
|
|
Drain the pipe and fire callbacks. Since :attr:`_deferred` is
|
|
|
|
synchronized, :meth:`defer` and :meth:`on_receive` can conspire to
|
|
|
|
ensure only one byte needs to be pending regardless of queue length.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.on_receive()', self)
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
|
|
|
deferred = self._deferred
|
|
|
|
self._deferred = []
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
|
|
|
for func, args, kwargs in deferred:
|
|
|
|
try:
|
|
|
|
func(*args, **kwargs)
|
|
|
|
except Exception:
|
|
|
|
LOG.exception('defer() crashed: %r(*%r, **%r)',
|
|
|
|
func, args, kwargs)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
broker.shutdown()
|
|
|
|
|
|
|
|
def _wake(self):
|
|
|
|
"""
|
|
|
|
Wake the multiplexer by writing a byte. If Broker is midway through
|
|
|
|
teardown, the FD may already be closed, so ignore EBADF.
|
|
|
|
"""
|
|
|
|
try:
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.stream.transmit_side.write(b(' '))
|
|
|
|
except OSError:
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
if e.args[0] != errno.EBADF:
|
|
|
|
raise
|
|
|
|
|
|
|
|
broker_shutdown_msg = (
|
|
|
|
"An attempt was made to enqueue a message with a Broker that has "
|
|
|
|
"already exitted. It is likely your program called Broker.shutdown() "
|
|
|
|
"too early."
|
|
|
|
)
|
|
|
|
|
|
|
|
def defer(self, func, *args, **kwargs):
|
|
|
|
"""
|
|
|
|
Arrange for `func()` to execute on the broker thread. This function
|
|
|
|
returns immediately without waiting the result of `func()`. Use
|
|
|
|
:meth:`defer_sync` to block until a result is available.
|
|
|
|
|
|
|
|
:raises mitogen.core.Error:
|
|
|
|
:meth:`defer` was called after :class:`Broker` has begun shutdown.
|
|
|
|
"""
|
|
|
|
if thread.get_ident() == self.broker_ident:
|
|
|
|
_vv and IOLOG.debug('%r.defer() [immediate]', self)
|
|
|
|
return func(*args, **kwargs)
|
|
|
|
if self._broker._exitted:
|
|
|
|
raise Error(self.broker_shutdown_msg)
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
_vv and IOLOG.debug('%r.defer() [fd=%r]', self,
|
|
|
|
self.stream.transmit_side.fd)
|
|
|
|
self._lock.acquire()
|
|
|
|
try:
|
core: wake Waker outside of lock.
Given:
- Broker asleep in poll()
- thread B calling Latch.put()
Previously,
- B takes lock,
- B wakes socket by dropping GIL and writing to it
- Broker wakes from poll(), acquires GIL only to find Latch._lock is held
- Broker drops GIL, sleeps on futex() for _lock
- B wakes, acquires GIL, releases _lock
- Broker wakes from futex(), acquires lock
Now,
- B takes lock, updates state, releases lock
- B wakes socket by droppping GIL and writing to it
- Broker wakes from poll(), acquires GIL and _lock
- Everyone lives happily ever after.
6 years ago
|
|
|
should_wake = not self._deferred
|
|
|
|
self._deferred.append((func, args, kwargs))
|
|
|
|
finally:
|
|
|
|
self._lock.release()
|
|
|
|
|
core: wake Waker outside of lock.
Given:
- Broker asleep in poll()
- thread B calling Latch.put()
Previously,
- B takes lock,
- B wakes socket by dropping GIL and writing to it
- Broker wakes from poll(), acquires GIL only to find Latch._lock is held
- Broker drops GIL, sleeps on futex() for _lock
- B wakes, acquires GIL, releases _lock
- Broker wakes from futex(), acquires lock
Now,
- B takes lock, updates state, releases lock
- B wakes socket by droppping GIL and writing to it
- Broker wakes from poll(), acquires GIL and _lock
- Everyone lives happily ever after.
6 years ago
|
|
|
if should_wake:
|
|
|
|
self._wake()
|
|
|
|
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
class IoLoggerProtocol(DelimitedProtocol):
|
|
|
|
"""
|
|
|
|
Attached to one end of a socket pair whose other end overwrites one of the
|
|
|
|
standard ``stdout`` or ``stderr`` file descriptors in a child context.
|
|
|
|
Received data is split up into lines, decoded as UTF-8 and logged to the
|
|
|
|
:mod:`logging` package as either the ``stdout`` or ``stderr`` logger.
|
|
|
|
|
|
|
|
Logging in child contexts is in turn forwarded to the master process using
|
|
|
|
:class:`LogHandler`.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
@classmethod
|
|
|
|
def build_stream(cls, name, dest_fd):
|
|
|
|
"""
|
|
|
|
Even though the file descriptor `dest_fd` will hold the opposite end of
|
|
|
|
the socket open, we must keep a separate dup() of it (i.e. wsock) in
|
|
|
|
case some code decides to overwrite `dest_fd` later, which would
|
|
|
|
prevent break :meth:`on_shutdown` from calling :meth:`shutdown()
|
|
|
|
<socket.socket.shutdown>` on it.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
"""
|
|
|
|
rsock, wsock = socket.socketpair()
|
|
|
|
os.dup2(wsock.fileno(), dest_fd)
|
|
|
|
stream = super(IoLoggerProtocol, cls).build_stream(name)
|
|
|
|
stream.name = name
|
|
|
|
stream.accept(rsock, wsock)
|
|
|
|
return stream
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
def __init__(self, name):
|
|
|
|
self._log = logging.getLogger(name)
|
|
|
|
# #453: prevent accidental log initialization in a child creating a
|
|
|
|
# feedback loop.
|
|
|
|
self._log.propagate = False
|
|
|
|
self._log.handlers = logging.getLogger().handlers[:]
|
|
|
|
|
|
|
|
def on_shutdown(self, broker):
|
|
|
|
"""
|
|
|
|
Shut down the write end of the socket, preventing any further writes to
|
|
|
|
it by this process, or subprocess that inherited it. This allows any
|
|
|
|
remaining kernel-buffered data to be drained during graceful shutdown
|
|
|
|
without the buffer continuously refilling due to some out of control
|
|
|
|
child process.
|
|
|
|
"""
|
|
|
|
_v and LOG.debug('%r: shutting down', self)
|
|
|
|
if not IS_WSL:
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
# #333: WSL generates invalid readiness indication on shutdown().
|
|
|
|
# This modifies the *kernel object* inherited by children, causing
|
|
|
|
# EPIPE on subsequent writes to any dupped FD in any process. The
|
|
|
|
# read side can then drain completely of prior buffered data.
|
|
|
|
self.stream.transmit_side.fp.shutdown(socket.SHUT_WR)
|
|
|
|
self.stream.transmit_side.close()
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
def on_line_received(self, line):
|
|
|
|
"""
|
|
|
|
Decode the received line as UTF-8 and pass it to the logging framework.
|
|
|
|
"""
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._log.info('%s', line.decode('utf-8', 'replace'))
|
|
|
|
|
|
|
|
|
|
|
|
class Router(object):
|
|
|
|
"""
|
|
|
|
Route messages between contexts, and invoke local handlers for messages
|
|
|
|
addressed to this context. :meth:`Router.route() <route>` straddles the
|
|
|
|
:class:`Broker` thread and user threads, it is safe to call anywhere.
|
|
|
|
|
|
|
|
**Note:** This is the somewhat limited core version of the Router class
|
|
|
|
used by child contexts. The master subclass is documented below this one.
|
|
|
|
"""
|
|
|
|
#: The :class:`mitogen.core.Context` subclass to use when constructing new
|
|
|
|
#: :class:`Context` objects in :meth:`myself` and :meth:`context_by_id`.
|
|
|
|
#: Permits :class:`Router` subclasses to extend the :class:`Context`
|
|
|
|
#: interface, as done in :class:`mitogen.parent.Router`.
|
|
|
|
context_class = Context
|
|
|
|
|
|
|
|
max_message_size = 128 * 1048576
|
|
|
|
|
|
|
|
#: When :data:`True`, permit children to only communicate with the current
|
|
|
|
#: context or a parent of the current context. Routing between siblings or
|
|
|
|
#: children of parents is prohibited, ensuring no communication is possible
|
|
|
|
#: between intentionally partitioned networks, such as when a program
|
|
|
|
#: simultaneously manipulates hosts spread across a corporate and a
|
|
|
|
#: production network, or production networks that are otherwise
|
|
|
|
#: air-gapped.
|
|
|
|
#:
|
|
|
|
#: Sending a prohibited message causes an error to be logged and a dead
|
|
|
|
#: message to be sent in reply to the errant message, if that message has
|
|
|
|
#: ``reply_to`` set.
|
|
|
|
#:
|
|
|
|
#: The value of :data:`unidirectional` becomes the default for the
|
|
|
|
#: :meth:`local() <mitogen.master.Router.local>` `unidirectional`
|
|
|
|
#: parameter.
|
|
|
|
unidirectional = False
|
|
|
|
|
|
|
|
duplicate_handle_msg = 'cannot register a handle that already exists'
|
|
|
|
refused_msg = 'refused by policy'
|
|
|
|
invalid_handle_msg = 'invalid handle'
|
|
|
|
too_large_msg = 'message too large (max %d bytes)'
|
|
|
|
respondent_disconnect_msg = 'the respondent Context has disconnected'
|
|
|
|
broker_exit_msg = 'Broker has exitted'
|
|
|
|
no_route_msg = 'no route to %r, my ID is %r'
|
|
|
|
unidirectional_msg = (
|
|
|
|
'routing mode prevents forward of message from context %d to '
|
|
|
|
'context %d via context %d'
|
|
|
|
)
|
|
|
|
|
|
|
|
def __init__(self, broker):
|
|
|
|
self.broker = broker
|
core: don't deregister Router handles until Broker exit.
Lots of "invalid handle: ..., 102" messages started appearing during
exit recently because ordering changed slightly, and local handles were
sent _DEAD even though the broker loop was still progressing through
shutdown.
The "shutdown" event is too early to close handles: it is the start of
the grace period where streams and downstream contexts can finish up any
work and deliver buffered data, including FORWARD_LOG messages that
haven't arrived yet.
So instead,
- move the _DEAD logic to the "exit" event,
- get rid of Context.on_shutdown() entirely, it's been unused for over
a month,
- get rid of the "crash" event, since it always fires prior to "exit",
and its only use was to send _DEAD to local handles, which now happens
during exit anyway.
7 years ago
|
|
|
listen(broker, 'exit', self._on_broker_exit)
|
|
|
|
self._setup_logging()
|
|
|
|
|
|
|
|
self._write_lock = threading.Lock()
|
|
|
|
#: context ID -> Stream; must hold _write_lock to edit or iterate
|
|
|
|
self._stream_by_id = {}
|
|
|
|
#: List of contexts to notify of shutdown; must hold _write_lock
|
|
|
|
self._context_by_id = {}
|
|
|
|
self._last_handle = itertools.count(1000)
|
|
|
|
#: handle -> (persistent?, func(msg))
|
|
|
|
self._handle_map = {}
|
|
|
|
#: Context -> set { handle, .. }
|
|
|
|
self._handles_by_respondent = {}
|
|
|
|
self.add_handler(self._on_del_route, DEL_ROUTE)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Router(%r)' % (self.broker,)
|
|
|
|
|
|
|
|
def _setup_logging(self):
|
|
|
|
"""
|
|
|
|
This is done in the :class:`Router` constructor for historical reasons.
|
|
|
|
It must be called before ExternalContext logs its first messages, but
|
|
|
|
after logging has been setup. It must also be called when any router is
|
|
|
|
constructed for a consumer app.
|
|
|
|
"""
|
|
|
|
# Here seems as good a place as any.
|
|
|
|
global _v, _vv
|
|
|
|
_v = logging.getLogger().level <= logging.DEBUG
|
|
|
|
_vv = IOLOG.level <= logging.DEBUG
|
|
|
|
|
|
|
|
def _on_del_route(self, msg):
|
|
|
|
"""
|
|
|
|
Stub :data:`DEL_ROUTE` handler; fires 'disconnect' events on the
|
|
|
|
corresponding :attr:`_context_by_id` member. This is replaced by
|
|
|
|
:class:`mitogen.parent.RouteMonitor` in an upgraded context.
|
|
|
|
"""
|
|
|
|
if msg.is_dead:
|
|
|
|
return
|
|
|
|
|
|
|
|
target_id_s, _, name = bytes_partition(msg.data, b(':'))
|
|
|
|
target_id = int(target_id_s, 10)
|
|
|
|
LOG.error('%r: deleting route to %s (%d)',
|
|
|
|
self, to_text(name), target_id)
|
|
|
|
context = self._context_by_id.get(target_id)
|
|
|
|
if context:
|
|
|
|
fire(context, 'disconnect')
|
|
|
|
else:
|
|
|
|
LOG.debug('DEL_ROUTE for unknown ID %r: %r', target_id, msg)
|
|
|
|
|
|
|
|
def _on_stream_disconnect(self, stream):
|
|
|
|
notify = []
|
|
|
|
self._write_lock.acquire()
|
|
|
|
try:
|
|
|
|
for context in list(self._context_by_id.values()):
|
|
|
|
stream_ = self._stream_by_id.get(context.context_id)
|
|
|
|
if stream_ is stream:
|
|
|
|
del self._stream_by_id[context.context_id]
|
|
|
|
notify.append(context)
|
|
|
|
finally:
|
|
|
|
self._write_lock.release()
|
|
|
|
|
|
|
|
# Happens outside lock as e.g. RouteMonitor wants the same lock.
|
|
|
|
for context in notify:
|
|
|
|
context.on_disconnect()
|
|
|
|
|
core: don't deregister Router handles until Broker exit.
Lots of "invalid handle: ..., 102" messages started appearing during
exit recently because ordering changed slightly, and local handles were
sent _DEAD even though the broker loop was still progressing through
shutdown.
The "shutdown" event is too early to close handles: it is the start of
the grace period where streams and downstream contexts can finish up any
work and deliver buffered data, including FORWARD_LOG messages that
haven't arrived yet.
So instead,
- move the _DEAD logic to the "exit" event,
- get rid of Context.on_shutdown() entirely, it's been unused for over
a month,
- get rid of the "crash" event, since it always fires prior to "exit",
and its only use was to send _DEAD to local handles, which now happens
during exit anyway.
7 years ago
|
|
|
def _on_broker_exit(self):
|
|
|
|
"""
|
|
|
|
Called prior to broker exit, informs callbacks registered with
|
|
|
|
:meth:`add_handler` the connection is dead.
|
|
|
|
"""
|
|
|
|
_v and LOG.debug('%r: broker has exitted', self)
|
|
|
|
while self._handle_map:
|
|
|
|
_, (_, func, _, _) = self._handle_map.popitem()
|
|
|
|
func(Message.dead(self.broker_exit_msg))
|
|
|
|
|
|
|
|
def myself(self):
|
|
|
|
"""
|
|
|
|
Return a :class:`Context` referring to the current process. Since
|
|
|
|
:class:`Context` is serializable, this is convenient to use in remote
|
|
|
|
function call parameter lists.
|
|
|
|
"""
|
|
|
|
return self.context_class(
|
|
|
|
router=self,
|
|
|
|
context_id=mitogen.context_id,
|
|
|
|
name='self',
|
|
|
|
)
|
|
|
|
|
|
|
|
def context_by_id(self, context_id, via_id=None, create=True, name=None):
|
|
|
|
"""
|
|
|
|
Return or construct a :class:`Context` given its ID. An internal
|
|
|
|
mapping of ID to the canonical :class:`Context` representing that ID,
|
|
|
|
so that :ref:`signals` can be raised.
|
|
|
|
|
|
|
|
This may be called from any thread, lookup and construction are atomic.
|
|
|
|
|
|
|
|
:param int context_id:
|
|
|
|
The context ID to look up.
|
|
|
|
:param int via_id:
|
|
|
|
If the :class:`Context` does not already exist, set its
|
|
|
|
:attr:`Context.via` to the :class:`Context` matching this ID.
|
|
|
|
:param bool create:
|
|
|
|
If the :class:`Context` does not already exist, create it.
|
|
|
|
:param str name:
|
|
|
|
If the :class:`Context` does not already exist, set its name.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
:class:`Context`, or return :data:`None` if `create` is
|
|
|
|
:data:`False` and no :class:`Context` previously existed.
|
|
|
|
"""
|
|
|
|
context = self._context_by_id.get(context_id)
|
|
|
|
if context:
|
|
|
|
return context
|
|
|
|
|
|
|
|
if create and via_id is not None:
|
|
|
|
via = self.context_by_id(via_id)
|
|
|
|
else:
|
|
|
|
via = None
|
|
|
|
|
|
|
|
self._write_lock.acquire()
|
|
|
|
try:
|
|
|
|
context = self._context_by_id.get(context_id)
|
|
|
|
if create and not context:
|
|
|
|
context = self.context_class(self, context_id, name=name)
|
|
|
|
context.via = via
|
|
|
|
self._context_by_id[context_id] = context
|
|
|
|
finally:
|
|
|
|
self._write_lock.release()
|
|
|
|
|
|
|
|
return context
|
|
|
|
|
|
|
|
def register(self, context, stream):
|
|
|
|
"""
|
|
|
|
Register a newly constructed context and its associated stream, and add
|
|
|
|
the stream's receive side to the I/O multiplexer. This method remains
|
|
|
|
public while the design has not yet settled.
|
|
|
|
"""
|
|
|
|
_v and LOG.debug('%s: registering %r to stream %r',
|
|
|
|
self, context, stream)
|
|
|
|
self._write_lock.acquire()
|
|
|
|
try:
|
|
|
|
self._stream_by_id[context.context_id] = stream
|
|
|
|
self._context_by_id[context.context_id] = context
|
|
|
|
finally:
|
|
|
|
self._write_lock.release()
|
|
|
|
|
|
|
|
self.broker.start_receive(stream)
|
|
|
|
listen(stream, 'disconnect', lambda: self._on_stream_disconnect(stream))
|
|
|
|
|
|
|
|
def stream_by_id(self, dst_id):
|
|
|
|
"""
|
|
|
|
Return the :class:`Stream` that should be used to communicate with
|
|
|
|
`dst_id`. If a specific route for `dst_id` is not known, a reference to
|
|
|
|
the parent context's stream is returned. If the parent is disconnected,
|
|
|
|
or when running in the master context, return :data:`None` instead.
|
|
|
|
|
|
|
|
This can be used from any thread, but its output is only meaningful
|
|
|
|
from the context of the :class:`Broker` thread, as disconnection or
|
|
|
|
replacement could happen in parallel on the broker thread at any
|
|
|
|
moment.
|
|
|
|
"""
|
|
|
|
return (
|
|
|
|
self._stream_by_id.get(dst_id) or
|
|
|
|
self._stream_by_id.get(mitogen.parent_id)
|
|
|
|
)
|
|
|
|
|
|
|
|
def del_handler(self, handle):
|
|
|
|
"""
|
|
|
|
Remove the handle registered for `handle`
|
|
|
|
|
|
|
|
:raises KeyError:
|
|
|
|
The handle wasn't registered.
|
|
|
|
"""
|
|
|
|
_, _, _, respondent = self._handle_map.pop(handle)
|
|
|
|
if respondent:
|
|
|
|
self._handles_by_respondent[respondent].discard(handle)
|
|
|
|
|
|
|
|
def add_handler(self, fn, handle=None, persist=True,
|
|
|
|
policy=None, respondent=None,
|
|
|
|
overwrite=False):
|
|
|
|
"""
|
|
|
|
Invoke `fn(msg)` on the :class:`Broker` thread for each Message sent to
|
|
|
|
`handle` from this context. Unregister after one invocation if
|
|
|
|
`persist` is :data:`False`. If `handle` is :data:`None`, a new handle
|
|
|
|
is allocated and returned.
|
|
|
|
|
|
|
|
:param int handle:
|
|
|
|
If not :data:`None`, an explicit handle to register, usually one of
|
|
|
|
the ``mitogen.core.*`` constants. If unspecified, a new unused
|
|
|
|
handle will be allocated.
|
|
|
|
|
|
|
|
:param bool persist:
|
|
|
|
If :data:`False`, the handler will be unregistered after a single
|
|
|
|
message has been received.
|
|
|
|
|
|
|
|
:param mitogen.core.Context respondent:
|
|
|
|
Context that messages to this handle are expected to be sent from.
|
|
|
|
If specified, arranges for a dead message to be delivered to `fn`
|
|
|
|
when disconnection of the context is detected.
|
|
|
|
|
|
|
|
In future `respondent` will likely also be used to prevent other
|
|
|
|
contexts from sending messages to the handle.
|
|
|
|
|
|
|
|
:param function policy:
|
|
|
|
Function invoked as `policy(msg, stream)` where `msg` is a
|
|
|
|
:class:`mitogen.core.Message` about to be delivered, and `stream`
|
|
|
|
is the :class:`mitogen.core.Stream` on which it was received. The
|
|
|
|
function must return :data:`True`, otherwise an error is logged and
|
|
|
|
delivery is refused.
|
|
|
|
|
|
|
|
Two built-in policy functions exist:
|
|
|
|
|
|
|
|
* :func:`has_parent_authority`: requires the message arrived from a
|
|
|
|
parent context, or a context acting with a parent context's
|
|
|
|
authority (``auth_id``).
|
|
|
|
|
|
|
|
* :func:`mitogen.parent.is_immediate_child`: requires the
|
|
|
|
message arrived from an immediately connected child, for use in
|
|
|
|
messaging patterns where either something becomes buggy or
|
|
|
|
insecure by permitting indirect upstream communication.
|
|
|
|
|
|
|
|
In case of refusal, and the message's ``reply_to`` field is
|
|
|
|
nonzero, a :class:`mitogen.core.CallError` is delivered to the
|
|
|
|
sender indicating refusal occurred.
|
|
|
|
|
|
|
|
:param bool overwrite:
|
|
|
|
If :data:`True`, allow existing handles to be silently overwritten.
|
|
|
|
|
|
|
|
:return:
|
|
|
|
`handle`, or if `handle` was :data:`None`, the newly allocated
|
|
|
|
handle.
|
|
|
|
:raises Error:
|
|
|
|
Attemp to register handle that was already registered.
|
|
|
|
"""
|
|
|
|
handle = handle or next(self._last_handle)
|
|
|
|
_vv and IOLOG.debug('%r.add_handler(%r, %r, %r)', self, fn, handle, persist)
|
|
|
|
if handle in self._handle_map and not overwrite:
|
|
|
|
raise Error(self.duplicate_handle_msg)
|
|
|
|
|
|
|
|
self._handle_map[handle] = persist, fn, policy, respondent
|
|
|
|
if respondent:
|
|
|
|
if respondent not in self._handles_by_respondent:
|
|
|
|
self._handles_by_respondent[respondent] = set()
|
|
|
|
listen(respondent, 'disconnect',
|
|
|
|
lambda: self._on_respondent_disconnect(respondent))
|
|
|
|
self._handles_by_respondent[respondent].add(handle)
|
|
|
|
|
|
|
|
return handle
|
|
|
|
|
|
|
|
def _on_respondent_disconnect(self, context):
|
|
|
|
for handle in self._handles_by_respondent.pop(context, ()):
|
|
|
|
_, fn, _, _ = self._handle_map[handle]
|
|
|
|
fn(Message.dead(self.respondent_disconnect_msg))
|
|
|
|
del self._handle_map[handle]
|
|
|
|
|
|
|
|
def _maybe_send_dead(self, unreachable, msg, reason, *args):
|
|
|
|
"""
|
|
|
|
Send a dead message to either the original sender or the intended
|
|
|
|
recipient of `msg`, if the original sender was expecting a reply
|
|
|
|
(because its `reply_to` was set), otherwise assume the message is a
|
|
|
|
reply of some sort, and send the dead message to the original
|
|
|
|
destination.
|
|
|
|
|
|
|
|
:param bool unreachable:
|
|
|
|
If :data:`True`, the recipient is known to be dead or routing
|
|
|
|
failed due to a security precaution, so don't attempt to fallback
|
|
|
|
to sending the dead message to the recipient if the original sender
|
|
|
|
did not include a reply address.
|
|
|
|
:param mitogen.core.Message msg:
|
|
|
|
Message that triggered the dead message.
|
|
|
|
:param str reason:
|
|
|
|
Human-readable error reason.
|
|
|
|
:param tuple args:
|
|
|
|
Elements to interpolate with `reason`.
|
|
|
|
"""
|
|
|
|
if args:
|
|
|
|
reason %= args
|
|
|
|
LOG.debug('%r: %r is dead: %r', self, msg, reason)
|
|
|
|
if msg.reply_to and not msg.is_dead:
|
|
|
|
msg.reply(Message.dead(reason=reason), router=self)
|
|
|
|
elif not unreachable:
|
|
|
|
self._async_route(
|
|
|
|
Message.dead(
|
|
|
|
dst_id=msg.dst_id,
|
|
|
|
handle=msg.handle,
|
|
|
|
reason=reason,
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
def _invoke(self, msg, stream):
|
|
|
|
# IOLOG.debug('%r._invoke(%r)', self, msg)
|
|
|
|
try:
|
|
|
|
persist, fn, policy, respondent = self._handle_map[msg.handle]
|
|
|
|
except KeyError:
|
|
|
|
self._maybe_send_dead(True, msg, reason=self.invalid_handle_msg)
|
|
|
|
return
|
|
|
|
|
|
|
|
if respondent and not (msg.is_dead or
|
|
|
|
msg.src_id == respondent.context_id):
|
|
|
|
self._maybe_send_dead(True, msg, 'reply from unexpected context')
|
|
|
|
return
|
|
|
|
|
|
|
|
if policy and not policy(msg, stream):
|
|
|
|
self._maybe_send_dead(True, msg, self.refused_msg)
|
|
|
|
return
|
|
|
|
|
|
|
|
if not persist:
|
|
|
|
self.del_handler(msg.handle)
|
|
|
|
|
|
|
|
try:
|
|
|
|
fn(msg)
|
|
|
|
except Exception:
|
|
|
|
LOG.exception('%r._invoke(%r): %r crashed', self, msg, fn)
|
|
|
|
|
|
|
|
def _async_route(self, msg, in_stream=None):
|
|
|
|
"""
|
|
|
|
Arrange for `msg` to be forwarded towards its destination. If its
|
|
|
|
destination is the local context, then arrange for it to be dispatched
|
|
|
|
using the local handlers.
|
|
|
|
|
|
|
|
This is a lower overhead version of :meth:`route` that may only be
|
|
|
|
called from the :class:`Broker` thread.
|
|
|
|
|
|
|
|
:param Stream in_stream:
|
|
|
|
If not :data:`None`, the stream the message arrived on. Used for
|
|
|
|
performing source route verification, to ensure sensitive messages
|
|
|
|
such as ``CALL_FUNCTION`` arrive only from trusted contexts.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r._async_route(%r, %r)', self, msg, in_stream)
|
|
|
|
|
|
|
|
if len(msg.data) > self.max_message_size:
|
|
|
|
self._maybe_send_dead(False, msg, self.too_large_msg % (
|
|
|
|
self.max_message_size,
|
|
|
|
))
|
|
|
|
return
|
|
|
|
|
|
|
|
parent_stream = self._stream_by_id.get(mitogen.parent_id)
|
|
|
|
src_stream = self._stream_by_id.get(msg.src_id, parent_stream)
|
|
|
|
|
|
|
|
# When the ingress stream is known, verify the message was received on
|
|
|
|
# the same as the stream we would expect to receive messages from the
|
|
|
|
# src_id and auth_id. This is like Reverse Path Filtering in IP, and
|
|
|
|
# ensures messages from a privileged context cannot be spoofed by a
|
|
|
|
# child.
|
|
|
|
if in_stream:
|
|
|
|
auth_stream = self._stream_by_id.get(msg.auth_id, parent_stream)
|
|
|
|
if in_stream != auth_stream:
|
|
|
|
LOG.error('%r: bad auth_id: got %r via %r, not %r: %r',
|
|
|
|
self, msg.auth_id, in_stream, auth_stream, msg)
|
|
|
|
return
|
|
|
|
|
|
|
|
if msg.src_id != msg.auth_id and in_stream != src_stream:
|
|
|
|
LOG.error('%r: bad src_id: got %r via %r, not %r: %r',
|
|
|
|
self, msg.src_id, in_stream, src_stream, msg)
|
|
|
|
return
|
|
|
|
|
|
|
|
# If the stream's MitogenProtocol has auth_id set, copy it to the
|
|
|
|
# message. This allows subtrees to become privileged by stamping a
|
|
|
|
# parent's context ID. It is used by mitogen.unix to mark client
|
|
|
|
# streams (like Ansible WorkerProcess) as having the same rights as
|
|
|
|
# the parent.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if in_stream.protocol.auth_id is not None:
|
|
|
|
msg.auth_id = in_stream.protocol.auth_id
|
|
|
|
|
|
|
|
# Record the IDs the source ever communicated with.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
in_stream.protocol.egress_ids.add(msg.dst_id)
|
|
|
|
|
|
|
|
if msg.dst_id == mitogen.context_id:
|
|
|
|
return self._invoke(msg, in_stream)
|
|
|
|
|
|
|
|
out_stream = self._stream_by_id.get(msg.dst_id)
|
|
|
|
if (not out_stream) and (parent_stream != src_stream or not in_stream):
|
|
|
|
# No downstream route exists. The message could be from a child or
|
|
|
|
# ourselves for a parent, in which case we must forward it
|
|
|
|
# upstream, or it could be from a parent for a dead child, in which
|
|
|
|
# case its src_id/auth_id would fail verification if returned to
|
|
|
|
# the parent, so in that case reply with a dead message instead.
|
|
|
|
out_stream = parent_stream
|
|
|
|
|
|
|
|
if out_stream is None:
|
|
|
|
self._maybe_send_dead(True, msg, self.no_route_msg,
|
|
|
|
msg.dst_id, mitogen.context_id)
|
|
|
|
return
|
|
|
|
|
|
|
|
if in_stream and self.unidirectional and not \
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
(in_stream.protocol.is_privileged or
|
|
|
|
out_stream.protocol.is_privileged):
|
|
|
|
self._maybe_send_dead(True, msg, self.unidirectional_msg,
|
|
|
|
in_stream.protocol.remote_id,
|
|
|
|
out_stream.protocol.remote_id,
|
|
|
|
mitogen.context_id)
|
|
|
|
return
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
out_stream.protocol._send(msg)
|
|
|
|
|
|
|
|
def route(self, msg):
|
|
|
|
"""
|
|
|
|
Arrange for the :class:`Message` `msg` to be delivered to its
|
|
|
|
destination using any relevant downstream context, or if none is found,
|
|
|
|
by forwarding the message upstream towards the master context. If `msg`
|
|
|
|
is destined for the local context, it is dispatched using the handles
|
|
|
|
registered with :meth:`add_handler`.
|
|
|
|
|
|
|
|
This may be called from any thread.
|
|
|
|
"""
|
|
|
|
self.broker.defer(self._async_route, msg)
|
|
|
|
|
|
|
|
|
|
|
|
class NullTimerList(object):
|
|
|
|
def get_timeout(self):
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
class Broker(object):
|
|
|
|
"""
|
|
|
|
Responsible for handling I/O multiplexing in a private thread.
|
|
|
|
|
|
|
|
**Note:** This somewhat limited core version is used by children. The
|
|
|
|
master subclass is documented below.
|
|
|
|
"""
|
|
|
|
poller_class = Poller
|
|
|
|
_waker = None
|
|
|
|
_thread = None
|
|
|
|
|
|
|
|
# :func:`mitogen.parent._upgrade_broker` replaces this with
|
|
|
|
# :class:`mitogen.parent.TimerList` during upgrade.
|
|
|
|
timers = NullTimerList()
|
|
|
|
|
|
|
|
#: Seconds grace to allow :class:`streams <Stream>` to shutdown gracefully
|
|
|
|
#: before force-disconnecting them during :meth:`shutdown`.
|
|
|
|
shutdown_timeout = 3.0
|
|
|
|
|
|
|
|
def __init__(self, poller_class=None, activate_compat=True):
|
|
|
|
self._alive = True
|
|
|
|
self._exitted = False
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._waker = Waker.build_stream(self)
|
|
|
|
#: Arrange for `func(\*args, \**kwargs)` to be executed on the broker
|
|
|
|
#: thread, or immediately if the current thread is the broker thread.
|
|
|
|
#: Safe to call from any thread.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.defer = self._waker.protocol.defer
|
|
|
|
self.poller = self.poller_class()
|
|
|
|
self.poller.start_receive(
|
|
|
|
self._waker.receive_side.fd,
|
|
|
|
(self._waker.receive_side, self._waker.on_receive)
|
|
|
|
)
|
|
|
|
self._thread = threading.Thread(
|
|
|
|
target=self._broker_main,
|
|
|
|
name='mitogen.broker'
|
|
|
|
)
|
|
|
|
self._thread.start()
|
|
|
|
if activate_compat:
|
|
|
|
self._py24_25_compat()
|
|
|
|
|
|
|
|
def _py24_25_compat(self):
|
|
|
|
"""
|
|
|
|
Python 2.4/2.5 have grave difficulties with threads/fork. We
|
|
|
|
mandatorily quiesce all running threads during fork using a
|
|
|
|
monkey-patch there.
|
|
|
|
"""
|
|
|
|
if sys.version_info < (2, 6):
|
|
|
|
# import_module() is used to avoid dep scanner.
|
|
|
|
os_fork = import_module('mitogen.os_fork')
|
|
|
|
os_fork._notice_broker_or_pool(self)
|
|
|
|
|
|
|
|
def start_receive(self, stream):
|
|
|
|
"""
|
|
|
|
Mark the :attr:`receive_side <Stream.receive_side>` on `stream` as
|
|
|
|
ready for reading. Safe to call from any thread. When the associated
|
|
|
|
file descriptor becomes ready for reading,
|
|
|
|
:meth:`BasicStream.on_receive` will be called.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.start_receive(%r)', self, stream)
|
|
|
|
side = stream.receive_side
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
assert side and not side.closed
|
|
|
|
self.defer(self.poller.start_receive,
|
|
|
|
side.fd, (side, stream.on_receive))
|
|
|
|
|
|
|
|
def stop_receive(self, stream):
|
|
|
|
"""
|
|
|
|
Mark the :attr:`receive_side <Stream.receive_side>` on `stream` as not
|
|
|
|
ready for reading. Safe to call from any thread.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r.stop_receive(%r)', self, stream)
|
|
|
|
self.defer(self.poller.stop_receive, stream.receive_side.fd)
|
|
|
|
|
|
|
|
def _start_transmit(self, stream):
|
|
|
|
"""
|
|
|
|
Mark the :attr:`transmit_side <Stream.transmit_side>` on `stream` as
|
|
|
|
ready for writing. Must only be called from the Broker thread. When the
|
|
|
|
associated file descriptor becomes ready for writing,
|
|
|
|
:meth:`BasicStream.on_transmit` will be called.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r._start_transmit(%r)', self, stream)
|
|
|
|
side = stream.transmit_side
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
assert side and not side.closed
|
|
|
|
self.poller.start_transmit(side.fd, (side, stream.on_transmit))
|
|
|
|
|
|
|
|
def _stop_transmit(self, stream):
|
|
|
|
"""
|
|
|
|
Mark the :attr:`transmit_side <Stream.receive_side>` on `stream` as not
|
|
|
|
ready for writing.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r._stop_transmit(%r)', self, stream)
|
|
|
|
self.poller.stop_transmit(stream.transmit_side.fd)
|
|
|
|
|
|
|
|
def keep_alive(self):
|
|
|
|
"""
|
|
|
|
Return :data:`True` if any reader's :attr:`Side.keep_alive` attribute
|
|
|
|
is :data:`True`, or any :class:`Context` is still registered that is
|
|
|
|
not the master. Used to delay shutdown while some important work is in
|
|
|
|
progress (e.g. log draining).
|
|
|
|
"""
|
|
|
|
it = (side.keep_alive for (_, (side, _)) in self.poller.readers)
|
|
|
|
return sum(it, 0) > 0 or self.timers.get_timeout() is not None
|
|
|
|
|
|
|
|
def defer_sync(self, func):
|
|
|
|
"""
|
|
|
|
Arrange for `func()` to execute on :class:`Broker` thread, blocking the
|
|
|
|
current thread until a result or exception is available.
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
Return value of `func()`.
|
|
|
|
"""
|
|
|
|
latch = Latch()
|
|
|
|
def wrapper():
|
|
|
|
try:
|
|
|
|
latch.put(func())
|
|
|
|
except Exception:
|
|
|
|
latch.put(sys.exc_info()[1])
|
|
|
|
self.defer(wrapper)
|
|
|
|
res = latch.get()
|
|
|
|
if isinstance(res, Exception):
|
|
|
|
raise res
|
|
|
|
return res
|
|
|
|
|
|
|
|
def _call(self, stream, func):
|
|
|
|
"""
|
|
|
|
Call `func(self)`, catching any exception that might occur, logging it,
|
|
|
|
and force-disconnecting the related `stream`.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
func(self)
|
|
|
|
except Exception:
|
|
|
|
LOG.exception('%r crashed', stream)
|
|
|
|
stream.on_disconnect(self)
|
|
|
|
|
|
|
|
def _loop_once(self, timeout=None):
|
|
|
|
"""
|
|
|
|
Execute a single :class:`Poller` wait, dispatching any IO events that
|
|
|
|
caused the wait to complete.
|
|
|
|
|
|
|
|
:param float timeout:
|
|
|
|
If not :data:`None`, maximum time in seconds to wait for events.
|
|
|
|
"""
|
|
|
|
_vv and IOLOG.debug('%r._loop_once(%r, %r)',
|
|
|
|
self, timeout, self.poller)
|
|
|
|
|
|
|
|
timer_to = self.timers.get_timeout()
|
|
|
|
if timeout is None:
|
|
|
|
timeout = timer_to
|
|
|
|
elif timer_to is not None and timer_to < timeout:
|
|
|
|
timeout = timer_to
|
|
|
|
|
|
|
|
#IOLOG.debug('readers =\n%s', pformat(self.poller.readers))
|
|
|
|
#IOLOG.debug('writers =\n%s', pformat(self.poller.writers))
|
|
|
|
for side, func in self.poller.poll(timeout):
|
|
|
|
self._call(side.stream, func)
|
|
|
|
if timer_to is not None:
|
|
|
|
self.timers.expire()
|
|
|
|
|
|
|
|
def _broker_exit(self):
|
|
|
|
"""
|
|
|
|
Forcefully call :meth:`Stream.on_disconnect` on any streams that failed
|
|
|
|
to shut down gracefully, then discard the :class:`Poller`.
|
|
|
|
"""
|
|
|
|
for _, (side, _) in self.poller.readers + self.poller.writers:
|
|
|
|
LOG.debug('%r: force disconnecting %r', self, side)
|
|
|
|
side.stream.on_disconnect(self)
|
|
|
|
|
|
|
|
self.poller.close()
|
|
|
|
|
|
|
|
def _broker_shutdown(self):
|
|
|
|
"""
|
|
|
|
Invoke :meth:`Stream.on_shutdown` for every active stream, then allow
|
|
|
|
up to :attr:`shutdown_timeout` seconds for the streams to unregister
|
|
|
|
themselves, logging an error if any did not unregister during the grace
|
|
|
|
period.
|
|
|
|
"""
|
|
|
|
for _, (side, _) in self.poller.readers + self.poller.writers:
|
|
|
|
self._call(side.stream, side.stream.on_shutdown)
|
|
|
|
|
|
|
|
deadline = now() + self.shutdown_timeout
|
|
|
|
while self.keep_alive() and now() < deadline:
|
|
|
|
self._loop_once(max(0, deadline - now()))
|
|
|
|
|
|
|
|
if self.keep_alive():
|
|
|
|
LOG.error('%r: pending work still existed %d seconds after '
|
|
|
|
'shutdown began. This may be due to a timer that is yet '
|
|
|
|
'to expire, or a child connection that did not fully '
|
|
|
|
'shut down.', self, self.shutdown_timeout)
|
|
|
|
|
|
|
|
def _do_broker_main(self):
|
|
|
|
"""
|
|
|
|
Broker thread main function. Dispatches IO events until
|
|
|
|
:meth:`shutdown` is called.
|
|
|
|
"""
|
|
|
|
# For Python 2.4, no way to retrieve ident except on thread.
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self._waker.protocol.broker_ident = thread.get_ident()
|
|
|
|
try:
|
|
|
|
while self._alive:
|
|
|
|
self._loop_once()
|
|
|
|
|
|
|
|
fire(self, 'shutdown')
|
|
|
|
self._broker_shutdown()
|
|
|
|
except Exception:
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
LOG.exception('broker crashed')
|
|
|
|
syslog.syslog(syslog.LOG_ERR, 'broker crashed: %s' % (e,))
|
|
|
|
syslog.closelog() # prevent test 'fd leak'.
|
|
|
|
|
|
|
|
self._alive = False # Ensure _alive is consistent on crash.
|
|
|
|
self._exitted = True
|
|
|
|
self._broker_exit()
|
|
|
|
|
|
|
|
def _broker_main(self):
|
|
|
|
try:
|
|
|
|
_profile_hook('mitogen.broker', self._do_broker_main)
|
|
|
|
finally:
|
|
|
|
# 'finally' to ensure _on_broker_exit() can always SIGTERM.
|
|
|
|
fire(self, 'exit')
|
|
|
|
|
|
|
|
def shutdown(self):
|
|
|
|
"""
|
|
|
|
Request broker gracefully disconnect streams and stop. Safe to call
|
|
|
|
from any thread.
|
|
|
|
"""
|
|
|
|
_v and LOG.debug('%r: shutting down', self)
|
|
|
|
def _shutdown():
|
|
|
|
self._alive = False
|
core: allow Router.shutdown() to succeed after exit.
For join_thread():
Exception in thread mitogen.master.join_thread_async:
Traceback (most recent call last):
File "/usr/lib/python2.7/threading.py", line 801, in __bootstrap_inner
self.run()
File "/usr/lib/python2.7/threading.py", line 754, in run
self.__target(*self.__args, **self.__kwargs)
File "/home/dmw/src/mitogen/mitogen/master.py", line 249, in _watch
watcher.on_join()
File "/home/dmw/src/mitogen/mitogen/master.py", line 816, in shutdown
super(Broker, self).shutdown()
File "/home/dmw/src/mitogen/mitogen/core.py", line 2741, in shutdown
self.defer(_shutdown)
File "/home/dmw/src/mitogen/mitogen/core.py", line 2142, in defer
raise Error(self.broker_shutdown_msg)
Error: An attempt was made to enqueue a message with a Broker that has already exitted. It is likely your program called Broker.shutdown() too early.
6 years ago
|
|
|
if self._alive and not self._exitted:
|
|
|
|
self.defer(_shutdown)
|
|
|
|
|
|
|
|
def join(self):
|
|
|
|
"""
|
|
|
|
Wait for the broker to stop, expected to be called after
|
|
|
|
:meth:`shutdown`.
|
|
|
|
"""
|
|
|
|
self._thread.join()
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Broker(%04x)' % (id(self) & 0xffff,)
|
|
|
|
|
|
|
|
|
|
|
|
class Dispatcher(object):
|
|
|
|
"""
|
|
|
|
Implementation of the :data:`CALL_FUNCTION` handle for a child context.
|
|
|
|
Listens on the child's main thread for messages sent by
|
|
|
|
:class:`mitogen.parent.CallChain` and dispatches the function calls they
|
|
|
|
describe.
|
|
|
|
|
|
|
|
If a :class:`mitogen.parent.CallChain` sending a message is in pipelined
|
|
|
|
mode, any exception that occurs is recorded, and causes all subsequent
|
|
|
|
calls with the same `chain_id` to fail with the same exception.
|
|
|
|
"""
|
|
|
|
_service_recv = None
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
return 'Dispatcher'
|
|
|
|
|
|
|
|
def __init__(self, econtext):
|
|
|
|
self.econtext = econtext
|
|
|
|
#: Chain ID -> CallError if prior call failed.
|
|
|
|
self._error_by_chain_id = {}
|
|
|
|
self.recv = Receiver(
|
|
|
|
router=econtext.router,
|
|
|
|
handle=CALL_FUNCTION,
|
|
|
|
policy=has_parent_authority,
|
|
|
|
)
|
|
|
|
#: The :data:`CALL_SERVICE` :class:`Receiver` that will eventually be
|
|
|
|
#: reused by :class:`mitogen.service.Pool`, should it ever be loaded.
|
|
|
|
#: This is necessary for race-free reception of all service requests
|
|
|
|
#: delivered regardless of whether the stub or real service pool are
|
|
|
|
#: loaded. See #547 for related sorrows.
|
|
|
|
Dispatcher._service_recv = Receiver(
|
|
|
|
router=econtext.router,
|
|
|
|
handle=CALL_SERVICE,
|
|
|
|
policy=has_parent_authority,
|
|
|
|
)
|
|
|
|
self._service_recv.notify = self._on_call_service
|
|
|
|
listen(econtext.broker, 'shutdown', self.recv.close)
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
@takes_econtext
|
|
|
|
def forget_chain(cls, chain_id, econtext):
|
|
|
|
econtext.dispatcher._error_by_chain_id.pop(chain_id, None)
|
|
|
|
|
|
|
|
def _parse_request(self, msg):
|
|
|
|
data = msg.unpickle(throw=False)
|
|
|
|
_v and LOG.debug('%r: dispatching %r', self, data)
|
|
|
|
|
|
|
|
chain_id, modname, klass, func, args, kwargs = data
|
|
|
|
obj = import_module(modname)
|
|
|
|
if klass:
|
|
|
|
obj = getattr(obj, klass)
|
|
|
|
fn = getattr(obj, func)
|
|
|
|
if getattr(fn, 'mitogen_takes_econtext', None):
|
|
|
|
kwargs.setdefault('econtext', self.econtext)
|
|
|
|
if getattr(fn, 'mitogen_takes_router', None):
|
|
|
|
kwargs.setdefault('router', self.econtext.router)
|
|
|
|
|
|
|
|
return chain_id, fn, args, kwargs
|
|
|
|
|
|
|
|
def _dispatch_one(self, msg):
|
|
|
|
try:
|
|
|
|
chain_id, fn, args, kwargs = self._parse_request(msg)
|
|
|
|
except Exception:
|
|
|
|
return None, CallError(sys.exc_info()[1])
|
|
|
|
|
|
|
|
if chain_id in self._error_by_chain_id:
|
|
|
|
return chain_id, self._error_by_chain_id[chain_id]
|
|
|
|
|
|
|
|
try:
|
|
|
|
return chain_id, fn(*args, **kwargs)
|
|
|
|
except Exception:
|
|
|
|
e = CallError(sys.exc_info()[1])
|
|
|
|
if chain_id is not None:
|
|
|
|
self._error_by_chain_id[chain_id] = e
|
|
|
|
return chain_id, e
|
|
|
|
|
|
|
|
def _on_call_service(self, recv):
|
|
|
|
"""
|
|
|
|
Notifier for the :data:`CALL_SERVICE` receiver. This is called on the
|
|
|
|
:class:`Broker` thread for any service messages arriving at this
|
|
|
|
context, for as long as no real service pool implementation is loaded.
|
|
|
|
|
|
|
|
In order to safely bootstrap the service pool implementation a sentinel
|
|
|
|
message is enqueued on the :data:`CALL_FUNCTION` receiver in order to
|
|
|
|
wake the main thread, where the importer can run without any
|
|
|
|
possibility of suffering deadlock due to concurrent uses of the
|
|
|
|
importer.
|
|
|
|
|
|
|
|
Should the main thread be blocked indefinitely, preventing the import
|
|
|
|
from ever running, if it is blocked waiting on a service call, then it
|
|
|
|
means :mod:`mitogen.service` has already been imported and
|
|
|
|
:func:`mitogen.service.get_or_create_pool` has already run, meaning the
|
|
|
|
service pool is already active and the duplicate initialization was not
|
|
|
|
needed anyway.
|
|
|
|
|
|
|
|
#547: This trickery is needed to avoid the alternate option of spinning
|
|
|
|
a temporary thread to import the service pool, which could deadlock if
|
|
|
|
a custom import hook executing on the main thread (under the importer
|
|
|
|
lock) would block waiting for some data that was in turn received by a
|
|
|
|
service. Main thread import lock can't be released until service is
|
|
|
|
running, service cannot satisfy request until import lock is released.
|
|
|
|
"""
|
|
|
|
self.recv._on_receive(Message(handle=STUB_CALL_SERVICE))
|
|
|
|
|
|
|
|
def _init_service_pool(self):
|
|
|
|
import mitogen.service
|
|
|
|
mitogen.service.get_or_create_pool(router=self.econtext.router)
|
|
|
|
|
|
|
|
def _dispatch_calls(self):
|
|
|
|
for msg in self.recv:
|
|
|
|
if msg.handle == STUB_CALL_SERVICE:
|
|
|
|
if msg.src_id == mitogen.context_id:
|
|
|
|
self._init_service_pool()
|
|
|
|
continue
|
|
|
|
|
|
|
|
chain_id, ret = self._dispatch_one(msg)
|
|
|
|
_v and LOG.debug('%r: %r -> %r', self, msg, ret)
|
|
|
|
if msg.reply_to:
|
|
|
|
msg.reply(ret)
|
|
|
|
elif isinstance(ret, CallError) and chain_id is None:
|
|
|
|
LOG.error('No-reply function call failed: %s', ret)
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
if self.econtext.config.get('on_start'):
|
|
|
|
self.econtext.config['on_start'](self.econtext)
|
|
|
|
|
|
|
|
_profile_hook('mitogen.child_main', self._dispatch_calls)
|
|
|
|
|
|
|
|
|
|
|
|
class ExternalContext(object):
|
|
|
|
"""
|
|
|
|
External context implementation.
|
|
|
|
|
|
|
|
This class contains the main program implementation for new children. It is
|
|
|
|
responsible for setting up everything about the process environment, import
|
|
|
|
hooks, standard IO redirection, logging, configuring a :class:`Router` and
|
|
|
|
:class:`Broker`, and finally arranging for :class:`Dispatcher` to take over
|
|
|
|
the main thread after initialization is complete.
|
|
|
|
|
|
|
|
.. attribute:: broker
|
|
|
|
|
|
|
|
The :class:`mitogen.core.Broker` instance.
|
|
|
|
|
|
|
|
.. attribute:: context
|
|
|
|
|
|
|
|
The :class:`mitogen.core.Context` instance.
|
|
|
|
|
|
|
|
.. attribute:: channel
|
|
|
|
|
|
|
|
The :class:`mitogen.core.Channel` over which :data:`CALL_FUNCTION`
|
|
|
|
requests are received.
|
|
|
|
|
|
|
|
.. attribute:: importer
|
|
|
|
|
|
|
|
The :class:`mitogen.core.Importer` instance.
|
|
|
|
|
|
|
|
.. attribute:: stdout_log
|
|
|
|
|
|
|
|
The :class:`IoLogger` connected to :data:`sys.stdout`.
|
|
|
|
|
|
|
|
.. attribute:: stderr_log
|
|
|
|
|
|
|
|
The :class:`IoLogger` connected to :data:`sys.stderr`.
|
|
|
|
"""
|
|
|
|
detached = False
|
|
|
|
|
|
|
|
def __init__(self, config):
|
|
|
|
self.config = config
|
|
|
|
|
|
|
|
def _on_broker_exit(self):
|
|
|
|
if not self.config['profiling']:
|
|
|
|
os.kill(os.getpid(), signal.SIGTERM)
|
|
|
|
|
|
|
|
def _on_shutdown_msg(self, msg):
|
Move _DEAD into header, autogenerate dead messages
This change blocks off 2 common scenarios where a race condition is
upgraded to a hang, when the library could internally do better.
* Since we don't know whether the receiver of a `reply_to` is expecting
a raw or pickled message, and since in the case of a raw reply, there
is no way to signal "dead" to the receiver, override the reply_to
field to explicitly mark a message as dead using a special handle.
This replaces the serialized _DEAD sentinel value with a slightly
neater interface, in the form of the reserved IS_DEAD handle, and
enables an important subsequent change: when a context cannot route a
message, it can send a generic 'dead' reply back towards the message
source, ensuring any sleeping thread is woken with ChannelError.
The use of this field could potentially be extended later on if
additional flags are needed, but for now this seems to suffice.
* Teach Router._invoke() to reply with a dead message when it receives a
message for an invalid local handle.
* Teach Router._async_route() to reply with a dead message when it
receives an unroutable message.
7 years ago
|
|
|
if not msg.is_dead:
|
|
|
|
_v and LOG.debug('shutdown request from context %d', msg.src_id)
|
|
|
|
self.broker.shutdown()
|
|
|
|
|
|
|
|
def _on_parent_disconnect(self):
|
|
|
|
if self.detached:
|
|
|
|
mitogen.parent_ids = []
|
|
|
|
mitogen.parent_id = None
|
|
|
|
LOG.info('Detachment complete')
|
|
|
|
else:
|
|
|
|
_v and LOG.debug('parent stream is gone, dying.')
|
|
|
|
self.broker.shutdown()
|
|
|
|
|
|
|
|
def detach(self):
|
|
|
|
self.detached = True
|
|
|
|
stream = self.router.stream_by_id(mitogen.parent_id)
|
|
|
|
if stream: # not double-detach()'d
|
|
|
|
os.setsid()
|
|
|
|
self.parent.send_await(Message(handle=DETACHING))
|
|
|
|
LOG.info('Detaching from %r; parent is %s', stream, self.parent)
|
|
|
|
for x in range(20):
|
|
|
|
pending = self.broker.defer_sync(stream.protocol.pending_bytes)
|
|
|
|
if not pending:
|
|
|
|
break
|
|
|
|
time.sleep(0.05)
|
|
|
|
if pending:
|
|
|
|
LOG.error('Stream had %d bytes after 2000ms', pending)
|
|
|
|
self.broker.defer(stream.on_disconnect, self.broker)
|
|
|
|
|
|
|
|
def _setup_master(self):
|
|
|
|
Router.max_message_size = self.config['max_message_size']
|
|
|
|
if self.config['profiling']:
|
|
|
|
enable_profiling()
|
|
|
|
self.broker = Broker(activate_compat=False)
|
|
|
|
self.router = Router(self.broker)
|
|
|
|
self.router.debug = self.config.get('debug', False)
|
|
|
|
self.router.unidirectional = self.config['unidirectional']
|
|
|
|
self.router.add_handler(
|
|
|
|
fn=self._on_shutdown_msg,
|
|
|
|
handle=SHUTDOWN,
|
|
|
|
policy=has_parent_authority,
|
|
|
|
)
|
|
|
|
self.master = Context(self.router, 0, 'master')
|
|
|
|
parent_id = self.config['parent_ids'][0]
|
|
|
|
if parent_id == 0:
|
|
|
|
self.parent = self.master
|
|
|
|
else:
|
|
|
|
self.parent = Context(self.router, parent_id, 'parent')
|
|
|
|
|
|
|
|
in_fd = self.config.get('in_fd', 100)
|
|
|
|
in_fp = os.fdopen(os.dup(in_fd), 'rb', 0)
|
|
|
|
os.close(in_fd)
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
out_fp = os.fdopen(os.dup(self.config.get('out_fd', 1)), 'wb', 0)
|
|
|
|
self.stream = MitogenProtocol.build_stream(
|
|
|
|
self.router,
|
|
|
|
parent_id,
|
|
|
|
local_id=self.config['context_id'],
|
|
|
|
parent_ids=self.config['parent_ids']
|
|
|
|
)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.stream.accept(in_fp, out_fp)
|
|
|
|
self.stream.name = 'parent'
|
|
|
|
self.stream.receive_side.keep_alive = False
|
|
|
|
|
|
|
|
listen(self.stream, 'disconnect', self._on_parent_disconnect)
|
|
|
|
listen(self.broker, 'exit', self._on_broker_exit)
|
|
|
|
|
|
|
|
def _reap_first_stage(self):
|
|
|
|
try:
|
|
|
|
os.wait() # Reap first stage.
|
|
|
|
except OSError:
|
|
|
|
pass # No first stage exists (e.g. fakessh)
|
|
|
|
|
|
|
|
def _setup_logging(self):
|
|
|
|
self.log_handler = LogHandler(self.master)
|
|
|
|
root = logging.getLogger()
|
|
|
|
root.setLevel(self.config['log_level'])
|
|
|
|
root.handlers = [self.log_handler]
|
|
|
|
if self.config['debug']:
|
|
|
|
enable_debug_logging()
|
|
|
|
|
|
|
|
def _setup_importer(self):
|
|
|
|
importer = self.config.get('importer')
|
|
|
|
if importer:
|
|
|
|
importer._install_handler(self.router)
|
|
|
|
importer._context = self.parent
|
|
|
|
else:
|
|
|
|
core_src_fd = self.config.get('core_src_fd', 101)
|
|
|
|
if core_src_fd:
|
|
|
|
fp = os.fdopen(core_src_fd, 'rb', 1)
|
|
|
|
try:
|
|
|
|
core_src = fp.read()
|
|
|
|
# Strip "ExternalContext.main()" call from last line.
|
|
|
|
core_src = b('\n').join(core_src.splitlines()[:-1])
|
|
|
|
finally:
|
|
|
|
fp.close()
|
|
|
|
else:
|
|
|
|
core_src = None
|
|
|
|
|
|
|
|
importer = Importer(
|
|
|
|
self.router,
|
|
|
|
self.parent,
|
|
|
|
core_src,
|
|
|
|
self.config.get('whitelist', ()),
|
|
|
|
self.config.get('blacklist', ()),
|
|
|
|
)
|
|
|
|
|
|
|
|
self.importer = importer
|
|
|
|
self.router.importer = importer
|
|
|
|
sys.meta_path.insert(0, self.importer)
|
|
|
|
|
|
|
|
def _setup_package(self):
|
|
|
|
global mitogen
|
|
|
|
mitogen = imp.new_module('mitogen')
|
|
|
|
mitogen.__package__ = 'mitogen'
|
|
|
|
mitogen.__path__ = []
|
|
|
|
mitogen.__loader__ = self.importer
|
|
|
|
mitogen.main = lambda *args, **kwargs: (lambda func: None)
|
|
|
|
mitogen.core = sys.modules['__main__']
|
|
|
|
mitogen.core.__file__ = 'x/mitogen/core.py' # For inspect.getsource()
|
|
|
|
mitogen.core.__loader__ = self.importer
|
|
|
|
sys.modules['mitogen'] = mitogen
|
|
|
|
sys.modules['mitogen.core'] = mitogen.core
|
|
|
|
del sys.modules['__main__']
|
|
|
|
|
|
|
|
def _setup_globals(self):
|
|
|
|
mitogen.is_master = False
|
|
|
|
mitogen.__version__ = self.config['version']
|
|
|
|
mitogen.context_id = self.config['context_id']
|
|
|
|
mitogen.parent_ids = self.config['parent_ids'][:]
|
|
|
|
mitogen.parent_id = mitogen.parent_ids[0]
|
|
|
|
|
|
|
|
def _nullify_stdio(self):
|
|
|
|
"""
|
|
|
|
Open /dev/null to replace stdio temporarily. In case of odd startup,
|
|
|
|
assume we may be allocated a standard handle.
|
|
|
|
"""
|
|
|
|
for stdfd, mode in ((0, os.O_RDONLY), (1, os.O_RDWR), (2, os.O_RDWR)):
|
|
|
|
fd = os.open('/dev/null', mode)
|
|
|
|
if fd != stdfd:
|
|
|
|
os.dup2(fd, stdfd)
|
|
|
|
os.close(fd)
|
|
|
|
|
|
|
|
def _preserve_tty_fp(self):
|
|
|
|
"""
|
|
|
|
#481: when stderr is a TTY due to being started via tty_create_child()
|
|
|
|
or hybrid_tty_create_child(), and some privilege escalation tool like
|
|
|
|
prehistoric versions of sudo exec this process over the top of itself,
|
|
|
|
there is nothing left to keep the slave PTY open after we replace our
|
|
|
|
stdio. Therefore if stderr is a TTY, keep around a permanent dup() to
|
|
|
|
avoid receiving SIGHUP.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
if os.isatty(2):
|
|
|
|
self.reserve_tty_fp = os.fdopen(os.dup(2), 'r+b', 0)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
set_cloexec(self.reserve_tty_fp.fileno())
|
|
|
|
except OSError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
def _setup_stdio(self):
|
|
|
|
self._preserve_tty_fp()
|
|
|
|
# When sys.stdout was opened by the runtime, overwriting it will not
|
|
|
|
# close FD 1. However when forking from a child that previously used
|
|
|
|
# fdopen(), overwriting it /will/ close FD 1. So we must swallow the
|
|
|
|
# close before IoLogger overwrites FD 1, otherwise its new FD 1 will be
|
|
|
|
# clobbered. Additionally, stdout must be replaced with /dev/null prior
|
|
|
|
# to stdout.close(), since if block buffering was active in the parent,
|
|
|
|
# any pre-fork buffered data will be flushed on close(), corrupting the
|
|
|
|
# connection to the parent.
|
|
|
|
self._nullify_stdio()
|
|
|
|
sys.stdout.close()
|
|
|
|
self._nullify_stdio()
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.loggers = []
|
|
|
|
for name, fd in (('stdout', 1), ('stderr', 2)):
|
|
|
|
log = IoLoggerProtocol.build_stream(name, fd)
|
|
|
|
self.broker.start_receive(log)
|
|
|
|
self.loggers.append(log)
|
|
|
|
|
|
|
|
# Reopen with line buffering.
|
|
|
|
sys.stdout = os.fdopen(1, 'w', 1)
|
|
|
|
|
|
|
|
def main(self):
|
|
|
|
self._setup_master()
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
self._setup_logging()
|
|
|
|
self._setup_importer()
|
|
|
|
self._reap_first_stage()
|
|
|
|
if self.config.get('setup_package', True):
|
|
|
|
self._setup_package()
|
|
|
|
self._setup_globals()
|
|
|
|
if self.config.get('setup_stdio', True):
|
|
|
|
self._setup_stdio()
|
|
|
|
|
|
|
|
self.dispatcher = Dispatcher(self)
|
|
|
|
self.router.register(self.parent, self.stream)
|
|
|
|
self.router._setup_logging()
|
|
|
|
|
|
|
|
_v and LOG.debug('Python version is %s', sys.version)
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
_v and LOG.debug('Parent is context %r (%s); my ID is %r',
|
|
|
|
self.parent.context_id, self.parent.name,
|
|
|
|
mitogen.context_id)
|
|
|
|
_v and LOG.debug('pid:%r ppid:%r uid:%r/%r, gid:%r/%r host:%r',
|
|
|
|
os.getpid(), os.getppid(), os.geteuid(),
|
|
|
|
os.getuid(), os.getegid(), os.getgid(),
|
|
|
|
socket.gethostname())
|
|
|
|
|
|
|
|
sys.executable = os.environ.pop('ARGV0', sys.executable)
|
|
|
|
_v and LOG.debug('Recovered sys.executable: %r', sys.executable)
|
|
|
|
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
if self.config.get('send_ec2', True):
|
|
|
|
self.stream.transmit_side.write(b('MITO002\n'))
|
|
|
|
self.broker._py24_25_compat()
|
Refactor Stream, introduce quasi-asynchronous connect, much more
Split Stream into many, many classes
* mitogen.parent.Connection: Handles connection setup logic only.
* Maintain references to stdout and stderr streams.
* Manages TimerList timer to cancel connection attempt after
deadline
* Blocking setup code replaced by async equivalents running on the
broker
* mitogen.parent.Options: Tracks connection-specific options. This
keeps the connection class small, but more importantly, it is
generic to the future desire to build and execute command lines
without starting a full connection.
* mitogen.core.Protocol: Handles program behaviour relating to events
on a stream. Protocol performs no IO of its own, instead deferring
it to Stream and Side. This makes testing much easier, and means
libssh can reimplement Stream and Side to reuse MitogenProtocol
* mitogen.core.MitogenProtocol: Guts of the old Mitogen stream
implementtion
* mitogen.core.BufferedWriter: Guts of the old Mitogen buffered
transmit implementation, made generic
* mitogen.core.DelineatedProtocol: Guts of the old IoLogger, knows how
to split up input and pass it on to a
on_line_received()/on_partial_line_received() callback.
* mitogen.parent.BootstrapProtocol: Asynchronous equivalent of the old
blocking connect code. Waits for various prompts (MITO001 etc) and
writes the bootstrap using a BufferedWriter. On success, switches
the stream to MitogenProtocol.
* mitogen.core.Message: move encoding parts of MitogenProtocol out to
Message (where it belongs) and write a bunch of new tests for
pickling.
* The bizarre Stream.construct() is gone now, Option.__init__ is its
own constructor. Should fix many LGTM errors.
* Update all connection methods: Every connection method is updated to
use async logic, defining protocols as required to handle interactive
prompts like in SSH or su. Add new real integration tests for at least
doas and su.
* Eliminate manual fd management: File descriptors are trapped in file
objects at their point of origin, and Side is updated to use file
objects rather than raw descriptors. This eliminates a whole class of
bugs where unrelated FDs could be closed by the wrong component. Now
an FD's open/closed status is fused to it everywhere in the library.
* Halve file descriptor usage: now FD open/close state is tracked by
its file object, we don't need to duplicate FDs everywhere so that
receive/transmit side can be closed independently. Instead both sides
back on to the same file object. Closes #26, Closes #470.
* Remove most uses of dup/dup2: Closes #256. File descriptors are
trapped in a common file object and shared among classes. The
remaining few uses for dup/dup2 are as close to minimal as possible.
* Introduce mitogen.parent.Process: uniform interface for subprocesses
created either via mitogen.fork or the subprocess module. Remove all
the crap where we steal a pid from subprocess guts. Now we use
subprocess to manage its processes as it should be. Closes #169 by
using the new Timers facility to poll for a slow-to-exit subprocess.
* Fix su password race: Closes #363. DelineatedProtocol naturally
retries partially received lines, preventing the cause of the original
race.
* Delete old blocking IO utility functions
iter_read()/write_all()/discard_until().
Closes #26
Closes #147
Closes #169
Closes #256
Closes #363
Closes #419
Closes #470
6 years ago
|
|
|
self.log_handler.uncork()
|
|
|
|
self.dispatcher.run()
|
|
|
|
_v and LOG.debug('ExternalContext.main() normal exit')
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
LOG.debug('KeyboardInterrupt received, exiting gracefully.')
|
|
|
|
except BaseException:
|
|
|
|
LOG.exception('ExternalContext.main() crashed')
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
self.broker.shutdown()
|
|
|
|
self.broker.join()
|