Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

offload: fix exception handling

This commit is contained in:
Oleksii Shevchuk 2019-07-03 14:27:37 +03:00
parent 6c9d9d13d9
commit 658c235e7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pupy/pupylib/PupyOffload.py
View File

@ -198,7 +198,7 @@ class PupyOffloadAcceptor(object):
conninfo['rhost'], conninfo['rport'] conninfo['rhost'], conninfo['rport']
), (conninfo['rhost'], conninfo['rport']) ), (conninfo['rhost'], conninfo['rport'])
except (socket.error, OSError), e: except (socks.GeneralProxyError, socket.error, OSError), e:
if e.errno in COMMON_EXCEPTIONS: if e.errno in COMMON_EXCEPTIONS:
logger.error('Acceptor (%s): Lost connection (refused)', self._port) logger.error('Acceptor (%s): Lost connection (refused)', self._port)
time.sleep(5) time.sleep(5)
@ -212,7 +212,7 @@ class PupyOffloadAcceptor(object):
continue continue
except Exception, e: except Exception, e:
logger.exception('Acceptor (%s): Exception: %s', e) logger.exception('Acceptor (%s): Exception: %s', self._port, e)
raise raise
class PupyOffloadManager(object): class PupyOffloadManager(object):
@ -307,7 +307,7 @@ class PupyOffloadManager(object):
try: try:
c = self._ctx.wrap_socket(c) c = self._ctx.wrap_socket(c)
except (EOFError, ssl.SSLError, socket.error): except (socks.GeneralProxyError, EOFError, ssl.SSLError, socket.error):
raise EOFError('Failure during communication with offload server') raise EOFError('Failure during communication with offload server')
m = MsgPackMessages(c) m = MsgPackMessages(c)