This is an automated email from the ASF dual-hosted git repository.
eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 2d2d1cbf291 bugfix: removed cache for proxycommand in SFTPHook (#52641)
2d2d1cbf291 is described below
commit 2d2d1cbf29197e8631d881235dc98c03bc7b9bce
Author: Nataneljpwd <[email protected]>
AuthorDate: Wed Jul 2 10:26:16 2025 +0300
bugfix: removed cache for proxycommand in SFTPHook (#52641)
* removed cache for proxycommand fixing issue 52289
* formatted the code
---------
Co-authored-by: Natanel Rudyuklakir <[email protected]>
---
.../sftp/src/airflow/providers/sftp/hooks/sftp.py | 2 ++
providers/sftp/tests/unit/sftp/hooks/test_sftp.py | 42 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/providers/sftp/src/airflow/providers/sftp/hooks/sftp.py
b/providers/sftp/src/airflow/providers/sftp/hooks/sftp.py
index 23c18cc2cf4..80a3a122263 100644
--- a/providers/sftp/src/airflow/providers/sftp/hooks/sftp.py
+++ b/providers/sftp/src/airflow/providers/sftp/hooks/sftp.py
@@ -152,6 +152,8 @@ class SFTPHook(SSHHook):
self._sftp_conn = None
self._ssh_conn.close()
self._ssh_conn = None
+ if hasattr(self, "host_proxy"):
+ del self.host_proxy
def get_conn_count(self) -> int:
"""Get the number of open connections."""
diff --git a/providers/sftp/tests/unit/sftp/hooks/test_sftp.py
b/providers/sftp/tests/unit/sftp/hooks/test_sftp.py
index bfd83b81e97..a99550e3a45 100644
--- a/providers/sftp/tests/unit/sftp/hooks/test_sftp.py
+++ b/providers/sftp/tests/unit/sftp/hooks/test_sftp.py
@@ -138,6 +138,48 @@ class TestSFTPHook:
assert self.hook.get_conn_count() == 0
assert self.hook.conn is None
+ @patch("paramiko.SSHClient")
+ @patch("paramiko.ProxyCommand")
+ @patch("airflow.providers.sftp.hooks.sftp.SFTPHook.get_connection")
+ def test_proxy_command_cache_invalidated_after_connection_closed(
+ self, mock_get_connection, mock_proxy_command, mock_ssh_client
+ ):
+ """
+ Assert that the ProxyCommand gets invalidated after the connection is
closed
+ """
+
+ mock_connection = MagicMock()
+ mock_connection.login = "user"
+ mock_connection.password = None
+ mock_connection.host = "example.com"
+ mock_connection.port = 22
+ mock_connection.extra = None
+ mock_get_connection.return_value = mock_connection
+
+ mock_sftp_client = MagicMock(spec=SFTPClient)
+ mock_ssh_client.open_sftp.return_value = mock_sftp_client
+
+ mock_transport = MagicMock()
+ mock_ssh_client.return_value.get_transport.return_value =
mock_transport
+ mock_proxy_command.return_value = MagicMock()
+
+ host_proxy_cmd = "ncat --proxy-auth proxy_user:**** --proxy
proxy_host:port %h %p"
+ prev_proxy_command = None
+
+ hook = SFTPHook(
+ remote_host="example.com",
+ username="user",
+ host_proxy_cmd=host_proxy_cmd,
+ )
+
+ with hook.get_managed_conn() as _:
+ assert hasattr(self.hook, "host_proxy")
+ prev_proxy_command = hook.host_proxy
+
+ mock_proxy_command.return_value = MagicMock()
+
+ assert prev_proxy_command != hook.host_proxy
+
@patch("airflow.providers.ssh.hooks.ssh.SSHHook.get_conn")
def test_get_close_conn(self, mock_get_conn):
mock_sftp_client = MagicMock(spec=SFTPClient)
