Handle empty entity_id in the recorder filter (#121681)

fixes #111745
This commit is contained in:
J. Nick Koston 2024-07-10 07:53:38 -07:00 committed by GitHub
parent 8b729e3c7d
commit c81d5a1ac2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions

View file

@ -319,9 +319,8 @@ class Recorder(threading.Thread):
if event.event_type in exclude_event_types:
return
if (
entity_filter is None
or (entity_id := event.data.get(ATTR_ENTITY_ID)) is None
if entity_filter is None or not (
entity_id := event.data.get(ATTR_ENTITY_ID)
):
queue_put(event)
return

View file

@ -2700,3 +2700,20 @@ async def test_all_tables_use_default_table_args(hass: HomeAssistant) -> None:
"""Test that all tables use the default table args."""
for table in db_schema.Base.metadata.tables.values():
assert table.kwargs.items() >= db_schema._DEFAULT_TABLE_ARGS.items()
async def test_empty_entity_id(
hass: HomeAssistant,
async_setup_recorder_instance: RecorderInstanceGenerator,
caplog: pytest.LogCaptureFixture,
) -> None:
"""Test the recorder can handle an empty entity_id."""
await async_setup_recorder_instance(
hass,
{
"exclude": {"domains": "hidden_domain"},
},
)
hass.bus.async_fire("hello", {"entity_id": ""})
await async_wait_recording_done(hass)
assert "Invalid entity ID" not in caplog.text