remove unused variable, clean imports

This commit is contained in:
Michel Oosterhof
2016-06-15 13:34:01 +04:00
parent 15cdfa4b10
commit bb935ca707

View File

@ -9,12 +9,11 @@ import os
from zope.interface import implementer from zope.interface import implementer
import twisted from twisted.python import log
from twisted.conch.interfaces import ISFTPFile, ISFTPServer from twisted.conch.interfaces import ISFTPFile, ISFTPServer
from twisted.conch.ssh import filetransfer from twisted.conch.ssh import filetransfer
from twisted.conch.ssh.filetransfer import FXF_READ, FXF_WRITE, FXF_APPEND, FXF_CREAT, FXF_TRUNC, FXF_EXCL from twisted.conch.ssh.filetransfer import FXF_READ, FXF_WRITE, FXF_APPEND, FXF_CREAT, FXF_TRUNC, FXF_EXCL
import twisted.conch.ls import twisted.conch.ls
from twisted.python import log
import cowrie.core.pwd as pwd import cowrie.core.pwd as pwd
@ -23,12 +22,11 @@ import cowrie.core.pwd as pwd
class CowrieSFTPFile(object): class CowrieSFTPFile(object):
""" """
""" """
bytesReceived = 0
def __init__(self, sftpserver, filename, flags, attrs): def __init__(self, sftpserver, filename, flags, attrs):
self.sftpserver = sftpserver self.sftpserver = sftpserver
self.filename = filename self.filename = filename
self.transfer_completed = 0
self.bytes_written = 0
try: try:
self.bytesReceivedLimit = int( self.bytesReceivedLimit = int(
@ -70,8 +68,8 @@ class CowrieSFTPFile(object):
def close(self): def close(self):
""" """
""" """
if (self.bytes_written > 0): if (self.bytesReceived > 0):
self.sftpserver.fs.update_size(self.filename, self.bytes_written) self.sftpserver.fs.update_size(self.filename, self.bytesReceived)
return self.sftpserver.fs.close(self.fd) return self.sftpserver.fs.close(self.fd)
@ -84,10 +82,10 @@ class CowrieSFTPFile(object):
def writeChunk(self, offset, data): def writeChunk(self, offset, data):
""" """
""" """
self.bytes_written += len(data) self.bytesReceived += len(data)
if self.bytesReceivedLimit and self.bytes_written > self.bytesReceivedLimit: if self.bytesReceivedLimit and self.bytesReceived > self.bytesReceivedLimit:
log.msg(format='Data upload limit reached') log.msg(format='Data upload limit reached')
raise filetransfer.SFTPError( filetransfer.FX_FAILURE, "Quota exceeded" ) raise filetransfer.SFTPError(filetransfer.FX_FAILURE, "Quota exceeded")
self.sftpserver.fs.lseek(self.fd, offset, os.SEEK_SET) self.sftpserver.fs.lseek(self.fd, offset, os.SEEK_SET)
self.sftpserver.fs.write(self.fd, data) self.sftpserver.fs.write(self.fd, data)
@ -277,7 +275,6 @@ class SFTPServerForCowrieUser(object):
def realPath(self, path): def realPath(self, path):
""" """
""" """
#log.msg("SFTP realPath: %s" % (path,))
return self.fs.realpath(self._absPath(path)) return self.fs.realpath(self._absPath(path))