Fix ftp 'ls' to work with current Twisted-15.0.0

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / frontends / ftpd.py

diff --git a/src/allmydata/frontends/ftpd.py b/src/allmydata/frontends/ftpd.py
index cc2a0a084ecdaecf44eea46ef88918e631690669..dbcb8318a5a15658f4b52aa3fc9f59f730b6220d 100644 (file)
--- a/src/allmydata/frontends/ftpd.py
+++ b/src/allmydata/frontends/ftpd.py
@@ -1,15 +1,19 @@
 
+from types import NoneType
+
 from zope.interface import implements
 from twisted.application import service, strports
 from twisted.internet import defer
 from twisted.internet.interfaces import IConsumer
 from twisted.cred import portal
+from twisted.python import filepath
 from twisted.protocols import ftp
 
 from allmydata.interfaces import IDirectoryNode, ExistingChildError, \
      NoSuchChildError
 from allmydata.immutable.upload import FileHandle
 from allmydata.util.fileutil import EncryptedTemporaryFile
+from allmydata.util.assertutil import precondition
 
 class ReadFile:
     implements(ftp.IReadFile)
@@ -58,6 +62,19 @@ class WriteFile:
 class NoParentError(Exception):
     pass
 
+if hasattr(filepath, "Permissions"):
+    # filepath.Permissions was added in Twisted-11.1.0, but we're compatible
+    # back to 11.0.0 (on windows). Fortunately we don't really need to
+    # provide anything more than an int until Twisted-15.0.0 .
+    class IntishPermissions(filepath.Permissions):
+        def __init__(self, statModeInt):
+            self.statModeInt = statModeInt
+            filepath.Permissions.__init__(self, statModeInt)
+        def __and__(self, other):
+            return self.statModeInt & other
+else:
+    IntishPermissions = lambda statModeInt: statModeInt
+
 class Handler:
     implements(ftp.IFTPShell)
     def __init__(self, client, rootnode, username, convergence):
@@ -193,15 +210,23 @@ class Handler:
                 if isdir:
                     value = 0
                 else:
-                    value = childnode.get_size()
+                    value = childnode.get_size() or 0
             elif key == "directory":
                 value = isdir
             elif key == "permissions":
-                value = 0600
+                # Twisted-14.0.2 expected an int, and used it in a rendering
+                # function that did (mode & NUMBER). Twisted-15.0.0 expects a
+                # twisted.python.filepath.Permissions , and calls its
+                # .shorthand() method. Try to provide both.
+                value = IntishPermissions(0600)
             elif key == "hardlinks":
                 value = 1
             elif key == "modified":
-                value = metadata.get("mtime", 0)
+                # follow sftpd convention (i.e. linkmotime in preference to mtime)
+                if "linkmotime" in metadata.get("tahoe", {}):
+                    value = metadata["tahoe"]["linkmotime"]
+                else:
+                    value = metadata.get("mtime", 0)
             elif key == "owner":
                 value = self.username
             elif key == "group":
@@ -284,6 +309,7 @@ class Dispatcher:
 
 class FTPServer(service.MultiService):
     def __init__(self, client, accountfile, accounturl, ftp_portstr):
+        precondition(isinstance(accountfile, (unicode, NoneType)), accountfile)
         service.MultiService.__init__(self)
 
         r = Dispatcher(client)