asyncssh 2.19.0__tar.gz → 2.20.0__tar.gz

{asyncssh-2.19.0 → asyncssh-2.20.0}/.github/workflows/run_tests.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - os: macos-latest
             python-version: "3.10"
@@ -19,22 +19,9 @@ jobs:
           - os: macos-latest
             python-version: "3.12"
             openssl-version: "3"
-        exclude:
-          # having trouble with arch arm64 on macos-ltest on Python 3.7
           - os: macos-latest
-            python-version: "3.7"
-
-          # test hangs on these combination
-          - os: windows-latest
-            python-version: "3.8"
-          - os: windows-latest
-            python-version: "3.9"
-          - os: windows-latest
-            python-version: "3.10"
-          - os: windows-latest
-            python-version: "3.11"
-          - os: windows-latest
-            python-version: "3.12"
+            python-version: "3.13"
+            openssl-version: "3"
 
     runs-on: ${{ matrix.os }}
     env:
@@ -153,8 +140,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
-        with:
-          python-version: "3.7"
       - uses: actions/download-artifact@v4
         with:
           name: coverage

{asyncssh-2.19.0/asyncssh.egg-info → asyncssh-2.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: asyncssh
-Version: 2.19.0
+Version: 2.20.0
 Summary: AsyncSSH: Asynchronous SSHv2 client and server library
 Author-email: Ron Frederick <ronf@timeheart.net>
 License: EPL-2.0 OR GPL-2.0-or-later
@@ -14,12 +14,12 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet
 Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/client.py

@@ -220,6 +220,15 @@ class SSHClient:
 
         """
 
+    def begin_auth(self, username: str) -> None:
+        """Begin client authentication
+
+           This method is called when client authentication is about to
+           begin, Applications may store the username passed here to
+           be used in future authentication callbacks.
+
+        """
+
     def auth_completed(self) -> None:
         """Authentication was completed successfully
 

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/config.py

@@ -41,6 +41,10 @@ from .pattern import HostPatternList, WildcardPatternList
 ConfigPaths = Union[None, FilePath, Sequence[FilePath]]
 
 
+_token_pattern = re.compile(r'%(.)')
+_env_pattern = re.compile(r'\${(.*)}')
+
+
 def _exec(cmd: str) -> bool:
     """Execute a command and return if exit status is 0"""
 
@@ -93,36 +97,38 @@ class SSHConfig:
 
         raise NotImplementedError
 
-    def _expand_val(self, value: str) -> str:
-        """Perform percent token expansion on a string"""
+    def _expand_token(self, match):
+        """Expand a percent token reference"""
 
-        last_idx = 0
-        result: List[str] = []
+        try:
+            token = match.group(1)
+            return self._tokens[token]
+        except KeyError:
+            if token == 'd':
+                raise ConfigParseError('Home directory is '
+                                       'not available') from None
+            elif token == 'i':
+                raise ConfigParseError('User id not available') from None
+            else:
+                raise ConfigParseError('Invalid token expansion: ' +
+                                       token) from None
 
-        for match in re.finditer(r'%', value):
-            idx = match.start()
+    @staticmethod
+    def _expand_env(match):
+        """Expand an environment variable reference"""
 
-            if idx < last_idx:
-                continue
+        try:
+            var = match.group(1)
+            return os.environ[var]
+        except KeyError:
+            raise ConfigParseError('Invalid environment expansion: ' +
+                                   var) from None
 
-            try:
-                token = value[idx+1]
-                result.extend([value[last_idx:idx], self._tokens[token]])
-                last_idx = idx + 2
-            except IndexError:
-                raise ConfigParseError('Invalid token substitution') from None
-            except KeyError:
-                if token == 'd':
-                    raise ConfigParseError('Home directory is '
-                                           'not available') from None
-                elif token == 'i':
-                    raise ConfigParseError('User id not available') from None
-                else:
-                    raise ConfigParseError('Invalid token substitution: ' +
-                                           value[idx+1]) from None
-
-        result.append(value[last_idx:])
-        return ''.join(result)
+    def _expand_val(self, value: str) -> str:
+        """Perform percent token and environment expansion on a string"""
+
+        return _env_pattern.sub(self._expand_env,
+                                _token_pattern.sub(self._expand_token, value))
 
     def _include(self, option: str, args: List[str]) -> None:
         """Read config from a list of other config files"""
@@ -219,6 +225,22 @@ class SSHConfig:
         if option not in self._options:
             self._options[option] = value
 
+    def _set_bool_or_str(self, option: str, args: List[str]) -> None:
+        """Set a boolean or string config option"""
+
+        value_str = args.pop(0)
+        value_lower = value_str.lower()
+
+        if value_lower in ('yes', 'true'):
+            value: Union[bool, str] = True
+        elif value_lower in ('no', 'false'):
+            value = False
+        else:
+            value = value_str
+
+        if option not in self._options:
+            self._options[option] = value
+
     def _set_int(self, option: str, args: List[str]) -> None:
         """Set an integer config option"""
 
@@ -468,7 +490,7 @@ class SSHClientConfig(SSHConfig):
 
     _conditionals = {'host', 'match'}
     _no_split = {'proxycommand', 'remotecommand'}
-    _percent_expand = {'CertificateFile', 'IdentityAgent',
+    _percent_expand = {'CertificateFile', 'ForwardAgent', 'IdentityAgent',
                        'IdentityFile', 'ProxyCommand', 'RemoteCommand'}
 
     def __init__(self, last_config: 'SSHConfig', reload: bool,
@@ -587,7 +609,7 @@ class SSHClientConfig(SSHConfig):
         ('Compression',                     SSHConfig._set_bool),
         ('ConnectTimeout',                  SSHConfig._set_int),
         ('EnableSSHKeySign',                SSHConfig._set_bool),
-        ('ForwardAgent',                    SSHConfig._set_bool),
+        ('ForwardAgent',                    SSHConfig._set_bool_or_str),
         ('ForwardX11Trusted',               SSHConfig._set_bool),
         ('GlobalKnownHostsFile',            SSHConfig._set_string_list),
         ('GSSAPIAuthentication',            SSHConfig._set_bool),

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/connection.py

@@ -1741,7 +1741,7 @@ class SSHConnection(SSHPacketHandler, asyncio.Protocol):
             self._send_kexinit()
             self._kexinit_sent = True
 
-        if (((pkttype in {MSG_SERVICE_REQUEST, MSG_SERVICE_ACCEPT} or
+        if (((pkttype in {MSG_DEBUG, MSG_SERVICE_REQUEST, MSG_SERVICE_ACCEPT} or
               pkttype > MSG_KEX_LAST) and not self._kex_complete) or
                 (pkttype == MSG_USERAUTH_BANNER and
                  not (self._auth_in_progress or self._auth_complete)) or
@@ -1751,7 +1751,7 @@ class SSHConnection(SSHPacketHandler, asyncio.Protocol):
 
         # If we're encrypting and we have no data outstanding, insert an
         # ignore packet into the stream
-        if self._send_encryption and pkttype not in (MSG_IGNORE, MSG_EXT_INFO):
+        if self._send_encryption and pkttype > MSG_KEX_LAST:
             self.send_packet(MSG_IGNORE, String(b''))
 
         orig_payload = Byte(pkttype) + b''.join(args)
@@ -2292,6 +2292,9 @@ class SSHConnection(SSHPacketHandler, asyncio.Protocol):
 
             self._auth_in_progress = True
 
+            if self._owner: # pragma: no branch
+                self._owner.begin_auth(self._username)
+
             # This method is only in SSHClientConnection
             # pylint: disable=no-member
             cast('SSHClientConnection', self).try_next_auth()
@@ -7640,8 +7643,11 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
            made available for use. This is the default.
        :param agent_forwarding: (optional)
            Whether or not to allow forwarding of ssh-agent requests from
-           processes running on the server. By default, ssh-agent forwarding
-           requests from the server are not allowed.
+           processes running on the server. This argument can also be set
+           to the path of a UNIX domain socket in cases where forwarded
+           agent requests should be sent to a different path than client
+           agent requests. By default, forwarding ssh-agent requests from
+           the server is not allowed.
        :param pkcs11_provider: (optional)
            The path of a shared library which should be used as a PKCS#11
            provider for accessing keys on PIV security tokens. By default,
@@ -7874,7 +7880,7 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
        :type agent_path: `str`
        :type agent_identities:
            *see* :ref:`SpecifyingPublicKeys` and :ref:`SpecifyingCertificates`
-       :type agent_forwarding: `bool`
+       :type agent_forwarding: `bool` or `str`
        :type pkcs11_provider: `str` or `None`
        :type pkcs11_pin: `str`
        :type client_version: `str`
@@ -8016,7 +8022,7 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
                 disable_trivial_auth: bool = False,
                 agent_path: DefTuple[Optional[str]] = (),
                 agent_identities: DefTuple[Optional[IdentityListArg]] = (),
-                agent_forwarding: DefTuple[bool] = (),
+                agent_forwarding: DefTuple[Union[bool, str]] = (),
                 pkcs11_provider: DefTuple[Optional[str]] = (),
                 pkcs11_pin: Optional[str] = None,
                 command: DefTuple[Optional[str]] = (),
@@ -8242,9 +8248,17 @@ class SSHClientConnectionOptions(SSHConnectionOptions):
             self.pkcs11_pin = None
 
         if agent_forwarding == ():
-            agent_forwarding = cast(bool, config.get('ForwardAgent', False))
+            agent_forwarding = cast(Union[bool, str],
+                                    config.get('ForwardAgent', False))
+
+        agent_forwarding: Union[bool, str]
 
-        self.agent_forward_path = agent_path if agent_forwarding else None
+        if not agent_forwarding:
+            self.agent_forward_path = None
+        elif agent_forwarding is True:
+            self.agent_forward_path = agent_path
+        else:
+            self.agent_forward_path = agent_forwarding
 
         self.command = cast(Optional[str], command if command != () else
             config.get('RemoteCommand'))

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/misc.py

@@ -466,17 +466,18 @@ class Options:
 class _RecordMeta(type):
     """Metaclass for general-purpose record type"""
 
+    __slots__: Dict[str, object] = {}
+
     def __new__(mcs: Type['_RecordMeta'], name: str, bases: Tuple[type, ...],
                 ns: Dict[str, object]) -> '_RecordMeta':
+        cls = cast(_RecordMeta, super().__new__(mcs, name, bases, ns))
+
         if name != 'Record':
-            fields = cast(Mapping[str, str],
-                          ns.get('__annotations__', {})).keys()
+            fields = cast(Mapping[str, str], cls.__annotations__.keys())
             defaults = {k: ns.get(k) for k in fields}
+            cls.__slots__ = defaults
 
-            ns = {k: v for k, v in ns.items() if k not in fields}
-            ns['__slots__'] = defaults
-
-        return cast(_RecordMeta, super().__new__(mcs, name, bases, ns))
+        return cls
 
 
 class Record(metaclass=_RecordMeta):

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/process.py

@@ -928,7 +928,7 @@ class SSHProcess(SSHStreamSession, Generic[AnyStr]):
                 file = source
 
             if hasattr(file, 'read') and \
-                    (asyncio.iscoroutinefunction(file.read) or
+                    (inspect.iscoroutinefunction(file.read) or
                      inspect.isgeneratorfunction(file.read)):
                 reader = _AsyncFileReader(self, cast(_AsyncFileProtocol, file),
                                           bufsize, datatype, self._encoding,
@@ -997,7 +997,7 @@ class SSHProcess(SSHStreamSession, Generic[AnyStr]):
                 needs_close = recv_eof
 
             if hasattr(file, 'write') and \
-                    (asyncio.iscoroutinefunction(file.write) or
+                    (inspect.iscoroutinefunction(file.write) or
                      inspect.isgeneratorfunction(file.write)):
                 writer = _AsyncFileWriter(
                     self, cast(_AsyncFileProtocol, file), needs_close,

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/sftp.py

@@ -3165,7 +3165,6 @@ class SFTPClientFile:
         self._appending = appending
         self._encoding = encoding
         self._errors = errors
-        self._max_requests = max_requests
         self._offset = None if appending else 0
 
         self.read_len = \
@@ -3173,6 +3172,15 @@ class SFTPClientFile:
         self.write_len = \
             handler.limits.max_write_len if block_size == -1 else block_size
 
+        if max_requests <= 0:
+            if self.read_len:
+                max_requests = max(16, min(MAX_SFTP_READ_LEN //
+                                           self.read_len, 128))
+            else:
+                max_requests = 1
+
+        self._max_requests = max_requests
+
     async def __aenter__(self) -> Self:
         """Allow SFTPClientFile to be used as an async context manager"""
 
@@ -3859,6 +3867,9 @@ class SFTPClient:
             block_size = min(srcfs.limits.max_read_len,
                              dstfs.limits.max_write_len)
 
+        if max_requests <= 0:
+            max_requests = max(16, min(MAX_SFTP_READ_LEN // block_size, 128))
+
         if isinstance(srcpaths, (bytes, str, PurePath)):
             srcpaths = [srcpaths]
         elif not isinstance(srcpaths, list):
@@ -3916,7 +3927,7 @@ class SFTPClient:
                   localpath: Optional[_SFTPPath] = None, *,
                   preserve: bool = False, recurse: bool = False,
                   follow_symlinks: bool = False, block_size: int = -1,
-                  max_requests: int = _MAX_SFTP_REQUESTS,
+                  max_requests: int = -1,
                   progress_handler: SFTPProgressHandler = None,
                   error_handler: SFTPErrorHandler = None) -> None:
         """Download remote files
@@ -3957,7 +3968,9 @@ class SFTPClient:
            doesn't advertise limits.
 
            The max_requests argument specifies the maximum number of
-           parallel read or write requests issued, defaulting to 128.
+           parallel read or write requests issued, defaulting to a
+           value between 16 and 128 depending on the selected block
+           size to avoid excessive memory usage.
 
            If progress_handler is specified, it will be called after
            each block of a file is successfully downloaded. The arguments
@@ -4022,7 +4035,7 @@ class SFTPClient:
                   remotepath: Optional[_SFTPPath] = None, *,
                   preserve: bool = False, recurse: bool = False,
                   follow_symlinks: bool = False, block_size: int = -1,
-                  max_requests: int = _MAX_SFTP_REQUESTS,
+                  max_requests: int = -1,
                   progress_handler: SFTPProgressHandler = None,
                   error_handler: SFTPErrorHandler = None) -> None:
         """Upload local files
@@ -4063,7 +4076,9 @@ class SFTPClient:
            doesn't advertise limits.
 
            The max_requests argument specifies the maximum number of
-           parallel read or write requests issued, defaulting to 128.
+           parallel read or write requests issued, defaulting to a
+           value between 16 and 128 depending on the selected block
+           size to avoid excessive memory usage.
 
            If progress_handler is specified, it will be called after
            each block of a file is successfully uploaded. The arguments
@@ -4128,7 +4143,7 @@ class SFTPClient:
                    dstpath: Optional[_SFTPPath] = None, *,
                    preserve: bool = False, recurse: bool = False,
                    follow_symlinks: bool = False, block_size: int = -1,
-                   max_requests: int = _MAX_SFTP_REQUESTS,
+                   max_requests: int = -1,
                    progress_handler: SFTPProgressHandler = None,
                    error_handler: SFTPErrorHandler = None,
                    remote_only: bool = False) -> None:
@@ -4170,7 +4185,9 @@ class SFTPClient:
            doesn't advertise limits.
 
            The max_requests argument specifies the maximum number of
-           parallel read or write requests issued, defaulting to 128.
+           parallel read or write requests issued, defaulting to a
+           value between 16 and 128 depending on the selected block
+           size to avoid excessive memory usage.
 
            If progress_handler is specified, it will be called after
            each block of a file is successfully copied. The arguments
@@ -4238,7 +4255,7 @@ class SFTPClient:
                    localpath: Optional[_SFTPPath] = None, *,
                    preserve: bool = False, recurse: bool = False,
                    follow_symlinks: bool = False, block_size: int = -1,
-                   max_requests: int = _MAX_SFTP_REQUESTS,
+                   max_requests: int = -1,
                    progress_handler: SFTPProgressHandler = None,
                    error_handler: SFTPErrorHandler = None) -> None:
         """Download remote files with glob pattern match
@@ -4261,7 +4278,7 @@ class SFTPClient:
                    remotepath: Optional[_SFTPPath] = None, *,
                    preserve: bool = False, recurse: bool = False,
                    follow_symlinks: bool = False, block_size: int = -1,
-                   max_requests: int = _MAX_SFTP_REQUESTS,
+                   max_requests: int = -1,
                    progress_handler: SFTPProgressHandler = None,
                    error_handler: SFTPErrorHandler = None) -> None:
         """Upload local files with glob pattern match
@@ -4284,7 +4301,7 @@ class SFTPClient:
                     dstpath: Optional[_SFTPPath] = None, *,
                     preserve: bool = False, recurse: bool = False,
                     follow_symlinks: bool = False, block_size: int = -1,
-                    max_requests: int = _MAX_SFTP_REQUESTS,
+                    max_requests: int = -1,
                     progress_handler: SFTPProgressHandler = None,
                     error_handler: SFTPErrorHandler = None,
                     remote_only: bool = False) -> None:
@@ -4586,7 +4603,7 @@ class SFTPClient:
                    attrs: SFTPAttrs = SFTPAttrs(),
                    encoding: Optional[str] = 'utf-8', errors: str = 'strict',
                    block_size: int = -1,
-                   max_requests: int = _MAX_SFTP_REQUESTS) -> SFTPClientFile:
+                   max_requests: int = -1) -> SFTPClientFile:
         """Open a remote file
 
            This method opens a remote file and returns an
@@ -4662,7 +4679,9 @@ class SFTPClient:
                          default of using the server-advertised limits.
 
            The max_requests argument specifies the maximum number of
-           parallel read or write requests issued, defaulting to 128.
+           parallel read or write requests issued, defaulting to a
+           value between 16 and 128 depending on the selected block
+           size to avoid excessive memory usage.
 
            :param path:
                The name of the remote file to open
@@ -4718,7 +4737,7 @@ class SFTPClient:
                      attrs: SFTPAttrs = SFTPAttrs(),
                      encoding: Optional[str] = 'utf-8', errors: str = 'strict',
                      block_size: int = -1,
-                     max_requests: int = _MAX_SFTP_REQUESTS) -> SFTPClientFile:
+                     max_requests: int = -1) -> SFTPClientFile:
         """Open a remote file using SFTP v5/v6 flags
 
            This method is very similar to :meth:`open`, but the pflags_or_mode
@@ -7515,6 +7534,14 @@ class SFTPServer:
         """
 
         path = os.readlink(_to_local_path(self.map_path(path)))
+
+        if sys.platform == 'win32' and \
+                path.startswith('\\\\?\\'): # pragma: no cover
+            path = path[4:]
+
+        if self._chroot:
+            path = os.path.realpath(path)
+
         return self.reverse_map_path(_from_local_path(path))
 
     def symlink(self, oldpath: bytes, newpath: bytes) -> MaybeAwait[None]:
@@ -7780,7 +7807,13 @@ class LocalFS:
     async def readlink(self, path: bytes) -> bytes:
         """Return the target of a local symbolic link"""
 
-        return _from_local_path(os.readlink(_to_local_path(path)))
+        path = os.readlink(_to_local_path(path))
+
+        if sys.platform == 'win32' and \
+                path.startswith('\\\\?\\'): # pragma: no cover
+            path = path[4:]
+
+        return _from_local_path(path)
 
     async def symlink(self, oldpath: bytes, newpath: bytes) -> None:
         """Create a local symbolic link"""

{asyncssh-2.19.0 → asyncssh-2.20.0}/asyncssh/version.py

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

{asyncssh-2.19.0 → asyncssh-2.20.0/asyncssh.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: asyncssh
-Version: 2.19.0
+Version: 2.20.0
 Summary: AsyncSSH: Asynchronous SSHv2 client and server library
 Author-email: Ron Frederick <ronf@timeheart.net>
 License: EPL-2.0 OR GPL-2.0-or-later
@@ -14,12 +14,12 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet
 Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{asyncssh-2.19.0 → asyncssh-2.20.0}/docs/changes.rst

@@ -3,6 +3,36 @@
 Change Log
 ==========
 
+Release 2.20.0 (17 Feb 2025)
+----------------------------
+
+* Added support for specifying an explicit path when configuring
+  agent forwarding. Thanks go to Aleksandr Ilin for pointing out
+  that this options supports more than just a boolean value.
+
+* Added support for environment variable expansion in SSH config,
+  for options which support percent expansion.
+
+* Added a new begin_auth callback in SSHClient, reporting the
+  username being sent during SSH client authentication. This can be
+  useful when the user is conditionally set via an SSH config file.
+
+* Improved strict-kex interoperability during re-keying. Thanks go
+  to GitHub user emeryalden for reporting this issue and helping
+  to track down the source of the problem.
+
+* Updated SFTP max_requests default to reduce memory usage when
+  using large block sizes.
+
+* Updated testing to add Python 3.13 and drop Python 3.7, avoiding
+  deprecation warnings from the cryptography package.
+
+* Fixed unit test issues under Windows, allowing unit tests to run
+  on Windows on all supported versions of Python.
+
+* Fixed a couple of issues with Python 3.14. Thanks go to Georg
+  Sauthoff for initially reporting this.
+
 Release 2.19.0 (12 Dec 2024)
 ----------------------------
 

{asyncssh-2.19.0 → asyncssh-2.20.0}/pyproject.toml

@@ -15,12 +15,12 @@ classifiers = [
     'License :: OSI Approved',
     'Operating System :: MacOS :: MacOS X',
     'Operating System :: POSIX',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Topic :: Internet',
     'Topic :: Security :: Cryptography',
     'Topic :: Software Development :: Libraries :: Python Modules',

{asyncssh-2.19.0 → asyncssh-2.20.0}/tests/server.py

@@ -26,6 +26,7 @@ import shutil
 import signal
 import socket
 import subprocess
+import sys
 
 import asyncssh
 from asyncssh.misc import async_context_manager
@@ -269,17 +270,20 @@ class ServerTestCase(AsyncTestCase):
         if 'XAUTHORITY' in os.environ: # pragma: no cover
             del os.environ['XAUTHORITY']
 
-        try:
-            output = run('ssh-agent -a agent 2>/dev/null')
-        except subprocess.CalledProcessError: # pragma: no cover
-            cls._agent_pid = None
-        else:
-            cls._agent_pid = int(output.splitlines()[2].split()[3][:-1])
+        if sys.platform != 'win32':
+            try:
+                output = run('ssh-agent -a agent 2>/dev/null')
+            except subprocess.CalledProcessError: # pragma: no cover
+                cls._agent_pid = None
+            else:
+                cls._agent_pid = int(output.splitlines()[2].split()[3][:-1])
 
-            os.environ['SSH_AUTH_SOCK'] = 'agent'
+                os.environ['SSH_AUTH_SOCK'] = 'agent'
 
-            async with asyncssh.connect_agent() as agent:
-                await agent.add_keys([ckey_ecdsa, (ckey, ckey_cert)])
+                async with asyncssh.connect_agent() as agent:
+                    await agent.add_keys([ckey_ecdsa, (ckey, ckey_cert)])
+        else: # pragma: no cover
+            cls._agent_pid = None
 
         with open('ssh-keysign', 'wb'):
             pass
@@ -288,14 +292,14 @@ class ServerTestCase(AsyncTestCase):
     async def asyncTearDownClass(cls):
         """Shut down test server and agent"""
 
+        cls._server.close()
+        await cls._server.wait_closed()
+
         tasks = all_tasks()
         tasks.remove(current_task())
 
         await asyncio.gather(*tasks, return_exceptions=True)
 
-        cls._server.close()
-        await cls._server.wait_closed()
-
         if cls._agent_pid: # pragma: no branch
             os.kill(cls._agent_pid, signal.SIGTERM)
 

{asyncssh-2.19.0 → asyncssh-2.20.0}/tests/test_channel.py

@@ -862,14 +862,14 @@ class _TestChannel(ServerTestCase):
             chan.close()
 
     @asynctest
-    async def test_agent_forwarding(self):
-        """Test SSH agent forwarding"""
+    async def test_agent_forwarding_explicit(self):
+        """Test SSH agent forwarding with explicit path"""
 
         if not self.agent_available(): # pragma: no cover
             self.skipTest('ssh-agent not available')
 
         async with self.connect(username='ckey',
-                                agent_forwarding=True) as conn:
+                                agent_forwarding='agent') as conn:
             chan, session = await _create_session(conn, 'agent')
 
             await chan.wait_closed()