From 45c4e1998d3d41be08041c394dbbb3323602b115 Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Mon, 15 Nov 2021 19:27:50 +0900 Subject: [PATCH] dulwich: fallback to default client config in asyncssh vendor - vendor should use ssh-agent or default IdentityFile(s) when no SSH key has been provided by the user - encrypted (fallback) keys will always be passed to ssh-agent --- dvc/scm/git/backend/dulwich/asyncssh_vendor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dvc/scm/git/backend/dulwich/asyncssh_vendor.py b/dvc/scm/git/backend/dulwich/asyncssh_vendor.py index 3264c5c39..0fc529797 100644 --- a/dvc/scm/git/backend/dulwich/asyncssh_vendor.py +++ b/dvc/scm/git/backend/dulwich/asyncssh_vendor.py @@ -79,10 +79,11 @@ class AsyncSSHVendor(BaseAsyncObject, SSHVendor): conn = await asyncssh.connect( host, - port=port, + port=port if port is not None else (), username=username, password=password, - client_keys=[key_filename] if key_filename else [], + client_keys=[key_filename] if key_filename else (), + ignore_encrypted=not key_filename, known_hosts=None, encoding=None, )