Skip to content

Commit

Permalink
Do not disregard KeyError exceptions inside plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianLudwig authored and Marius Kriegerowski committed Jul 7, 2021
1 parent 3db7c9a commit a69ef81
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions amqtt/plugins/manager.py
Expand Up @@ -194,13 +194,13 @@ async def map(self, coro, *args, **kwargs):

@staticmethod
async def _call_coro(plugin, coro_name, *args, **kwargs):
try:
coro = getattr(plugin.object, coro_name, None)(*args, **kwargs)
return await coro
except TypeError:
if not hasattr(plugin.object, coro_name):
# Plugin doesn't implement coro_name
return None

coro = getattr(plugin.object, coro_name)(*args, **kwargs)
return await coro

async def map_plugin_coro(self, coro_name, *args, **kwargs):
"""
Call a plugin declared by plugin by its name
Expand Down
3 changes: 2 additions & 1 deletion docs/changelog.rst
@@ -1,7 +1,7 @@
Changelog
---------

0.10.0 - [unreleased]
0.10.0 - [2021-07-07]
---------------------

* first release under new package name: amqtt
Expand All @@ -13,6 +13,7 @@ Changelog
* Move scripts module into hbmqtt module, from https://github.com/beerfactory/hbmqtt/pull/167
* Download mosquitto certificate on the fly
* importing `hbmqtt` is deprecated, use `amqtt`
* Security fix: If an attacker could produce a KeyError inside an authentication plugin, the authentication was accepted instead of rejected

0.9.5
.....
Expand Down

0 comments on commit a69ef81

Please sign in to comment.