Skip to content

Protect mutable allowed_context_keys attribute in Selector classes #181449

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
MartinHjelmare merged 5 commits into from
Sep 7, 2026
Merged

Protect mutable allowed_context_keys attribute in Selector classes #181449

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
559c501
Protect mutable allowed_context_keys attribute in Selector classes
jbouwh Sep 6, 2026
8029a32
Set attrbiutes after initializing super
jbouwh Sep 6, 2026
a2c4406
Add unit test
jbouwh Sep 6, 2026
76471e0
Rename test to reflect instance isolation
jbouwh Sep 6, 2026
1315b81
Remove decorator as suggested
jbouwh Sep 6, 2026
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
38 changes: 18 additions & 20 deletions homeassistant/helpers/selector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ class Selector[_T: Mapping[str, Any]]:
# context for filtering for example. The selector defines
# which context keys it supports and what selector types
# are allowed for each key.
allowed_context_keys: dict[str, set[str]] = {}
allowed_context_keys: dict[str, set[str]]

def __init__(self, config: Mapping[str, Any] | None = None) -> None:
"""Instantiate a selector."""
self.config = self.CONFIG_SCHEMA(config)
self.allowed_context_keys = {}
Comment thread
jbouwh marked this conversation as resolved.

@override
def __eq__(self, other: object) -> bool:
Expand Down Expand Up @@ -427,11 +428,6 @@ class AttributeSelector(Selector[AttributeSelectorConfig]):

selector_type = "attribute"

allowed_context_keys = {
# Filters the available attributes based on the selected entity
"filter_entity": {"entity"}
}

CONFIG_SCHEMA = make_selector_config_schema(
{
vol.Required("entity_id"): cv.entity_id,
Expand All @@ -444,6 +440,10 @@ class AttributeSelector(Selector[AttributeSelectorConfig]):
def __init__(self, config: AttributeSelectorConfig) -> None:
"""Instantiate a selector."""
super().__init__(config)
self.allowed_context_keys = {
# Filters the available attributes based on the selected entity
"filter_entity": {"entity"}
}

def __call__(self, data: Any) -> str:
"""Validate the passed selection."""
Expand Down Expand Up @@ -1354,11 +1354,6 @@ class MediaSelector(Selector[MediaSelectorConfig]):

selector_type = "media"

allowed_context_keys = {
# Filters the available media based on the selected entity
"filter_entity": {EntitySelector.selector_type}
}

CONFIG_SCHEMA = make_selector_config_schema(
{
vol.Optional("accept"): [str],
Expand All @@ -1381,6 +1376,10 @@ class MediaSelector(Selector[MediaSelectorConfig]):
def __init__(self, config: MediaSelectorConfig | None = None) -> None:
"""Instantiate a selector."""
super().__init__(config)
self.allowed_context_keys = {
# Filters the available media based on the selected entity
"filter_entity": {EntitySelector.selector_type}
}

def __call__(self, data: Any) -> dict[str, Any] | list[dict[str, Any]]:
"""Validate the passed selection."""
Expand Down Expand Up @@ -2035,15 +2034,6 @@ class StateSelector(Selector[StateSelectorConfig]):

selector_type = "state"

allowed_context_keys = {
# Filters the available states based on the selected entity
"filter_entity": {EntitySelector.selector_type},
# Filters the available states based on the selected target
"filter_target": {"target"},
# Only show the attribute values of a specific attribute
"filter_attribute": {AttributeSelector.selector_type},
}

CONFIG_SCHEMA = make_selector_config_schema(
{
vol.Optional("entity_id"): cv.entity_id,
Expand All @@ -2056,6 +2046,14 @@ class StateSelector(Selector[StateSelectorConfig]):
def __init__(self, config: StateSelectorConfig) -> None:
"""Instantiate a selector."""
super().__init__(config)
self.allowed_context_keys = {
# Filters the available states based on the selected entity
"filter_entity": {EntitySelector.selector_type},
# Filters the available states based on the selected target
"filter_target": {"target"},
# Only show the attribute values of a specific attribute
"filter_attribute": {AttributeSelector.selector_type},
}

def __call__(self, data: Any) -> str | list[str]:
"""Validate the passed selection."""
Expand Down
Loading