Google Assistant: Track if request is local (#31226)
* Track if request is local * Cancel early if 2FA disabled * Allow disabling 2FA for ack * Do not mark devices with 2FA as reachable * Add request source to GA events
This commit is contained in:
1 parent
03954be12d
commit
8ceef72853
9 files changed
+99
-19
No files matched your search
@@ -143,3 +143,6 @@ CHALLENGE_PIN_NEEDED = "pinNeeded"
|
||||
CHALLENGE_FAILED_PIN_NEEDED = "challengeFailedPinNeeded"
|
||||
|
||||
STORE_AGENT_USER_IDS = "agent_user_ids"
|
||||
|
||||
SOURCE_CLOUD = "cloud"
|
||||
SOURCE_LOCAL = "local"
|
||||
@@ -28,6 +28,7 @@ from .const import (
|
||||
DOMAIN,
|
||||
DOMAIN_TO_GOOGLE_TYPES,
|
||||
ERR_FUNCTION_NOT_SUPPORTED,
|
||||
SOURCE_LOCAL,
|
||||
STORE_AGENT_USER_IDS,
|
||||
)
|
||||
from .error import SmartHomeError
|
||||
@@ -232,7 +233,7 @@ class AbstractConfig(ABC):
|
||||
return json_response(smart_home.turned_off_response(payload))
|
||||
|
||||
result = await smart_home.async_handle_message(
|
||||
self.hass, self, self.local_sdk_user_id, payload
|
||||
self.hass, self, self.local_sdk_user_id, payload, SOURCE_LOCAL
|
||||
)
|
||||
|
||||
if _LOGGER.isEnabledFor(logging.DEBUG):
|
||||
@@ -286,15 +287,22 @@ class RequestData:
|
||||
self,
|
||||
config: AbstractConfig,
|
||||
user_id: str,
|
||||
source: str,
|
||||
request_id: str,
|
||||
devices: Optional[List[dict]],
|
||||
):
|
||||
"""Initialize the request data."""
|
||||
self.config = config
|
||||
self.source = source
|
||||
self.request_id = request_id
|
||||
self.context = Context(user_id=user_id)
|
||||
self.devices = devices
|
||||
|
||||
@property
|
||||
def is_local_request(self):
|
||||
"""Return if this is a local request."""
|
||||
return self.source == SOURCE_LOCAL
|
||||
|
||||
|
||||
def get_google_type(domain, device_class):
|
||||
"""Google type based on domain and device class."""
|
||||
@@ -354,6 +362,9 @@ class GoogleEntity:
|
||||
features = state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
|
||||
device_class = state.attributes.get(ATTR_DEVICE_CLASS)
|
||||
|
||||
if not self.config.should_2fa(state):
|
||||
return False
|
||||
|
||||
return any(
|
||||
trait.might_2fa(domain, features, device_class) for trait in self.traits()
|
||||
)
|
||||
|
||||
@@ -30,6 +30,7 @@ from .const import (
|
||||
HOMEGRAPH_TOKEN_URL,
|
||||
REPORT_STATE_BASE_URL,
|
||||
REQUEST_SYNC_BASE_URL,
|
||||
SOURCE_CLOUD,
|
||||
)
|
||||
from .helpers import AbstractConfig
|
||||
from .smart_home import async_handle_message
|
||||
@@ -238,6 +239,10 @@ class GoogleAssistantView(HomeAssistantView):
|
||||
"""Handle Google Assistant requests."""
|
||||
message: dict = await request.json()
|
||||
result = await async_handle_message(
|
||||
request.app["hass"], self.config, request["hass_user"].id, message
|
||||
request.app["hass"],
|
||||
self.config,
|
||||
request["hass_user"].id,
|
||||
message,
|
||||
SOURCE_CLOUD,
|
||||
)
|
||||
return self.json(result)
|
||||
@@ -21,9 +21,11 @@ HANDLERS = Registry()
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def async_handle_message(hass, config, user_id, message):
|
||||
async def async_handle_message(hass, config, user_id, message, source):
|
||||
"""Handle incoming API messages."""
|
||||
data = RequestData(config, user_id, message["requestId"], message.get("devices"))
|
||||
data = RequestData(
|
||||
config, user_id, source, message["requestId"], message.get("devices")
|
||||
)
|
||||
|
||||
response = await _process(hass, data, message)
|
||||
|
||||
@@ -75,7 +77,9 @@ async def async_devices_sync(hass, data, payload):
|
||||
https://developers.google.com/assistant/smarthome/develop/process-intents#SYNC
|
||||
"""
|
||||
hass.bus.async_fire(
|
||||
EVENT_SYNC_RECEIVED, {"request_id": data.request_id}, context=data.context
|
||||
EVENT_SYNC_RECEIVED,
|
||||
{"request_id": data.request_id, "source": data.source},
|
||||
context=data.context,
|
||||
)
|
||||
|
||||
agent_user_id = data.config.get_agent_user_id(data.context)
|
||||
@@ -108,7 +112,11 @@ async def async_devices_query(hass, data, payload):
|
||||
|
||||
hass.bus.async_fire(
|
||||
EVENT_QUERY_RECEIVED,
|
||||
{"request_id": data.request_id, ATTR_ENTITY_ID: devid},
|
||||
{
|
||||
"request_id": data.request_id,
|
||||
ATTR_ENTITY_ID: devid,
|
||||
"source": data.source,
|
||||
},
|
||||
context=data.context,
|
||||
)
|
||||
|
||||
@@ -142,6 +150,7 @@ async def handle_devices_execute(hass, data, payload):
|
||||
"request_id": data.request_id,
|
||||
ATTR_ENTITY_ID: entity_id,
|
||||
"execution": execution,
|
||||
"source": data.source,
|
||||
},
|
||||
context=data.context,
|
||||
)
|
||||
@@ -234,7 +243,9 @@ async def async_devices_reachable(hass, data: RequestData, payload):
|
||||
"devices": [
|
||||
entity.reachable_device_serialize()
|
||||
for entity in async_get_entities(hass, data.config)
|
||||
if entity.entity_id in google_ids and entity.should_expose()
|
||||
if entity.entity_id in google_ids
|
||||
and entity.should_expose()
|
||||
and not entity.might_2fa()
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -1447,6 +1447,8 @@ def _verify_pin_challenge(data, state, challenge):
|
||||
|
||||
|
||||
def _verify_ack_challenge(data, state, challenge):
|
||||
"""Verify a pin challenge."""
|
||||
"""Verify an ack challenge."""
|
||||
if not data.config.should_2fa(state):
|
||||
return
|
||||
if not challenge or not challenge.get("ack"):
|
||||
raise ChallengeNeeded(CHALLENGE_ACK_NEEDED)
|
||||
Reference in new issue
Block a user