citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

TLS updates

Browse Source 
- save TLS version
- minor TLS error handling updates
This commit is contained in:
Peter Šurda 2017-06-24 12:18:15 +02:00
parent b9d60f8b41
commit e9edf70d3a
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/tls.py
View File

@ -31,6 +31,7 @@ class TLSDispatcher(AdvancedDispatcher):
self.ciphers = ciphers self.ciphers = ciphers
self.tlsStarted = False self.tlsStarted = False
self.tlsDone = False self.tlsDone = False
self.tlsVersion = "N/A"
self.isSSL = False self.isSSL = False
def state_tls_init(self): def state_tls_init(self):
@ -96,8 +97,9 @@ class TLSDispatcher(AdvancedDispatcher):
elif err.errno in _DISCONNECTED_SSL: elif err.errno in _DISCONNECTED_SSL:
self.handle_close() self.handle_close()
return return
else: logger.info("SSL Error: %s", str(err))
raise self.handle_close()
return
def handle_write(self): def handle_write(self):
try: try:
@ -116,8 +118,9 @@ class TLSDispatcher(AdvancedDispatcher):
elif err.errno in _DISCONNECTED_SSL: elif err.errno in _DISCONNECTED_SSL:
self.handle_close() self.handle_close()
return 0 return 0
else: logger.info("SSL Error: %s", str(err))
raise self.handle_close()
return
def tls_handshake(self): def tls_handshake(self):
# wait for flush # wait for flush
@ -138,8 +141,19 @@ class TLSDispatcher(AdvancedDispatcher):
self.want_write = True self.want_write = True
if not (self.want_write or self.want_read): if not (self.want_write or self.want_read):
raise raise
except socket.error as err:
if err.errno in asyncore._DISCONNECTED:
self.handle_close()
else: else:
logger.debug("%s:%i: TLS handshake success%s", self.destination.host, self.destination.port, ", TLS protocol version: %s" % (self.sslSocket.version()) if sys.version_info >= (2, 7, 9) else "") raise
else:
if sys.version_info >= (2, 7, 9):
self.tlsVersion = self.sslSocket.version()
logger.debug("%s:%i: TLS handshake success, TLS protocol version: %s",
self.destination.host, self.destination.port, self.sslSocket.version())
else:
self.tlsVersion = "TLSv1"
logger.debug("%s:%i: TLS handshake success", self.destination.host, self.destination.port)
# The handshake has completed, so remove this channel and... # The handshake has completed, so remove this channel and...
self.del_channel() self.del_channel()
self.set_socket(self.sslSocket) self.set_socket(self.sslSocket)