Close SSH connection of SFTP storage

docs/backends/sftp.rst

@@ -71,3 +71,18 @@ static files) to use the sftp backend::
 .. _`paramiko SSHClient.connect() documentation`: http://docs.paramiko.org/en/latest/api/client.html#paramiko.client.SSHClient.connect
 
 .. _`Python os.chmod documentation`: http://docs.python.org/library/os.html#os.chmod
+
+
+Standalone Use
+--------------
+
+If you intend to construct a storage instance not through Django but directly,
+use the storage instance as a context manager to make sure the underlying SSH
+connection is closed after use and no longer consumes resources.
+
+.. code-block:: python
+
+    from storages.backends.sftpstorage import SFTPStorage
+
+    with SFTPStorage(...) as sftp:
+        sftp.listdir("")

setup.cfg

@@ -47,7 +47,7 @@ google =
 libcloud =
     apache-libcloud
 sftp =
-    paramiko >= 1.10.0
+    paramiko >= 1.15.0
 
 [flake8]
 exclude =

storages/backends/sftpstorage.py

@@ -15,14 +15,15 @@
 import paramiko
 from django.core.files.base import File
 from django.utils.deconstruct import deconstructible
+from paramiko.util import ClosingContextManager
 
 from storages.base import BaseStorage
 from storages.utils import is_seekable
 from storages.utils import setting
 
 
 @deconstructible
-class SFTPStorage(BaseStorage):
+class SFTPStorage(ClosingContextManager, BaseStorage):
     def __init__(self, **settings):
         super().__init__(**settings)
         self._host = self.host
@@ -35,6 +36,7 @@ def __init__(self, **settings):
         self._known_host_file = self.known_host_file
         self._root_path = self.root_path
         self._base_url = self.base_url
+        self._ssh = None
         self._sftp = None
 
     def get_default_settings(self):
@@ -81,6 +83,11 @@ def _connect(self):
         if self._ssh.get_transport():
             self._sftp = self._ssh.open_sftp()
 
+    def close(self):
+        if self._ssh is None:
+            return
+        self._ssh.close()
+
     @property
     def sftp(self):
         """Lazy SFTP connection"""

tests/test_sftp.py

@@ -40,6 +40,18 @@ def test_connect(self, mock_ssh):
         self.storage._connect()
         self.assertEqual('foo', mock_ssh.return_value.connect.call_args[0][0])
 
+    @patch('paramiko.SSHClient')
+    def test_close_unopened(self, mock_ssh):
+        with self.storage:
+            pass
+        mock_ssh.return_value.close.assert_not_called()
+
+    @patch('paramiko.SSHClient')
+    def test_close_opened(self, mock_ssh):
+        with self.storage as storage:
+            storage._connect()
+        mock_ssh.return_value.close.assert_called_once_with()
+
     def test_open(self):
         file_ = self.storage._open('foo')
         self.assertIsInstance(file_, sftpstorage.SFTPStorageFile)