Skip to content

Fixed mqtt subscription filter on sys $ topics #8166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 6 commits into from
Jun 27, 2017
Merged

Fixed mqtt subscription filter on sys $ topics #8166

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2369a6
Fixed mqtt subscription filter on sys $ topics
Jun 23, 2017
e30ed49
fixed linting issue
Jun 23, 2017
04ea9f4
added unit tests for $ topics and changed fix to use re.escape
Jun 27, 2017
3eb7faa
merge upstream/dev mqtt unit tests
Jun 27, 2017
491cdba
Update test_init.py
balloob Jun 27, 2017
ee9ce51
Merge branch 'dev' into fix-mqtt-sys-topic
balloob Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions homeassistant/components/mqtt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,8 @@ def _match_topic(subscription, topic):
if subscription.endswith('#'):
subscription = subscription[:-2]
suffix = "(.*)"
if subscription.startswith('$'):

@balloob balloob Jun 24, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that this is the correct solution. Instead, we should call re.escape() on each part of the topic that's not +.

subscription = "\\" + subscription
sub_parts = subscription.split('/')
for sub_part in sub_parts:
if sub_part == "+":
Expand Down