import os, re
from twisted.internet import defer
-from twisted.web2 import server, http, http_headers
-from twisted.python import log
+from twisted.web2 import server, http, http_headers, static
+from twisted.python import log, failure
+from twisted.python.filepath import FilePath
from apt_dht_conf import config
from PeerManager import PeerManager
from HTTPServer import TopLevel
from MirrorManager import MirrorManager
+from CacheManager import CacheManager
from Hash import HashObject
+from db import DB
+from util import findMyIPAddr, compact
+
+download_dir = 'cache'
class AptDHT:
def __init__(self, dht):
log.msg('Initializing the main apt_dht application')
+ self.cache_dir = FilePath(config.get('DEFAULT', 'cache_dir'))
+ if not self.cache_dir.child(download_dir).exists():
+ self.cache_dir.child(download_dir).makedirs()
+ self.db = DB(self.cache_dir.child('apt-dht.db'))
self.dht = dht
self.dht.loadConfig(config, config.get('DEFAULT', 'DHT'))
self.dht.join().addCallbacks(self.joinComplete, self.joinError)
- self.http_server = TopLevel(config.get('DEFAULT', 'cache_dir'), self)
- self.http_site = server.Site(self.http_server)
+ self.http_server = TopLevel(self.cache_dir.child(download_dir), self.db, self)
+ self.getHTTPFactory = self.http_server.getHTTPFactory
self.peers = PeerManager()
- self.mirrors = MirrorManager(config.get('DEFAULT', 'cache_dir'), self)
+ self.mirrors = MirrorManager(self.cache_dir, config.gettime('DEFAULT', 'UNLOAD_PACKAGES_CACHE'))
+ other_dirs = [FilePath(f) for f in config.getstringlist('DEFAULT', 'OTHER_DIRS')]
+ self.cache = CacheManager(self.cache_dir.child(download_dir), self.db, other_dirs, self)
self.my_addr = None
- self.isLocal = re.compile('^(192\.168\.[0-9]{1,3}\.[0-9]{1,3})|'+
- '(10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})|'+
- '(172\.0?([1][6-9])|([2][0-9])|([3][0-1])\.[0-9]{1,3}\.[0-9]{1,3})|'+
- '(127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})$')
- def getSite(self):
- return self.http_site
-
- def joinComplete(self, addrs):
- log.msg("got addrs: %r" % (addrs,))
-
- try:
- ifconfig = os.popen("/sbin/ifconfig |/bin/grep inet|"+
- "/usr/bin/awk '{print $2}' | "+
- "sed -e s/.*://", "r").read().strip().split('\n')
- except:
- ifconfig = []
-
- # Get counts for all the non-local addresses returned
- addr_count = {}
- for addr in ifconfig:
- if not self.isLocal.match(addr):
- addr_count.setdefault(addr, 0)
- addr_count[addr] += 1
-
- local_addrs = addr_count.keys()
- if len(local_addrs) == 1:
- self.my_addr = local_addrs[0]
- log.msg('Found remote address from ifconfig: %r' % (self.my_addr,))
-
- # Get counts for all the non-local addresses returned
- addr_count = {}
- port_count = {}
- for addr in addrs:
- if not self.isLocal.match(addr[0]):
- addr_count.setdefault(addr[0], 0)
- addr_count[addr[0]] += 1
- port_count.setdefault(addr[1], 0)
- port_count[addr[1]] += 1
-
- # Find the most popular address
- popular_addr = []
- popular_count = 0
- for addr in addr_count:
- if addr_count[addr] > popular_count:
- popular_addr = [addr]
- popular_count = addr_count[addr]
- elif addr_count[addr] == popular_count:
- popular_addr.append(addr)
-
- # Find the most popular port
- popular_port = []
- popular_count = 0
- for port in port_count:
- if port_count[port] > popular_count:
- popular_port = [port]
- popular_count = port_count[port]
- elif port_count[port] == popular_count:
- popular_port.append(port)
-
- port = config.getint(config.get('DEFAULT', 'DHT'), 'PORT')
- if len(port_count.keys()) > 1:
- log.msg('Problem, multiple ports have been found: %r' % (port_count,))
- if port not in port_count.keys():
- log.msg('And none of the ports found match the intended one')
- elif len(port_count.keys()) == 1:
- port = port_count.keys()[0]
- else:
- log.msg('Port was not found')
-
- if len(popular_addr) == 1:
- log.msg('Found popular address: %r' % (popular_addr[0],))
- if self.my_addr and self.my_addr != popular_addr[0]:
- log.msg('But the popular address does not match: %s != %s' % (popular_addr[0], self.my_addr))
- self.my_addr = popular_addr[0]
- elif len(popular_addr) > 1:
- log.msg('Found multiple popular addresses: %r' % (popular_addr,))
- if self.my_addr and self.my_addr not in popular_addr:
- log.msg('And none of the addresses found match the ifconfig one')
- else:
- log.msg('No non-local addresses found: %r' % (popular_addr,))
-
+ def joinComplete(self, result):
+ self.my_addr = findMyIPAddr(result,
+ config.getint(config.get('DEFAULT', 'DHT'), 'PORT'),
+ config.getboolean('DEFAULT', 'LOCAL_OK'))
if not self.my_addr:
- log.err(RuntimeError("Remote IP Address could not be found for this machine"))
-
- def ipAddrFromChicken(self):
- import urllib
- ip_search = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}')
- try:
- f = urllib.urlopen("http://www.ipchicken.com")
- data = f.read()
- f.close()
- current_ip = ip_search.findall(data)
- return current_ip
- except Exception:
- return []
+ raise RuntimeError, "IP address for this machine could not be found"
+ self.cache.scanDirectories()
def joinError(self, failure):
log.msg("joining DHT failed miserably")
log.err(failure)
+ raise RuntimeError, "IP address for this machine could not be found"
- def check_freshness(self, path, modtime, resp):
+ def check_freshness(self, req, path, modtime, resp):
log.msg('Checking if %s is still fresh' % path)
- d = self.peers.get([path], "HEAD", modtime)
- d.addCallback(self.check_freshness_done, path, resp)
+ d = self.peers.get('', path, method = "HEAD", modtime = modtime)
+ d.addCallback(self.check_freshness_done, req, path, resp)
return d
- def check_freshness_done(self, resp, path, orig_resp):
+ def check_freshness_done(self, resp, req, path, orig_resp):
if resp.code == 304:
log.msg('Still fresh, returning: %s' % path)
return orig_resp
else:
log.msg('Stale, need to redownload: %s' % path)
- return self.get_resp(path)
+ return self.get_resp(req, path)
- def get_resp(self, path):
+ def get_resp(self, req, path):
d = defer.Deferred()
log.msg('Trying to find hash for %s' % path)
findDefer = self.mirrors.findHash(path)
findDefer.addCallbacks(self.findHash_done, self.findHash_error,
- callbackArgs=(path, d), errbackArgs=(path, d))
+ callbackArgs=(req, path, d), errbackArgs=(req, path, d))
findDefer.addErrback(log.err)
return d
- def findHash_error(self, failure, path, d):
+ def findHash_error(self, failure, req, path, d):
log.err(failure)
- self.findHash_done(HashObject(), path, d)
+ self.findHash_done(HashObject(), req, path, d)
- def findHash_done(self, hash, path, d):
+ def findHash_done(self, hash, req, path, d):
if hash.expected() is None:
log.msg('Hash for %s was not found' % path)
- self.download_file([path], hash, path, d)
+ self.lookupHash_done([], hash, path, d)
else:
log.msg('Found hash %s for %s' % (hash.hexexpected(), path))
- # Lookup hash from DHT
- key = hash.normexpected(bits = config.getint(config.get('DEFAULT', 'DHT'), 'HASH_LENGTH'))
- lookupDefer = self.dht.getValue(key)
- lookupDefer.addCallback(self.lookupHash_done, hash, path, d)
- def lookupHash_done(self, locations, hash, path, d):
+ # Lookup hash in cache
+ locations = self.db.lookupHash(hash.expected())
+ self.getCachedFile(hash, req, path, d, locations)
+
+ def getCachedFile(self, hash, req, path, d, locations):
if not locations:
+ log.msg('Failed to return file from cache: %s' % path)
+ self.lookupHash(hash, path, d)
+ return
+
+ # Get the first possible location from the list
+ file = locations.pop(0)['path']
+ log.msg('Returning cached file: %s' % file.path)
+
+ # Get it's response
+ resp = static.File(file.path).renderHTTP(req)
+ if isinstance(resp, defer.Deferred):
+ resp.addBoth(self._getCachedFile, hash, req, path, d, locations)
+ else:
+ self._getCachedFile(resp, hash, req, path, d, locations)
+
+ def _getCachedFile(self, resp, hash, req, path, d, locations):
+ if isinstance(resp, failure.Failure):
+ log.msg('Got error trying to get cached file')
+ log.err()
+ # Try the next possible location
+ self.getCachedFile(hash, req, path, d, locations)
+ return
+
+ log.msg('Cached response: %r' % resp)
+
+ if resp.code >= 200 and resp.code < 400:
+ d.callback(resp)
+ else:
+ # Try the next possible location
+ self.getCachedFile(hash, req, path, d, locations)
+
+ def lookupHash(self, hash, path, d):
+ log.msg('Looking up hash in DHT for file: %s' % path)
+ key = hash.normexpected(bits = config.getint(config.get('DEFAULT', 'DHT'), 'HASH_LENGTH'))
+ lookupDefer = self.dht.getValue(key)
+ lookupDefer.addCallback(self.lookupHash_done, hash, path, d)
+
+ def lookupHash_done(self, values, hash, path, d):
+ if not values:
log.msg('Peers for %s were not found' % path)
- self.download_file([path], hash, path, d)
+ getDefer = self.peers.get(hash, path)
+ getDefer.addCallback(self.cache.save_file, hash, path)
+ getDefer.addErrback(self.cache.save_error, path)
+ getDefer.addCallbacks(d.callback, d.errback)
else:
- log.msg('Found peers for %s: %r' % (path, locations))
+ log.msg('Found peers for %s: %r' % (path, values))
# Download from the found peers
- self.download_file(locations, hash, path, d)
+ getDefer = self.peers.get(hash, path, values)
+ getDefer.addCallback(self.check_response, hash, path)
+ getDefer.addCallback(self.cache.save_file, hash, path)
+ getDefer.addErrback(self.cache.save_error, path)
+ getDefer.addCallbacks(d.callback, d.errback)
- def download_file(self, locations, hash, path, d):
- getDefer = self.peers.get(locations)
- getDefer.addCallback(self.mirrors.save_file, hash, path)
- getDefer.addErrback(self.mirrors.save_error, path)
- getDefer.addCallbacks(d.callback, d.errback)
+ def check_response(self, response, hash, path):
+ if response.code < 200 or response.code >= 300:
+ log.msg('Download from peers failed, going to direct download: %s' % path)
+ getDefer = self.peers.get(hash, path)
+ return getDefer
+ return response
- def download_complete(self, hash, url, file_path):
- assert file_path.startswith(config.get('DEFAULT', 'cache_dir'))
- directory = file_path[:len(config.get('DEFAULT', 'cache_dir'))]
- url_path = file_path[len(config.get('DEFAULT', 'cache_dir')):]
- if url_path[0] == '/':
- url_path = url_path[1:]
- top_directory = url_path.split('/',1)[0]
- url_path = url_path[len(top_directory):]
- http_dir = os.path.join(directory, top_directory)
- new_top = self.http_server.addDirectory(http_dir)
- url_path = '/' + new_top + url_path
- log.msg('now avaliable at %s: %s' % (url_path, url))
-
- if self.my_addr:
- site = self.my_addr + ':' + str(config.getint('DEFAULT', 'PORT'))
- full_path = urlunparse(('http', site, url_path, None, None, None))
+ def new_cached_file(self, file_path, hash, url = None, forceDHT = False):
+ """Add a newly cached file to the DHT.
+
+ If the file was downloaded, set url to the path it was downloaded for.
+ Don't add a file to the DHT unless a hash was found for it
+ (but do add it anyway if forceDHT is True).
+ """
+ if url:
+ self.mirrors.updatedFile(url, file_path)
+
+ if self.my_addr and hash and (hash.expected() is not None or forceDHT):
+ contact = compact(self.my_addr, config.getint('DEFAULT', 'PORT'))
+ value = {'c': contact}
key = hash.norm(bits = config.getint(config.get('DEFAULT', 'DHT'), 'HASH_LENGTH'))
- storeDefer = self.dht.storeValue(key, full_path)
- storeDefer.addCallback(self.store_done, full_path)
- storeDefer.addErrback(log.err)
+ storeDefer = self.dht.storeValue(key, value)
+ storeDefer.addCallback(self.store_done, hash)
+ return storeDefer
+ return None
- def store_done(self, result, path):
- log.msg('Added %s to the DHT: %r' % (path, result))
+ def store_done(self, result, hash):
+ log.msg('Added %s to the DHT: %r' % (hash.hexdigest(), result))
\ No newline at end of file
projects / quix0rs-apt-p2p.git / blobdiff