X-Git-Url: https://git.mxchange.org/?p=quix0rs-apt-p2p.git;a=blobdiff_plain;f=apt_p2p%2FHTTPServer.py;h=c92df92d2baf461651d1dbcd6bab67f60601ec44;hp=d72423e083746f79bc353a00627cdb1d1ebccc02;hb=6d242a16df6b2f911b8fc7079219b38b26f23ecb;hpb=297459dc70c104886d3c1794894539aa9ea26c4d diff --git a/apt_p2p/HTTPServer.py b/apt_p2p/HTTPServer.py index d72423e..c92df92 100644 --- a/apt_p2p/HTTPServer.py +++ b/apt_p2p/HTTPServer.py @@ -13,6 +13,7 @@ from twisted.trial import unittest from twisted.python.filepath import FilePath from policies import ThrottlingFactory, ThrottlingProtocol, ProtocolWrapper +from Streams import UploadStream, FileUploadStream, PiecesUploadStream from apt_p2p_conf import config from apt_p2p_Khashmir.bencode import bencode @@ -30,9 +31,27 @@ class FileDownloader(static.File): def __init__(self, path, manager, defaultType="text/plain", ignoredExts=(), processors=None, indexNames=None): self.manager = manager super(FileDownloader, self).__init__(path, defaultType, ignoredExts, processors, indexNames) - + + def locateChild(self, req, segments): + child, segments = super(FileDownloader, self).locateChild(req, segments) + # Make sure we always call renderHTTP() + if isinstance(child, FileDownloader): + return child, segments + else: + return self, server.StopTraversal + def renderHTTP(self, req): log.msg('Got request for %s from %s' % (req.uri, req.remoteAddr)) + + # Make sure the file is in the DB and unchanged + if self.manager and not self.manager.db.isUnchanged(self.fp): + if self.fp.exists() and self.fp.isfile(): + self.fp.remove() + return self._renderHTTP_done(http.Response(404, + {'content-type': http_headers.MimeType('text', 'html')}, + '

File found but it has changed.'), + req) + resp = super(FileDownloader, self).renderHTTP(req) if isinstance(resp, defer.Deferred): resp.addCallbacks(self._renderHTTP_done, self._renderHTTP_error, @@ -47,7 +66,7 @@ class FileDownloader(static.File): if self.manager: path = 'http:/' + req.uri if resp.code >= 200 and resp.code < 400: - return self.manager.check_freshness(req, path, resp.headers.getHeader('Last-Modified'), resp) + return self.manager.get_resp(req, path, resp) log.msg('Not found, trying other methods for %s' % req.uri) return self.manager.get_resp(req, path) @@ -68,61 +87,21 @@ class FileDownloader(static.File): return self.__class__(path, self.manager, self.defaultType, self.ignoredExts, self.processors, self.indexNames[:]) -class UploadStream: - """Identifier for streams that are uploaded to peers.""" - -class FileUploaderStream(stream.FileStream, UploadStream): - """Modified to make it suitable for streaming to peers. - - Streams the file in small chunks to make it easier to throttle the - streaming to peers. - - @ivar CHUNK_SIZE: the size of chunks of data to send at a time - """ - - CHUNK_SIZE = 4*1024 - - def read(self, sendfile=False): - if self.f is None: - return None - - length = self.length - if length == 0: - self.f = None - return None - - # Remove the SendFileBuffer and mmap use, just use string reads and writes - - readSize = min(length, self.CHUNK_SIZE) - - self.f.seek(self.start) - b = self.f.read(readSize) - bytesRead = len(b) - if not bytesRead: - raise RuntimeError("Ran out of data reading file %r, expected %d more bytes" % (self.f, length)) - else: - self.length -= bytesRead - self.start += bytesRead - return b - -class PiecesUploaderStream(stream.MemoryStream, UploadStream): - """Modified to identify it for streaming to peers.""" - class PiecesUploader(static.Data): """Modified to identify it for peer requests. - Uses the modified L{PieceUploaderStream} to stream the pieces for throttling. + Uses the modified L{Streams.PiecesUploadStream} to stream the pieces for throttling. """ def render(self, req): return http.Response(responsecode.OK, http_headers.Headers({'content-type': self.contentType()}), - stream=PiecesUploaderStream(self.data)) + stream=PiecesUploadStream(self.data)) class FileUploader(static.File): """Modified to make it suitable for peer requests. - Uses the modified L{FileUploaderStream} to stream the file for throttling, + Uses the modified L{Streams.FileUploadStream} to stream the file for throttling, and doesn't do any listing of directory contents. """ @@ -147,7 +126,7 @@ class FileUploader(static.File): response = http.Response() # Use the modified FileStream - response.stream = FileUploaderStream(f, 0, self.fp.getsize()) + response.stream = FileUploadStream(f, 0, self.fp.getsize()) for (header, value) in ( ("content-type", self.contentType()), @@ -162,8 +141,7 @@ class UploadThrottlingProtocol(ThrottlingProtocol): """Protocol for throttling uploads. Determines whether or not to throttle the upload based on the type of stream. - Uploads use L{FileUploaderStream} or L{twisted.web2.stream.MemorySTream}, - apt uses L{CacheManager.ProxyFileStream} or L{twisted.web.stream.FileStream}. + Uploads use instances of L{Streams.UploadStream}. """ stats = None @@ -191,9 +169,7 @@ class UploadThrottlingProtocol(ThrottlingProtocol): def registerProducer(self, producer, streaming): ThrottlingProtocol.registerProducer(self, producer, streaming) streamType = getattr(producer, 'stream', None) - log.msg('Registered a producer %r with type %r' % (producer, streamType)) if isinstance(streamType, UploadStream): - log.msg('Throttling') self.throttle = True @@ -281,6 +257,7 @@ class TopLevel(resource.Resource): return PiecesUploader(bencode({'t': files[0]['pieces']}), 'application/x-bencoded'), () else: log.msg('Hash could not be found in database: %r' % hash) + return None, () if len(name) > 1: # It's a request from apt