Skip to content
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

Mobile App: Require encryption for registrations that support it #21852

Merged
merged 5 commits into from
Mar 13, 2019
Merged

Mobile App: Require encryption for registrations that support it #21852

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2971284
If registration supports encryption then require all payloads receive…
robbiet480 Mar 9, 2019
bab3fe4
Merge branch 'dev' into mobile_app-require-encryption
robbiet480 Mar 13, 2019
21c989a
Merge branch 'dev' into mobile_app-require-encryption
robbiet480 Mar 13, 2019
c45e160
Use error_response if payload isnt encrypted
robbiet480 Mar 13, 2019
caaedb5
Fix encryption check conditional
robbiet480 Mar 13, 2019
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
18 changes: 12 additions & 6 deletions homeassistant/components/mobile_app/webhook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
from homeassistant.helpers.storage import Store
from homeassistant.helpers.typing import HomeAssistantType

from .const import (ATTR_APP_COMPONENT, DATA_DELETED_IDS,
ATTR_DEVICE_NAME, ATTR_EVENT_DATA, ATTR_EVENT_TYPE,
DATA_REGISTRATIONS, ATTR_TEMPLATE, ATTR_TEMPLATE_VARIABLES,
ATTR_WEBHOOK_DATA, ATTR_WEBHOOK_ENCRYPTED,
ATTR_WEBHOOK_ENCRYPTED_DATA, ATTR_WEBHOOK_TYPE,
CONF_SECRET, DOMAIN, WEBHOOK_PAYLOAD_SCHEMA,
from .const import (ATTR_APP_COMPONENT, ATTR_DEVICE_NAME, ATTR_EVENT_DATA,
ATTR_EVENT_TYPE, ATTR_SUPPORTS_ENCRYPTION, ATTR_TEMPLATE,
ATTR_TEMPLATE_VARIABLES, ATTR_WEBHOOK_DATA,
ATTR_WEBHOOK_ENCRYPTED, ATTR_WEBHOOK_ENCRYPTED_DATA,
ATTR_WEBHOOK_TYPE, CONF_SECRET, DATA_DELETED_IDS,
DATA_REGISTRATIONS, DOMAIN, WEBHOOK_PAYLOAD_SCHEMA,
WEBHOOK_SCHEMAS, WEBHOOK_TYPE_CALL_SERVICE,
WEBHOOK_TYPE_FIRE_EVENT, WEBHOOK_TYPE_RENDER_TEMPLATE,
WEBHOOK_TYPE_UPDATE_LOCATION,
Expand Down Expand Up @@ -78,6 +78,12 @@ async def handle_webhook(store: Store, hass: HomeAssistantType,
_LOGGER.warning('Received invalid JSON from mobile_app')
return empty_okay_response(status=HTTP_BAD_REQUEST)

if (req_data.get(ATTR_WEBHOOK_ENCRYPTED, False) is False and
robbiet480 marked this conversation as resolved.
Show resolved Hide resolved
registration[ATTR_SUPPORTS_ENCRYPTION]):
_LOGGER.warning("Refusing to accept unencrypted webhook from %s",
registration[ATTR_DEVICE_NAME])
return empty_okay_response()
robbiet480 marked this conversation as resolved.
Show resolved Hide resolved

try:
req_data = WEBHOOK_PAYLOAD_SCHEMA(req_data)
except vol.Invalid as ex:
Expand Down
13 changes: 13 additions & 0 deletions tests/components/mobile_app/test_webhook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,16 @@ async def test_webhook_handle_decryption(webhook_client): # noqa: F811
decrypted_data = decrypted_data.decode("utf-8")

assert json.loads(decrypted_data) == {'rendered': 'Hello world'}


async def test_webhook_requires_encryption(webhook_client): # noqa: F811
"""Test that encrypted registrations only accept encrypted data."""
resp = await webhook_client.post(
'/api/webhook/mobile_app_test',
json=RENDER_TEMPLATE
)

assert resp.status == 200

webhook_json = await resp.json()
assert webhook_json == {}