Skip to content

Guard bad entity ID in entity registry #35271

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 2 commits into from
May 5, 2020
Merged

Guard bad entity ID in entity registry #35271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7c35d4
Guard bad entity ID in entity registry
balloob May 5, 2020
e7ae7b9
Update homeassistant/helpers/entity_registry.py
balloob May 5, 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
6 changes: 6 additions & 0 deletions homeassistant/helpers/entity_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,12 @@ async def async_load(self) -> None:

if data is not None:
for entity in data["entities"]:
# Some old installations can have some bad entities.
# Filter htem out as they cause errors down the line.
Comment thread
balloob marked this conversation as resolved.
Outdated
# Can be removed in Jan 2021
if not valid_entity_id(entity["entity_id"]):
continue

entities[entity["entity_id"]] = RegistryEntry(
entity_id=entity["entity_id"],
config_entry_id=entity.get("config_entry_id"),
Expand Down
8 changes: 8 additions & 0 deletions tests/helpers/test_entity_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,20 @@ async def test_loading_extra_values(hass, hass_storage):
"unique_id": "disabled-hass",
"disabled_by": "hass",
},
{
"entity_id": "test.invalid__entity",
"platform": "super_platform",
"unique_id": "invalid-hass",
"disabled_by": "hass",
},
]
},
}

registry = await entity_registry.async_get_registry(hass)

assert len(registry.entities) == 4

entry_with_name = registry.async_get_or_create(
"test", "super_platform", "with-name"
)
Expand Down