AaronFiore/electrum
1
0
Fork 0
Code Activity

client-side support for SSL

Browse Source
This commit is contained in:
thomasv
2012-10-17 11:35:24 +02:00
parent 27f4a0c28e
commit 87a28d31a4
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/interface.py
View File

@@ -27,7 +27,7 @@ from util import print_error
DEFAULT_TIMEOUT = 5 DEFAULT_TIMEOUT = 5
DEFAULT_SERVERS = [ DEFAULT_SERVERS = [
'electrum.novit.ro:50001:t', 'electrum.novit.ro:50001:t',
'ecdsa.org:50001:t', #'ecdsa.org:50002:s',
'electrum.bitcoins.sk:50001:t', 'electrum.bitcoins.sk:50001:t',
'uncle-enzo.info:50001:t', 'uncle-enzo.info:50001:t',
'electrum.bytesized-hosting.com:50001:t', 'electrum.bytesized-hosting.com:50001:t',
@@ -55,12 +55,13 @@ def pick_random_interface():
class InterfaceAncestor(threading.Thread): class InterfaceAncestor(threading.Thread):
def __init__(self, host, port, proxy=None): def __init__(self, host, port, proxy=None, use_ssl=True):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.daemon = True self.daemon = True
self.host = host self.host = host
self.port = port self.port = port
self.proxy = proxy self.proxy = proxy
self.use_ssl = use_ssl
self.servers = [] # actual list from IRC self.servers = [] # actual list from IRC
self.rtime = 0 self.rtime = 0
@@ -125,9 +126,10 @@ class InterfaceAncestor(threading.Thread):
class HttpStratumInterface(InterfaceAncestor): class HttpStratumInterface(InterfaceAncestor):
""" non-persistent connection. synchronous calls""" """ non-persistent connection. synchronous calls"""
def __init__(self, host, port, proxy=None): def __init__(self, host, port, proxy=None, use_ssl=True):
InterfaceAncestor.__init__(self, host, port, proxy) InterfaceAncestor.__init__(self, host, port, proxy, use_ssl)
self.session_id = None self.session_id = None
self.connection_msg = "http://%s:%d"%(self.host,self.port)
def get_history(self, address): def get_history(self, address):
self.send([('blockchain.address.get_history', [address] )]) self.send([('blockchain.address.get_history', [address] )])
@@ -182,7 +184,11 @@ class HttpStratumInterface(InterfaceAncestor):
# poll with GET # poll with GET
data_json = None data_json = None
host = 'http://%s:%d'%( self.host, self.port ) if self.use_ssl:
host = 'https://%s:%d'%( self.host, self.port )
else:
host = 'http://%s:%d'%( self.host, self.port )
headers = {'content-type': 'application/json'} headers = {'content-type': 'application/json'}
if self.session_id: if self.session_id:
headers['cookie'] = 'SESSION=%s'%self.session_id headers['cookie'] = 'SESSION=%s'%self.session_id
@@ -220,29 +226,37 @@ class HttpStratumInterface(InterfaceAncestor):
class TcpStratumInterface(InterfaceAncestor): class TcpStratumInterface(InterfaceAncestor):
"""json-rpc over persistent TCP connection, asynchronous""" """json-rpc over persistent TCP connection, asynchronous"""
def __init__(self, host, port, proxy=None): def __init__(self, host, port, proxy=None, use_ssl=True):
InterfaceAncestor.__init__(self, host, port, proxy) InterfaceAncestor.__init__(self, host, port, proxy, use_ssl)
self.init_socket() self.init_socket()
def init_socket(self): def init_socket(self):
import ssl
global proxy_modes global proxy_modes
self.connection_msg = "%s:%d"%(self.host,self.port) self.connection_msg = "%s:%d"%(self.host,self.port)
if self.proxy is None: if self.proxy is None:
self.s = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
else: else:
self.connection_msg += " using proxy %s:%s:%s"%(self.proxy.get('mode'), self.proxy.get('host'), self.proxy.get('port')) self.connection_msg += " using proxy %s:%s:%s"%(self.proxy.get('mode'), self.proxy.get('host'), self.proxy.get('port'))
import socks import socks
self.s = socks.socksocket() s = socks.socksocket()
self.s.setproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) ) s.setproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
self.s.settimeout(2)
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) if self.use_ssl:
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1)
s.settimeout(2)
s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
try: try:
self.s.connect(( self.host.encode('ascii'), int(self.port))) s.connect(( self.host.encode('ascii'), int(self.port)))
s.settimeout(60)
self.s = s
self.is_connected = True self.is_connected = True
self.s.settimeout(60)
self.send([('server.version', [ELECTRUM_VERSION])]) self.send([('server.version', [ELECTRUM_VERSION])])
except: except:
self.is_connected = False self.is_connected = False
self.s = None
def run(self): def run(self):
try: try:
@@ -313,23 +327,22 @@ class Interface(TcpStratumInterface, HttpStratumInterface):
self.server = host + ':%d:%s'%(port, protocol) self.server = host + ':%d:%s'%(port, protocol)
#print protocol, host, port #print protocol, host, port
if protocol == 't': if protocol in 'st':
TcpStratumInterface.__init__(self, host, port, proxy) TcpStratumInterface.__init__(self, host, port, proxy, use_ssl=(protocol=='s'))
elif protocol == 'h': elif protocol in 'gh':
HttpStratumInterface.__init__(self, host, port, proxy) HttpStratumInterface.__init__(self, host, port, proxy, use_ssl=(protocol=='g'))
else: else:
print_error("Error: Unknown protocol") raise BaseException('Unknown protocol: %s'%protocol)
TcpStratumInterface.__init__(self, host, port, proxy)
def run(self): def run(self):
if self.protocol == 't': if self.protocol in 'st':
TcpStratumInterface.run(self) TcpStratumInterface.run(self)
else: else:
HttpStratumInterface.run(self) HttpStratumInterface.run(self)
def send(self, messages): def send(self, messages):
if self.protocol == 't': if self.protocol in 'st':
TcpStratumInterface.send(self, messages) TcpStratumInterface.send(self, messages)
else: else:
HttpStratumInterface.send(self, messages) HttpStratumInterface.send(self, messages)