oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support https trackers, add browser-like user agent for tracker http requests

Browse source
This commit is contained in:
shortcutme 2019-02-14 15:48:36 +01:00
parent 523f8dae2a
commit 5c57cd6541
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Site/SiteAnnouncer.py
View file

@ -162,6 +162,8 @@ class SiteAnnouncer(object):
handler = self.announceTrackerUdp handler = self.announceTrackerUdp
elif protocol == "http": elif protocol == "http":
handler = self.announceTrackerHttp handler = self.announceTrackerHttp
elif protocol == "https":
handler = self.announceTrackerHttps
else: else:
handler = None handler = None
return handler return handler
@ -286,20 +288,35 @@ class SiteAnnouncer(object):
return peers return peers
def httpRequest(self, url): def httpRequest(self, url):
headers = {
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.64 Safari/537.11',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
'Accept-Encoding': 'none',
'Accept-Language': 'en-US,en;q=0.8',
'Connection': 'keep-alive'
}
req = urllib2.Request(url, headers=headers)
if config.trackers_proxy == "tor": if config.trackers_proxy == "tor":
tor_manager = self.site.connection_server.tor_manager tor_manager = self.site.connection_server.tor_manager
handler = sockshandler.SocksiPyHandler(socks.SOCKS5, tor_manager.proxy_ip, tor_manager.proxy_port) handler = sockshandler.SocksiPyHandler(socks.SOCKS5, tor_manager.proxy_ip, tor_manager.proxy_port)
opener = urllib2.build_opener(handler) opener = urllib2.build_opener(handler)
return opener.open(url, timeout=50) return opener.open(req, timeout=50)
elif config.trackers_proxy == "disable": elif config.trackers_proxy == "disable":
return urllib2.urlopen(url, timeout=25) return urllib2.urlopen(req, timeout=25)
else: else:
proxy_ip, proxy_port = config.trackers_proxy.split(":") proxy_ip, proxy_port = config.trackers_proxy.split(":")
handler = sockshandler.SocksiPyHandler(socks.SOCKS5, proxy_ip, int(proxy_port)) handler = sockshandler.SocksiPyHandler(socks.SOCKS5, proxy_ip, int(proxy_port))
opener = urllib2.build_opener(handler) opener = urllib2.build_opener(handler)
return opener.open(url, timeout=50) return opener.open(req, timeout=50)
def announceTrackerHttp(self, tracker_address, mode="start", num_want=10): def announceTrackerHttps(self, *args, **kwargs):
kwargs["protocol"] = "https"
return self.announceTrackerHttp(*args, **kwargs)
def announceTrackerHttp(self, tracker_address, mode="start", num_want=10, protocol="http"):
tracker_ip, tracker_port = tracker_address.rsplit(":", 1) tracker_ip, tracker_port = tracker_address.rsplit(":", 1)
if helper.getIpType(tracker_ip) in self.getOpenedServiceTypes(): if helper.getIpType(tracker_ip) in self.getOpenedServiceTypes():
port = self.fileserver_port port = self.fileserver_port
@ -312,7 +329,7 @@ class SiteAnnouncer(object):
'event': 'started' 'event': 'started'
} }
url = "http://" + tracker_address + "?" + urllib.urlencode(params) url = protocol + "://" + tracker_address + "?" + urllib.urlencode(params)
s = time.time() s = time.time()
response = None response = None