From a7dd7c1a3d591241c38aa432ff786a3d268c1ad4 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Tue, 29 Jun 2021 11:22:58 +0200
Subject: [PATCH] Filter MQTT select JSON attributes (#52288)

---
 homeassistant/components/mqtt/select.py |  8 ++++++++
 tests/components/mqtt/test_select.py    | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/mqtt/select.py b/homeassistant/components/mqtt/select.py
index 310b3e508f1..98643917788 100644
--- a/homeassistant/components/mqtt/select.py
+++ b/homeassistant/components/mqtt/select.py
@@ -33,6 +33,12 @@ CONF_OPTIONS = "options"
 DEFAULT_NAME = "MQTT Select"
 DEFAULT_OPTIMISTIC = False
 
+MQTT_SELECT_ATTRIBUTES_BLOCKED = frozenset(
+    {
+        select.ATTR_OPTIONS,
+    }
+)
+
 
 def validate_config(config):
     """Validate that the configuration is valid, throws if it isn't."""
@@ -81,6 +87,8 @@ async def _async_setup_entity(
 class MqttSelect(MqttEntity, SelectEntity, RestoreEntity):
     """representation of an MQTT select."""
 
+    _attributes_extra_blocked = MQTT_SELECT_ATTRIBUTES_BLOCKED
+
     def __init__(self, hass, config, config_entry, discovery_data):
         """Initialize the MQTT select."""
         self._config = config
diff --git a/tests/components/mqtt/test_select.py b/tests/components/mqtt/test_select.py
index 41fa302a6b9..5dad989a5cf 100644
--- a/tests/components/mqtt/test_select.py
+++ b/tests/components/mqtt/test_select.py
@@ -5,7 +5,10 @@ from unittest.mock import patch
 import pytest
 
 from homeassistant.components import select
-from homeassistant.components.mqtt.select import CONF_OPTIONS
+from homeassistant.components.mqtt.select import (
+    CONF_OPTIONS,
+    MQTT_SELECT_ATTRIBUTES_BLOCKED,
+)
 from homeassistant.components.select import (
     ATTR_OPTION,
     ATTR_OPTIONS,
@@ -35,6 +38,7 @@ from .test_common import (
     help_test_entity_id_update_subscriptions,
     help_test_setting_attribute_via_mqtt_json_message,
     help_test_setting_attribute_with_template,
+    help_test_setting_blocked_attribute_via_mqtt_json_message,
     help_test_unique_id,
     help_test_update_with_json_attrs_bad_JSON,
     help_test_update_with_json_attrs_not_dict,
@@ -230,6 +234,13 @@ async def test_setting_attribute_via_mqtt_json_message(hass, mqtt_mock):
     )
 
 
+async def test_setting_blocked_attribute_via_mqtt_json_message(hass, mqtt_mock):
+    """Test the setting of attribute via MQTT with JSON payload."""
+    await help_test_setting_blocked_attribute_via_mqtt_json_message(
+        hass, mqtt_mock, select.DOMAIN, DEFAULT_CONFIG, MQTT_SELECT_ATTRIBUTES_BLOCKED
+    )
+
+
 async def test_setting_attribute_with_template(hass, mqtt_mock):
     """Test the setting of attribute via MQTT with JSON payload."""
     await help_test_setting_attribute_with_template(