-import tempfile
+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.download import ConsumerAdapter
from allmydata.immutable.upload import FileHandle
+from allmydata.util.fileutil import EncryptedTemporaryFile
+from allmydata.util.assertutil import precondition
class ReadFile:
implements(ftp.IReadFile)
def __init__(self, node):
self.node = node
def send(self, consumer):
- ad = ConsumerAdapter(consumer)
- d = self.node.download(ad)
+ d = self.node.read(consumer)
return d # when consumed
class FileWriter:
raise NotImplementedError("Non-streaming producer not supported.")
# we write the data to a temporary file, since Tahoe can't do
# streaming upload yet.
- self.f = tempfile.TemporaryFile()
+ self.f = EncryptedTemporaryFile()
return None
def unregisterProducer(self):
class NoParentError(Exception):
pass
+# filepath.Permissions was added in Twisted-11.1.0, which we require. Twisted
+# <15.0.0 expected an int, and only does '&' on it. Twisted >=15.0.0 expects
+# a filepath.Permissions. This satisfies both.
+
+class IntishPermissions(filepath.Permissions):
+ def __init__(self, statModeInt):
+ self._tahoe_statModeInt = statModeInt
+ filepath.Permissions.__init__(self, statModeInt)
+ def __and__(self, other):
+ return self._tahoe_statModeInt & other
+
class Handler:
implements(ftp.IFTPShell)
def __init__(self, client, rootnode, username, convergence):
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 (and earlier) 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. This provides both 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":
d.addCallback(_got_parent)
return d
-from auth import AccountURLChecker, AccountFileChecker, NeedRootcapLookupScheme
+from allmydata.frontends.auth import AccountURLChecker, AccountFileChecker, NeedRootcapLookupScheme
class Dispatcher:
class FTPServer(service.MultiService):
def __init__(self, client, accountfile, accounturl, ftp_portstr):
+ precondition(isinstance(accountfile, (unicode, NoneType)), accountfile)
service.MultiService.__init__(self)
- # make sure we're using a patched Twisted that uses IWriteFile.close:
- # see docs/frontends/FTP-and-SFTP.txt and
- # http://twistedmatrix.com/trac/ticket/3462 for details.
- assert "close" in ftp.IWriteFile.names(), "your twisted is lacking"
-
r = Dispatcher(client)
p = portal.Portal(r)