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

bugfix when loading plugins (#92)

This commit is contained in:
normal-cock 2019-09-26 16:57:24 +08:00 committed by Abhinav Singh
parent 033b7ad24a
commit 3a5c780095
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
proxy.py
View File

@ -1391,18 +1391,16 @@ class HttpProtocolHandler(threading.Thread):
'Upgraded client conn for plugin %s', str(plugin_))
elif isinstance(upgraded_sock, bool) and upgraded_sock:
return True
except HttpProtocolException as e:
logger.exception(
'HttpProtocolException type raised', exc_info=e)
response = e.response(self.request)
if response:
self.client.queue(response)
# But is client also ready for writes?
self.client.flush()
return True
except Exception as e:
if e.__class__.__name__ in (
ProxyAuthenticationFailed.__name__, ProxyConnectionFailed.__name__,
HttpRequestRejected.__name__):
logger.exception(
'HttpProtocolException type raised', exc_info=e)
response = e.response(self.request) # type: ignore
if response:
self.client.queue(response)
# But is client also ready for writes?
self.client.flush()
return True
raise e
return False
@ -1522,7 +1520,8 @@ def load_plugins(plugins: bytes) -> Dict[bytes, List[type]]:
if plugin == b'':
continue
module_name, klass_name = plugin.rsplit(DOT, 1)
module = importlib.import_module(text_(module_name))
module_name = __name__ if module_name == b'proxy' else text_(module_name)
module = importlib.import_module(__name__)
klass = getattr(module, text_(klass_name))
base_klass = inspect.getmro(klass)[::-1][2:][0]
p[bytes_(base_klass.__name__)].append(klass)