X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=0e7b7570e3bb262c82e6690fc490ada2a330fc09;hb=c9c337a89a3f04d7a985a521ca552d421fd94fda;hp=46ec92146f9bf427fae491bf320f6e02f9333270;hpb=3989b283341f5d456a5c6ffdd4e7fd00f57d0fcd;p=electrum-server.git diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py index 46ec921..0e7b757 100644 --- a/backends/irc/__init__.py +++ b/backends/irc/__init__.py @@ -1,36 +1,45 @@ -import threading, socket, traceback, time, sys - -def random_string(N): - import random, string - return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N)) +import socket +import sys +import threading +import time +import traceback from processor import Processor +from utils import Hash, print_log from version import VERSION + class IrcThread(threading.Thread): def __init__(self, processor, config): threading.Thread.__init__(self) + self.processor = processor self.daemon = True - self.stratum_tcp_port = config.get('server','stratum_tcp_port') - self.stratum_http_port = config.get('server','stratum_http_port') - self.stratum_tcp_ssl_port = config.get('server','stratum_tcp_ssl_port') - self.stratum_http_ssl_port = config.get('server','stratum_http_ssl_port') - self.report_stratum_tcp_port = config.get('server','report_stratum_tcp_port') - self.report_stratum_http_port = config.get('server','report_stratum_http_port') - self.report_stratum_tcp_ssl_port = config.get('server','report_stratum_tcp_ssl_port') - self.report_stratum_http_ssl_port = config.get('server','report_stratum_http_ssl_port') + self.stratum_tcp_port = config.get('server', 'stratum_tcp_port') + self.stratum_http_port = config.get('server', 'stratum_http_port') + self.stratum_tcp_ssl_port = config.get('server', 'stratum_tcp_ssl_port') + self.stratum_http_ssl_port = config.get('server', 'stratum_http_ssl_port') + self.report_stratum_tcp_port = config.get('server', 'report_stratum_tcp_port') + self.report_stratum_http_port = config.get('server', 'report_stratum_http_port') + self.report_stratum_tcp_ssl_port = config.get('server', 'report_stratum_tcp_ssl_port') + self.report_stratum_http_ssl_port = config.get('server', 'report_stratum_http_ssl_port') self.peers = {} - self.host = config.get('server','host') - self.report_host = config.get('server','report_host') + self.host = config.get('server', 'host') + self.report_host = config.get('server', 'report_host') self.nick = config.get('server', 'irc_nick') - if self.report_stratum_tcp_port: self.stratum_tcp_port = self.report_stratum_tcp_port - if self.report_stratum_http_port: self.stratum_http_port = self.report_stratum_http_port - if self.report_stratum_tcp_ssl_port: self.stratum_tcp_ssl_port = self.report_stratum_tcp_ssl_port - if self.report_stratum_http_ssl_port: self.stratum_http_ssl_port = self.report_stratum_http_ssl_port - if self.report_host: self.host = self.report_host - if not self.nick: self.nick = random_string(10) + if self.report_stratum_tcp_port: + self.stratum_tcp_port = self.report_stratum_tcp_port + if self.report_stratum_http_port: + self.stratum_http_port = self.report_stratum_http_port + if self.report_stratum_tcp_ssl_port: + self.stratum_tcp_ssl_port = self.report_stratum_tcp_ssl_port + if self.report_stratum_http_ssl_port: + self.stratum_http_ssl_port = self.report_stratum_http_ssl_port + if self.report_host: + self.host = self.report_host + if not self.nick: + self.nick = Hash(self.report_host)[:10] self.prepend = 'E_' if config.get('server', 'coin') == 'litecoin': self.prepend = 'EL_' @@ -40,21 +49,20 @@ class IrcThread(threading.Thread): def get_peers(self): return self.peers.values() - def getname(self): s = 'v' + VERSION + ' ' - if self.pruning: s += 'p ' + if self.pruning: + s += 'p ' if self.stratum_tcp_port: - s += 't' + self.stratum_tcp_port + ' ' + s += 't' + self.stratum_tcp_port + ' ' if self.stratum_http_port: s += 'h' + self.stratum_http_port + ' ' if self.stratum_tcp_port: - s += 's' + self.stratum_tcp_ssl_port + ' ' + s += 's' + self.stratum_tcp_ssl_port + ' ' if self.stratum_http_port: s += 'g' + self.stratum_http_ssl_port + ' ' return s - def run(self): ircname = self.getname() @@ -62,7 +70,9 @@ class IrcThread(threading.Thread): try: s = socket.socket() s.connect(('irc.freenode.net', 6667)) + s.settimeout(300) except: + s.close() time.sleep(10) continue @@ -73,28 +83,26 @@ class IrcThread(threading.Thread): sf = s.makefile('r', 0) t = 0 while not self.processor.shared.stopped(): - line = sf.readline() - line = line.rstrip('\r\n') - line = line.split() - if not line: continue - if line[0]=='PING': - s.send('PONG '+line[1]+'\n') - elif '353' in line: # answer to /names + line = sf.readline().rstrip('\r\n').split() + if not line: + continue + if line[0] == 'PING': + s.send('PONG ' + line[1] + '\n') + elif '353' in line: # answer to /names k = line.index('353') for item in line[k+1:]: if item.startswith(self.prepend): - s.send('WHO %s\n'%item) - elif '352' in line: # answer to /who + s.send('WHO %s\n' % item) + elif '352' in line: # answer to /who # warning: this is a horrible hack which apparently works k = line.index('352') - ip = line[k+4] - ip = socket.gethostbyname(ip) + ip = socket.gethostbyname(line[k+4]) name = line[k+6] host = line[k+9] - ports = line[k+10:] + ports = line[k+10:] self.peers[name] = (ip, host, ports) if time.time() - t > 5*60: - self.processor.push_response({'method':'server.peers', 'params':[self.get_peers()]}) + self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]}) s.send('NAMES #electrum\n') t = time.time() self.peers = {} @@ -104,8 +112,7 @@ class IrcThread(threading.Thread): sf.close() s.close() - print "quitting IRC" - + print_log("quitting IRC") class ServerProcessor(Processor): @@ -113,22 +120,20 @@ class ServerProcessor(Processor): def __init__(self, config): Processor.__init__(self) self.daemon = True - self.banner = config.get('server','banner') - self.password = config.get('server','password') + self.banner = config.get('server', 'banner') + self.password = config.get('server', 'password') if config.get('server', 'irc') == 'yes': self.irc = IrcThread(self, config) - else: + else: self.irc = None - def get_peers(self): if self.irc: return self.irc.get_peers() else: return [] - def run(self): if self.irc: self.irc.start() @@ -146,12 +151,13 @@ class ServerProcessor(Processor): password = None if password != self.password: - response = { 'id':request['id'], 'result':None, 'error':'incorrect password'} - self.push_response(response) + self.push_response({'id': request['id'], + 'result': None, + 'error': 'incorrect password'}) return if method == 'server.banner': - result = self.banner.replace('\\n','\n') + result = self.banner.replace('\\n', '\n') elif method == 'server.peers.subscribe': result = self.get_peers() @@ -164,11 +170,11 @@ class ServerProcessor(Processor): result = 'stopping, please wait until all threads terminate.' elif method == 'server.info': - result = map(lambda s: { "time":s.time, - "name":s.name, - "address":s.address, - "version":s.version, - "subscriptions":len(s.subscriptions)}, + result = map(lambda s: {"time": s.time, + "name": s.name, + "address": s.address, + "version": s.version, + "subscriptions": len(s.subscriptions)}, self.dispatcher.request_dispatcher.get_sessions()) elif method == 'server.cache': @@ -180,9 +186,7 @@ class ServerProcessor(Processor): result = p.queue.qsize() else: - print "unknown method", request - - if result!='': - response = { 'id':request['id'], 'result':result } - self.push_response(response) + print_log("unknown method", request) + if result != '': + self.push_response({'id': request['id'], 'result': result})