Skip to content

assign user to websocket connection when using legacy_api_password #19797

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
balloob merged 1 commit into from
Jan 9, 2019
Merged

assign user to websocket connection when using legacy_api_password #19797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion homeassistant/components/websocket_api/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from homeassistant.components.http.auth import validate_password
from homeassistant.components.http.ban import process_wrong_login, \
process_success_login
from homeassistant.auth.providers import legacy_api_password

from .connection import ActiveConnection
from .error import Disconnect
Expand Down Expand Up @@ -81,7 +82,8 @@ async def async_handle(self, msg):
elif self._hass.auth.support_legacy and 'api_password' in msg:
self._logger.debug("Received api_password")
if validate_password(self._request, msg['api_password']):
return await self._async_finish_auth(None, None)
user = await legacy_api_password.async_get_user(self._hass)
return await self._async_finish_auth(user, None)

self._send_message(auth_invalid_message(
'Invalid access token or password'))
Expand Down
3 changes: 2 additions & 1 deletion tests/components/websocket_api/test_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ async def test_auth_active_with_password_not_allow(hass, aiohttp_client):
assert auth_msg['type'] == TYPE_AUTH_INVALID


async def test_auth_legacy_support_with_password(hass, aiohttp_client):
async def test_auth_legacy_support_with_password(hass, aiohttp_client,
legacy_auth):
"""Test authenticating with a token."""
assert await async_setup_component(hass, 'websocket_api', {
'http': {
Expand Down