Bitmessage/PyBitmessage-2024-11-28
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

SSL handshake fewer errors

Browse Source 
- don't unnecessarily raise exceptions if SSL handshake fails
This commit is contained in:
Peter Šurda 2017-02-08 20:49:14 +01:00
parent 35a712d11d
commit b0539f5cb4
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/class_receiveDataThread.py
View File

@ -305,13 +305,16 @@ class receiveDataThread(threading.Thread):
continue continue
logger.error("SSL socket handhake failed: %s, shutting down connection", str(e)) logger.error("SSL socket handhake failed: %s, shutting down connection", str(e))
self.sendDataThreadQueue.put((0, 'shutdown','tls handshake fail %s' % (str(e)))) self.sendDataThreadQueue.put((0, 'shutdown','tls handshake fail %s' % (str(e))))
return return False
except Exception: except Exception:
logger.error("SSL socket handhake failed, shutting down connection", exc_info=True) logger.error("SSL socket handhake failed, shutting down connection", exc_info=True)
self.sendDataThreadQueue.put((0, 'shutdown','tls handshake fail')) self.sendDataThreadQueue.put((0, 'shutdown','tls handshake fail'))
return return False
# SSL in the background should be blocking, otherwise the error handling is difficult # SSL in the background should be blocking, otherwise the error handling is difficult
self.sslSock.settimeout(None) self.sslSock.settimeout(None)
return True
# no SSL
return True
def peerValidityChecks(self): def peerValidityChecks(self):
if self.remoteProtocolVersion < 3: if self.remoteProtocolVersion < 3:
@ -346,7 +349,9 @@ class receiveDataThread(threading.Thread):
# there is no reason to run this function a second time # there is no reason to run this function a second time
return return
self.sslHandshake() if not self.sslHandshake():
return
if self.peerValidityChecks() == False: if self.peerValidityChecks() == False:
time.sleep(2) time.sleep(2)
self.sendDataThreadQueue.put((0, 'shutdown','no data')) self.sendDataThreadQueue.put((0, 'shutdown','no data'))