don't filter topics if its explicit disabled

pull/103/head
Robert Resch 2022-01-30 17:39:10 +01:00 zatwierdzone przez Marius Kriegerowski
rodzic 33486d110f
commit f71b99b086
1 zmienionych plików z 8 dodań i 3 usunięć

Wyświetl plik

@ -725,10 +725,16 @@ class Broker:
:param action: What is being done with the topic? subscribe or publish
:return:
"""
topic_result = True
topic_plugins = None
topic_config = self.config.get("topic-check", None)
if topic_config and topic_config.get("enabled", False):
topic_plugins = topic_config.get("plugins", None)
# if enabled is not specified, all plugins will be used for topic filtering (backward compatibility)
if topic_config and "enabled" in topic_config:
if topic_config.get("enabled", False):
topic_plugins = topic_config.get("plugins", None)
else:
return topic_result
returns = await self.plugins_manager.map_plugin_coro(
"topic_filtering",
session=session,
@ -736,7 +742,6 @@ class Broker:
action=action,
filter_plugins=topic_plugins,
)
topic_result = True
if returns:
for plugin in returns:
res = returns[plugin]