ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-20 03:36:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate Windows newlines from sftpd.py.

Browse Source
This commit is contained in:
david-sarah 2010-05-14 17:56:56 -07:00
parent 14d0721246
commit 7409d1e019
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/allmydata/frontends/sftpd.py
View File

@ -19,7 +19,7 @@ from twisted.cred import portal
from twisted.internet import defer
from twisted.internet.interfaces import IFinishableConsumer
from foolscap.api import eventually
from foolscap.api import eventually
from allmydata.util import deferredutil
from allmydata.util.consumer import download_to_data
@ -238,7 +238,7 @@ def _populate_attrs(childnode, metadata, writeable, size=None):
attrs["permissions"] = perms
# We could set the SSH_FILEXFER_ATTR_FLAGS here:
# ENCRYPTED would always be true ("The file is stored on disk
# ENCRYPTED would always be true ("The file is stored on disk
# using file-system level transparent encryption.")
# SYSTEM, HIDDEN, ARCHIVE and SYNC would always be false.
# READONLY and IMMUTABLE would be set according to
@ -259,12 +259,12 @@ class EncryptedTemporaryFile(PrefixingLogMixin):
def _crypt(self, offset, data):
# FIXME: use random-access AES (pycryptopp ticket #18)
offset_big = offset // 16
offset_small = offset % 16
iv = binascii.unhexlify("%032x" % offset_big)
cipher = AES(self.key, iv=iv)
cipher.process("\x00"*offset_small)
return cipher.process(data)
offset_big = offset // 16
offset_small = offset % 16
iv = binascii.unhexlify("%032x" % offset_big)
cipher = AES(self.key, iv=iv)
cipher.process("\x00"*offset_small)
return cipher.process(data)
def close(self):
self.file.close()
@ -550,11 +550,11 @@ class ShortReadOnlySFTPFile(PrefixingLogMixin):
def _read(data):
if noisy: self.log("_read(%r) in readChunk(%r, %r)" % (data, offset, length), level=NOISY)
# "In response to this request, the server will read as many bytes as it
# can from the file (up to 'len'), and return them in a SSH_FXP_DATA
# message. If an error occurs or EOF is encountered before reading any
# data, the server will respond with SSH_FXP_STATUS. For normal disk
# files, it is guaranteed that this will read the specified number of
# "In response to this request, the server will read as many bytes as it
# can from the file (up to 'len'), and return them in a SSH_FXP_DATA
# message. If an error occurs or EOF is encountered before reading any
# data, the server will respond with SSH_FXP_STATUS. For normal disk
# files, it is guaranteed that this will read the specified number of
# bytes, or up to end of file."
#
# i.e. we respond with an EOF error iff offset is already at EOF.
@ -684,8 +684,8 @@ class GeneralSFTPFile(PrefixingLogMixin):
# This is ok because SFTP makes no guarantee that the request completes
# before the write. In fact it explicitly allows write errors to be delayed
# until close:
# "One should note that on some server platforms even a close can fail.
# This can happen e.g. if the server operating system caches writes,
# "One should note that on some server platforms even a close can fail.
# This can happen e.g. if the server operating system caches writes,
# and an error occurs while flushing cached writes during the close."
def _write(ign):
@ -1142,8 +1142,8 @@ class SFTPHandler(PrefixingLogMixin):
path_utf8 = pathstring.split("/")
# <http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-6.2>
# "Servers SHOULD interpret a path name component ".." as referring to
# the parent directory, and "." as referring to the current directory."
# "Servers SHOULD interpret a path name component ".." as referring to
# the parent directory, and "." as referring to the current directory."
path = []
for p_utf8 in path_utf8:
if p_utf8 == "..":