Merge lp:~cjwatson/txpkgupload/sftp-interface-oopses into lp:txpkgupload

[Colin Watson]

Stub out openDirectory and getAttrs properly to avoid OOPSes with certain clients.

Stub out openDirectory and getAttrs properly to avoid OOPSes with certain clients.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'src/txpkgupload/tests/test_plugin.py'
--- src/txpkgupload/tests/test_plugin.py	2015-01-21 13:07:32 +0000
+++ src/txpkgupload/tests/test_plugin.py	2015-01-23 17:46:57 +0000
@@ -43,6 +43,7 @@
     FileTransferClient,
     FXF_CREAT,
     FXF_EXCL,
+    FXF_READ,
     FXF_TRUNC,
     FXF_WRITE,
     )
@@ -678,3 +679,43 @@
     """
 
     server_factory = SFTPServer
+
+    @defer.inlineCallbacks
+    def test_stat(self):
+        """Check that attribute retrieval doesn't give anything away."""
+        client = yield self.server.getClient()
+        yield self.server.createFile(client, "foo/bar/baz", "fake contents")
+        attrs = yield client.getAttrs("foo/bar/baz")
+        self.assertEqual({}, attrs)
+
+        yield self.server.disconnect(client)
+        yield self.server.waitForClose()
+
+    @defer.inlineCallbacks
+    def test_fstat(self):
+        """Check that file attribute retrieval doesn't give anything away."""
+        client = yield self.server.getClient()
+        yield self.server.createFile(client, "foo/bar/baz", "fake contents")
+        remote_file = yield client.openFile("foo/bar/baz", FXF_READ, {})
+        attrs = yield remote_file.getAttrs()
+        self.assertEqual({}, attrs)
+        yield remote_file.close()
+
+        yield self.server.disconnect(client)
+        yield self.server.waitForClose()
+
+    @defer.inlineCallbacks
+    def test_openDirectory(self):
+        """Check that opening a directory doesn't give anything away."""
+        client = yield self.server.getClient()
+        yield self.server.createFile(client, "foo/bar/baz", "fake contents")
+        directory = yield client.openDirectory(".")
+        try:
+            entry = yield directory.next()
+            raise AssertionError("Directory not empty")
+        except EOFError:
+            pass
+        yield directory.close()
+
+        yield self.server.disconnect(client)
+        yield self.server.waitForClose()

=== modified file 'src/txpkgupload/twistedsftp.py'
--- src/txpkgupload/twistedsftp.py	2015-01-22 11:29:37 +0000
+++ src/txpkgupload/twistedsftp.py	2015-01-23 17:46:57 +0000
@@ -64,10 +64,10 @@
         self.uploadfilesystem.rmdir(path)
 
     def openDirectory(self, path):
-        pass
+        return SFTPDirectory()
 
     def getAttrs(self, path, follow_links):
-        pass
+        return {}
 
     def setAttrs(self, path, attrs):
         pass
@@ -123,12 +123,24 @@
         os.close(chunk_file)
 
     def getAttrs(self):
-        pass
+        return {}
 
     def setAttrs(self, attr):
         pass
 
 
+class SFTPDirectory:
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        raise StopIteration
+
+    def close(self):
+        pass
+
+
 class PkgUploadFileTransferServer(FileTransferServer):
 
     def __init__(self, data=None, avatar=None):