Skip to content
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

Don't print MQTT credentials to log #37364

Merged
merged 2 commits into from
Jul 3, 2020
Merged

Don't print MQTT credentials to log #37364

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d16744
Don't print MQTT credentials to log
emontnemery Jul 2, 2020
4c9985b
Improve info message
emontnemery Jul 3, 2020
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
9 changes: 5 additions & 4 deletions homeassistant/components/mqtt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,13 +476,14 @@ async def async_setup_entry(hass, entry):
if conf is None:
conf = CONFIG_SCHEMA({DOMAIN: dict(entry.data)})[DOMAIN]
elif any(key in conf for key in entry.data):
tmp_data = dict(entry.data)
tmp_data.pop(CONF_PASSWORD, None)
tmp_data.pop(CONF_USERNAME, None)
shared_keys = conf.keys() & entry.data.keys()
Copy link
Member

Choose a reason for hiding this comment

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

I didn't know this was a thing. Nice.

override = {k: entry.data[k] for k in shared_keys}
if CONF_PASSWORD in override:
override[CONF_PASSWORD] = "********"
_LOGGER.info(
"Data in your configuration entry is going to override your "
"configuration.yaml: %s",
tmp_data,
override,
)

conf = _merge_config(entry, conf)
Expand Down