asyncssh 2.16.0__tar.gz → 2.17.0__tar.gz

{asyncssh-2.16.0/asyncssh.egg-info → asyncssh-2.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: asyncssh
-Version: 2.16.0
+Version: 2.17.0
 Summary: AsyncSSH: Asynchronous SSHv2 client and server library
 Home-page: http://asyncssh.timeheart.net
 Author: Ron Frederick
@@ -27,23 +27,14 @@ Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Networking
 Requires-Python: >= 3.6
-License-File: LICENSE
-Requires-Dist: cryptography>=39.0
-Requires-Dist: typing_extensions>=4.0.0
 Provides-Extra: bcrypt
-Requires-Dist: bcrypt>=3.1.3; extra == "bcrypt"
 Provides-Extra: fido2
-Requires-Dist: fido2>=0.9.2; extra == "fido2"
 Provides-Extra: gssapi
-Requires-Dist: gssapi>=1.2.0; extra == "gssapi"
 Provides-Extra: libnacl
-Requires-Dist: libnacl>=1.4.2; extra == "libnacl"
 Provides-Extra: pkcs11
-Requires-Dist: python-pkcs11>=0.7.0; extra == "pkcs11"
-Provides-Extra: pyopenssl
-Requires-Dist: pyOpenSSL>=23.0.0; extra == "pyopenssl"
+Provides-Extra: pyOpenSSL
 Provides-Extra: pywin32
-Requires-Dist: pywin32>=227; extra == "pywin32"
+License-File: LICENSE
 
 .. image:: https://readthedocs.org/projects/asyncssh/badge/?version=latest
     :target: https://asyncssh.readthedocs.io/en/latest/?badge=latest
@@ -276,3 +267,5 @@ Three mailing lists are available for AsyncSSH:
 __ http://groups.google.com/d/forum/asyncssh-announce
 __ http://groups.google.com/d/forum/asyncssh-dev
 __ http://groups.google.com/d/forum/asyncssh-users
+
+

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/channel.py

@@ -413,7 +413,11 @@ class SSHChannel(Generic[AnyStr], SSHPacketHandler):
         handler = cast(_RequestHandler, getattr(self, name, None))
 
         if handler:
-            result = cast(Optional[bool], handler(packet))
+            if self._session:
+                result = cast(Optional[bool], handler(packet))
+            else:
+                # Ignore requests received after application closes the channel
+                result = True
         else:
             self.logger.debug1('Received unknown channel request: %s', request)
             result = False

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/client.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -39,6 +39,14 @@ class SSHClient:
        to receive callbacks when certain events occur on the SSH
        connection.
 
+       Whenever a new SSH client connection is opened, a corresponding
+       SSHClient object is created and the method :meth:`connection_made`
+       is called, passing in the :class:`SSHClientConnection` object.
+
+       When the connection is closed, the method :meth:`connection_lost`
+       is called with an exception representing the reason for the
+       disconnect, or `None` if the connection was closed cleanly.
+
        For simple password or public key based authentication, nothing
        needs to be defined here if the password or client keys are passed
        in when the connection is created. However, to prompt interactively

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/connection.py

@@ -105,8 +105,8 @@ from .logging import SSHLogger, logger
 
 from .mac import get_mac_algs, get_default_mac_algs
 
-from .misc import BytesOrStr, DefTuple, FilePath, HostPort, IPNetwork
-from .misc import MaybeAwait, OptExcInfo, Options, SockAddr
+from .misc import BytesOrStr, BytesOrStrDict, DefTuple, FilePath, HostPort
+from .misc import IPNetwork, MaybeAwait, OptExcInfo, Options, SockAddr
 from .misc import ChannelListenError, ChannelOpenError, CompressionError
 from .misc import DisconnectError, ConnectionLost, HostKeyNotVerifiable
 from .misc import KeyExchangeFailed, IllegalUserName, MACError
@@ -1083,7 +1083,7 @@ class SSHConnection(SSHPacketHandler, asyncio.Protocol):
 
         self._loop.call_soon(self._cleanup, exc)
 
-    def _reap_task(self, task_logger: SSHLogger,
+    def _reap_task(self, task_logger: Optional[SSHLogger],
                    task: 'asyncio.Task[None]') -> None:
         """Collect result of an async task, reporting errors"""
 
@@ -3315,7 +3315,8 @@ class SSHClientConnection(SSHConnection):
 
         if gss_host:
             try:
-                self._gss = GSSClient(gss_host, options.gss_delegate_creds)
+                self._gss = GSSClient(gss_host, options.gss_store,
+                                      options.gss_delegate_creds)
                 self._gss_kex = options.gss_kex
                 self._gss_auth = options.gss_auth
                 self._gss_mic_auth = self._gss_auth
@@ -5713,7 +5714,7 @@ class SSHServerConnection(SSHConnection):
 
         if options.gss_host:
             try:
-                self._gss = GSSServer(options.gss_host)
+                self._gss = GSSServer(options.gss_host, options.gss_store)
                 self._gss_kex = options.gss_kex
                 self._gss_auth = options.gss_auth
                 self._gss_mic_auth = self._gss_auth
@@ -7443,6 +7444,8 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
            authentication. If not specified, this value will be the same
            as the `host` argument. If this argument is explicitly set to
            `None`, GSS key exchange and authentication will not be performed.
+       :param gss_store: (optional)
+           The GSS credential store from which to acquire credentials.
        :param gss_kex: (optional)
            Whether or not to allow GSS key exchange. By default, GSS
            key exchange is enabled.
@@ -7672,6 +7675,8 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
        :type kbdint_auth: `bool`
        :type password_auth: `bool`
        :type gss_host: `str`
+       :type gss_store:
+           `str`, `bytes`, or a `dict` with `str` or `bytes` keys and values
        :type gss_kex: `bool`
        :type gss_auth: `bool`
        :type gss_delegate_creds: `bool`
@@ -7734,6 +7739,7 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
     client_certs: Sequence[FilePath]
     ignore_encrypted: bool
     gss_host: DefTuple[Optional[str]]
+    gss_store: Optional[Dict[BytesOrStr, BytesOrStr]]
     gss_kex: bool
     gss_auth: bool
     gss_delegate_creds: bool
@@ -7802,6 +7808,7 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
                 passphrase: Optional[BytesOrStr] = None,
                 ignore_encrypted: DefTuple[bool] = (),
                 gss_host: DefTuple[Optional[str]] = (),
+                gss_store: Optional[Union[BytesOrStr, BytesOrStrDict]] = None,
                 gss_kex: DefTuple[bool] = (), gss_auth: DefTuple[bool] = (),
                 gss_delegate_creds: DefTuple[bool] = (),
                 preferred_auth: DefTuple[Union[str, Sequence[str]]] = (),
@@ -7933,6 +7940,11 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
 
         self.gss_host = gss_host
 
+        if isinstance(gss_store, (bytes, str)):
+            self.gss_store = {'ccache': gss_store}
+        else:
+            self.gss_store = gss_store
+
         self.gss_kex = cast(bool, gss_kex if gss_kex != () else
             config.get('GSSAPIKeyExchange', True))
 
@@ -8169,6 +8181,8 @@ class SSHServerConnectionOptions(SSHConnectionOptions):
            name. Otherwise, the value used by :func:`socket.getfqdn` will be
            used. If this argument is explicitly set to `None`, GSS
            key exchange and authentication will not be performed.
+       :param gss_store: (optional)
+           The GSS credential store from which to acquire credentials.
        :param gss_kex: (optional)
            Whether or not to allow GSS key exchange. By default, GSS
            key exchange is enabled.
@@ -8344,6 +8358,8 @@ class SSHServerConnectionOptions(SSHConnectionOptions):
        :type kbdint_auth: `bool`
        :type password_auth: `bool`
        :type gss_host: `str`
+       :type gss_store:
+           `str`, `bytes`, or a `dict` with `str` or `bytes` keys and values
        :type gss_kex: `bool`
        :type gss_auth: `bool`
        :type allow_pty: `bool`
@@ -8391,6 +8407,7 @@ class SSHServerConnectionOptions(SSHConnectionOptions):
     trust_client_host: bool
     authorized_client_keys: DefTuple[Optional[SSHAuthorizedKeys]]
     gss_host: Optional[str]
+    gss_store: Optional[Dict[BytesOrStr, BytesOrStr]]
     gss_kex: bool
     gss_auth: bool
     allow_pty: bool
@@ -8449,6 +8466,7 @@ class SSHServerConnectionOptions(SSHConnectionOptions):
                 trust_client_host: bool = False,
                 authorized_client_keys: _AuthKeysArg = (),
                 gss_host: DefTuple[Optional[str]] = (),
+                gss_store: Optional[Union[BytesOrStr, BytesOrStrDict]] = None,
                 gss_kex: DefTuple[bool] = (),
                 gss_auth: DefTuple[bool] = (),
                 allow_pty: DefTuple[bool] = (),
@@ -8554,6 +8572,11 @@ class SSHServerConnectionOptions(SSHConnectionOptions):
 
         self.gss_host = gss_host
 
+        if isinstance(gss_store, (bytes, str)):
+            self.gss_store = {'ccache': gss_store}
+        else:
+            self.gss_store = gss_store
+
         self.gss_kex = cast(bool, gss_kex if gss_kex != () else
             config.get('GSSAPIKeyExchange', True))
 

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/gss.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2017-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -24,6 +24,9 @@ import sys
 
 from typing import Optional
 
+from .misc import BytesOrStrDict
+
+
 try:
     # pylint: disable=unused-import
 
@@ -53,11 +56,12 @@ except ImportError: # pragma: no cover
     class GSSClient(GSSBase): # type: ignore
         """Stub client class for reporting that GSS is not available"""
 
-        def __init__(self, _host: str, _delegate_creds: bool):
+        def __init__(self, _host: str, _store: Optional[BytesOrStrDict],
+                     _delegate_creds: bool):
             raise GSSError(0, 0)
 
     class GSSServer(GSSBase): # type: ignore
         """Stub client class for reporting that GSS is not available"""
 
-        def __init__(self, _host: str):
+        def __init__(self, _host: str, _store: Optional[BytesOrStrDict]):
             raise GSSError(0, 0)

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/gss_unix.py

@@ -27,6 +27,7 @@ from gssapi import RequirementFlag, SecurityContext
 from gssapi.exceptions import GSSError
 
 from .asn1 import OBJECT_IDENTIFIER
+from .misc import BytesOrStrDict
 
 
 def _mech_to_oid(mech: OID) -> bytes:
@@ -39,12 +40,14 @@ def _mech_to_oid(mech: OID) -> bytes:
 class GSSBase:
     """GSS base class"""
 
-    def __init__(self, host: str):
+    def __init__(self, host: str, store: Optional[BytesOrStrDict]):
         if '@' in host:
             self._host = Name(host)
         else:
             self._host = Name('host@' + host, NameType.hostbased_service)
 
+        self._store = store
+
         self._mechs = [_mech_to_oid(mech) for mech in self._creds.mechs]
         self._ctx: Optional[SecurityContext] = None
 
@@ -141,8 +144,9 @@ class GSSBase:
 class GSSClient(GSSBase):
     """GSS client"""
 
-    def __init__(self, host: str, delegate_creds: bool):
-        super().__init__(host)
+    def __init__(self, host: str, store: Optional[BytesOrStrDict],
+                 delegate_creds: bool):
+        super().__init__(host, store)
 
         flags = RequirementFlag.mutual_authentication | \
                 RequirementFlag.integrity
@@ -156,7 +160,7 @@ class GSSClient(GSSBase):
     def _creds(self) -> Credentials:
         """Abstract method to construct GSS credentials"""
 
-        return Credentials(usage='initiate')
+        return Credentials(usage='initiate', store=self._store)
 
     def _init_context(self) -> None:
         """Construct GSS client security context"""
@@ -172,7 +176,7 @@ class GSSServer(GSSBase):
     def _creds(self) -> Credentials:
         """Abstract method to construct GSS credentials"""
 
-        return Credentials(name=self._host, usage='accept')
+        return Credentials(name=self._host, usage='accept', store=self._store)
 
     def _init_context(self) -> None:
         """Construct GSS server security context"""

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/gss_win32.py

@@ -35,6 +35,7 @@ from sspicon import ASC_RET_INTEGRITY, ASC_RET_MUTUAL_AUTH
 from sspicon import SECPKG_ATTR_NATIVE_NAMES
 
 from .asn1 import ObjectIdentifier, der_encode
+from .misc import BytesOrStrDict
 
 
 _krb5_oid = der_encode(ObjectIdentifier('1.2.840.113554.1.2.2'))
@@ -156,7 +157,11 @@ class GSSClient(GSSBase):
     _mutual_auth_flag = ISC_RET_MUTUAL_AUTH
     _integrity_flag = ISC_RET_INTEGRITY
 
-    def __init__(self, host: str, delegate_creds: bool):
+    def __init__(self, host: str, store: Optional[BytesOrStrDict],
+                 delegate_creds: bool):
+        if store is not None:
+            raise GSSError(details='GSS store not supported on Windows')
+
         super().__init__(host)
 
         flags = ISC_REQ_MUTUAL_AUTH | ISC_REQ_INTEGRITY
@@ -179,7 +184,10 @@ class GSSServer(GSSBase):
     _mutual_auth_flag = ASC_RET_MUTUAL_AUTH
     _integrity_flag = ASC_RET_INTEGRITY
 
-    def __init__(self, host: str):
+    def __init__(self, host: str, store: Optional[BytesOrStrDict]):
+        if store is not None:
+            raise GSSError(details='GSS store not supported on Windows')
+
         super().__init__(host)
 
         flags = ASC_REQ_MUTUAL_AUTH | ASC_REQ_INTEGRITY

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/listener.py

@@ -25,7 +25,7 @@ import errno
 import socket
 from types import TracebackType
 from typing import TYPE_CHECKING, AnyStr, Callable, Generic, List, Optional
-from typing import Sequence, Tuple, Type, Union
+from typing import Sequence, Set, Tuple, Type, Union
 from typing_extensions import Self
 
 from .forward import SSHForwarderCoro
@@ -285,9 +285,19 @@ async def create_tcp_local_listener(
     if not addrinfo: # pragma: no cover
         raise OSError('getaddrinfo() returned empty list')
 
+    seen_addrinfo: Set[Tuple] = set()
     servers: List[asyncio.AbstractServer] = []
 
-    for family, socktype, proto, _, sa in addrinfo:
+    for addrinfo_entry in addrinfo:
+        # Work around an issue where getaddrinfo() on some systems may
+        # return duplicate results, causing bind to fail.
+        if addrinfo_entry in seen_addrinfo: # pragma: no cover
+            continue
+
+        seen_addrinfo.add(addrinfo_entry)
+
+        family, socktype, proto, _, sa = addrinfo_entry
+
         try:
             sock = socket.socket(family, socktype, proto)
         except OSError: # pragma: no cover

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/misc.py

@@ -101,6 +101,7 @@ ExcInfo = Tuple[Type[BaseException], BaseException, TracebackType]
 OptExcInfo = Union[ExcInfo, Tuple[None, None, None]]
 
 BytesOrStr = Union[bytes, str]
+BytesOrStrDict = Dict[BytesOrStr, BytesOrStr]
 FilePath = Union[str, PurePath]
 HostPort = Tuple[str, int]
 IPAddress = Union[ipaddress.IPv4Address, ipaddress.IPv6Address]

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/public_key.py

@@ -2541,7 +2541,7 @@ def _decode_openssh_private(
                                      'encrypted private keys')
 
             try:
-                key_size, iv_size, block_size, _, _, _ = \
+                key_size, iv_size, _, _, _, _ = \
                     get_encryption_params(cipher_name)
             except KeyError:
                 raise KeyEncryptionError('Unknown cipher: %s' %
@@ -2579,9 +2579,6 @@ def _decode_openssh_private(
                 raise KeyEncryptionError('Incorrect passphrase')
 
             key_data = decrypted_key
-            block_size = max(block_size, 8)
-        else:
-            block_size = 8
 
         packet = SSHPacket(key_data)
 
@@ -2602,7 +2599,7 @@ def _decode_openssh_private(
         comment = packet.get_string()
         pad = packet.get_remaining_payload()
 
-        if len(pad) >= block_size or pad != bytes(range(1, len(pad) + 1)):
+        if len(pad) >= 256 or pad != bytes(range(1, len(pad) + 1)):
             raise KeyImportError('Invalid OpenSSH private key')
 
         if alg == b'ssh-rsa':

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/server.py

@@ -59,6 +59,14 @@ class SSHServer:
        Applications may subclass this when implementing an SSH server to
        provide custom authentication and request handlers.
 
+       Whenever a new SSH server connection is accepted, a corresponding
+       SSHServer object is created and the method :meth:`connection_made`
+       is called, passing in the :class:`SSHServerConnection` object.
+
+       When the connection is closed, the method :meth:`connection_lost`
+       is called with an exception representing the reason for the
+       disconnect, or `None` if the connection was closed cleanly.
+
        The method :meth:`begin_auth` can be overridden decide whether
        or not authentication is required, and additional callbacks are
        provided for each form of authentication in cases where authentication

{asyncssh-2.16.0 → asyncssh-2.17.0}/asyncssh/version.py

@@ -26,4 +26,4 @@ __author_email__ = 'ronf@timeheart.net'
 
 __url__ = 'http://asyncssh.timeheart.net'
 
-__version__ = '2.16.0'
+__version__ = '2.17.0'

{asyncssh-2.16.0 → asyncssh-2.17.0/asyncssh.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: asyncssh
-Version: 2.16.0
+Version: 2.17.0
 Summary: AsyncSSH: Asynchronous SSHv2 client and server library
 Home-page: http://asyncssh.timeheart.net
 Author: Ron Frederick
@@ -27,23 +27,14 @@ Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Networking
 Requires-Python: >= 3.6
-License-File: LICENSE
-Requires-Dist: cryptography>=39.0
-Requires-Dist: typing_extensions>=4.0.0
 Provides-Extra: bcrypt
-Requires-Dist: bcrypt>=3.1.3; extra == "bcrypt"
 Provides-Extra: fido2
-Requires-Dist: fido2>=0.9.2; extra == "fido2"
 Provides-Extra: gssapi
-Requires-Dist: gssapi>=1.2.0; extra == "gssapi"
 Provides-Extra: libnacl
-Requires-Dist: libnacl>=1.4.2; extra == "libnacl"
 Provides-Extra: pkcs11
-Requires-Dist: python-pkcs11>=0.7.0; extra == "pkcs11"
-Provides-Extra: pyopenssl
-Requires-Dist: pyOpenSSL>=23.0.0; extra == "pyopenssl"
+Provides-Extra: pyOpenSSL
 Provides-Extra: pywin32
-Requires-Dist: pywin32>=227; extra == "pywin32"
+License-File: LICENSE
 
 .. image:: https://readthedocs.org/projects/asyncssh/badge/?version=latest
     :target: https://asyncssh.readthedocs.io/en/latest/?badge=latest
@@ -276,3 +267,5 @@ Three mailing lists are available for AsyncSSH:
 __ http://groups.google.com/d/forum/asyncssh-announce
 __ http://groups.google.com/d/forum/asyncssh-dev
 __ http://groups.google.com/d/forum/asyncssh-users
+
+

{asyncssh-2.16.0 → asyncssh-2.17.0}/docs/changes.rst

@@ -3,6 +3,32 @@
 Change Log
 ==========
 
+Release 2.17.0 (2 Sep 2024)
+---------------------------
+
+* Add support for specifying a per-connection credential store for GSSAPI
+  authentication. Thanks go to GitHub user zarganum for suggesting this
+  feature and proposing a detailed design.
+
+* Fixed a regression introduced in AsyncSSH 2.15.0 which could cause
+  connections to be closed with an uncaught exception when a session
+  on the connection was closed. Thanks go to Wilson Conley for being
+  the first to help reproduce this issue, and others who also helped
+  to confirm the fix.
+
+* Added a workaround where getaddrinfo() on some systems may return duplicate
+  entries, causing bind() to fail when opening a listener. Thanks go to
+  Colin Watson for reporting this issue and suggesting a fix.
+
+* Relaxed padding length check on OpenSSH private keys to provide better
+  compatibility with keys generated by PuTTYgen.
+
+* Improved documentation on SSHClient and SSHServer classes to explain
+  when they are created and their relationship to the SSHClientConnection
+  and SSHServerConnection classes.
+
+* Updated examples to use Python 3.7 and made some minor improvements.
+
 Release 2.16.0 (17 Aug 2024)
 ----------------------------
 

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/callback_client.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -46,6 +46,6 @@ async def run_client() -> None:
         await chan.wait_closed()
 
 try:
-    asyncio.get_event_loop().run_until_complete(run_client())
+    asyncio.run(run_client())
 except (OSError, asyncssh.Error) as exc:
     sys.exit('SSH connection failed: ' + str(exc))

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/callback_client2.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -37,6 +37,6 @@ async def run_client() -> None:
         await chan.wait_closed()
 
 try:
-    asyncio.get_event_loop().run_until_complete(run_client())
+    asyncio.run(run_client())
 except (OSError, asyncssh.Error) as exc:
     sys.exit('SSH connection failed: ' + str(exc))

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/callback_client3.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -40,6 +40,6 @@ async def run_client() -> None:
         await chan.wait_closed()
 
 try:
-    asyncio.get_event_loop().run_until_complete(run_client())
+    asyncio.run(run_client())
 except (OSError, asyncssh.Error) as exc:
     sys.exit('SSH connection failed: ' + str(exc))

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/callback_math_server.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -64,6 +64,9 @@ class MySSHServerSession(asyncssh.SSHServerSession):
     def break_received(self, msec: int) -> bool:
         return self.eof_received()
 
+    def soft_eof_received(self) -> None:
+        self.eof_received()
+
 class MySSHServer(asyncssh.SSHServer):
     def session_requested(self) -> asyncssh.SSHServerSession:
         return MySSHServerSession()
@@ -73,7 +76,7 @@ async def start_server() -> None:
                                  server_host_keys=['ssh_host_key'],
                                  authorized_client_keys='ssh_user_ca')
 
-loop = asyncio.get_event_loop()
+loop = asyncio.new_event_loop()
 
 try:
     loop.run_until_complete(start_server())

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/chat_server.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2016-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2016-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -76,7 +76,7 @@ async def start_server() -> None:
                           authorized_client_keys='ssh_user_ca',
                           process_factory=ChatClient.handle_client)
 
-loop = asyncio.get_event_loop()
+loop = asyncio.new_event_loop()
 
 try:
     loop.run_until_complete(start_server())

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/check_exit_status.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -34,6 +34,6 @@ async def run_client() -> None:
                   file=sys.stderr)
 
 try:
-    asyncio.get_event_loop().run_until_complete(run_client())
+    asyncio.run(run_client())
 except (OSError, asyncssh.Error) as exc:
     sys.exit('SSH connection failed: ' + str(exc))

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/chroot_sftp_server.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2016-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2016-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -40,7 +40,7 @@ async def start_server() -> None:
                           authorized_client_keys='ssh_user_ca',
                           sftp_factory=MySFTPServer)
 
-loop = asyncio.get_event_loop()
+loop = asyncio.new_event_loop()
 
 try:
     loop.run_until_complete(start_server())

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/direct_client.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -44,6 +44,6 @@ async def run_client() -> None:
         await chan.wait_closed()
 
 try:
-    asyncio.get_event_loop().run_until_complete(run_client())
+    asyncio.run(run_client())
 except (OSError, asyncssh.Error) as exc:
     sys.exit('SSH connection failed: ' + str(exc))

{asyncssh-2.16.0 → asyncssh-2.17.0}/examples/direct_server.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.7
 #
-# Copyright (c) 2013-2021 by Ron Frederick <ronf@timeheart.net> and others.
+# Copyright (c) 2013-2024 by Ron Frederick <ronf@timeheart.net> and others.
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License v2.0 which accompanies this
@@ -52,7 +52,7 @@ async def start_server() -> None:
                                  server_host_keys=['ssh_host_key'],
                                  authorized_client_keys='ssh_user_ca')
 
-loop = asyncio.get_event_loop()
+loop = asyncio.new_event_loop()
 
 try:
     loop.run_until_complete(start_server())