jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate mobile_app to use json helper (#100136)

Browse Source
This commit is contained in:
J. Nick Koston 2023-09-11 12:08:48 -05:00 committed by GitHub
parent 17db20fdd7
commit fdb9ac20c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/mobile_app/helpers.py
View File

@ -3,7 +3,6 @@ from __future__ import annotations
from collections.abc import Callable, Mapping from collections.abc import Callable, Mapping
from http import HTTPStatus from http import HTTPStatus
import json
import logging import logging
from typing import Any from typing import Any
@ -14,7 +13,7 @@ from nacl.secret import SecretBox
from homeassistant.const import ATTR_DEVICE_ID, CONTENT_TYPE_JSON from homeassistant.const import ATTR_DEVICE_ID, CONTENT_TYPE_JSON
from homeassistant.core import Context, HomeAssistant from homeassistant.core import Context, HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.json import JSONEncoder from homeassistant.helpers.json import json_bytes
from homeassistant.util.json import JsonValueType, json_loads from homeassistant.util.json import JsonValueType, json_loads
from .const import ( from .const import (
@ -182,7 +181,7 @@ def webhook_response(
headers: Mapping[str, str] | None = None, headers: Mapping[str, str] | None = None,
) -> Response: ) -> Response:
"""Return a encrypted response if registration supports it.""" """Return a encrypted response if registration supports it."""
data = json.dumps(data, cls=JSONEncoder) json_data = json_bytes(data)
if registration[ATTR_SUPPORTS_ENCRYPTION]: if registration[ATTR_SUPPORTS_ENCRYPTION]:
keylen, encrypt = setup_encrypt( keylen, encrypt = setup_encrypt(
@ -190,17 +189,17 @@ def webhook_response(
) )
if ATTR_NO_LEGACY_ENCRYPTION in registration: if ATTR_NO_LEGACY_ENCRYPTION in registration:
key = registration[CONF_SECRET] key: bytes = registration[CONF_SECRET]
else: else:
key = registration[CONF_SECRET].encode("utf-8") key = registration[CONF_SECRET].encode("utf-8")
key = key[:keylen] key = key[:keylen]
key = key.ljust(keylen, b"\0") key = key.ljust(keylen, b"\0")
enc_data = encrypt(data.encode("utf-8"), key).decode("utf-8") enc_data = encrypt(json_data, key).decode("utf-8")
data = json.dumps({"encrypted": True, "encrypted_data": enc_data}) json_data = json_bytes({"encrypted": True, "encrypted_data": enc_data})
return Response( return Response(
text=data, status=status, content_type=CONTENT_TYPE_JSON, headers=headers body=json_data, status=status, content_type=CONTENT_TYPE_JSON, headers=headers
) )