jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-27 18:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix onvif cameras that use basic auth with no password (#93928)

Browse Source
This commit is contained in:
J. Nick Koston 2023-06-01 12:14:03 -05:00 committed by GitHub
parent 8f485be87e
commit 240372b45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
homeassistant/components/onvif/__init__.py
View File

@ -1,10 +1,11 @@
"""The ONVIF integration.""" """The ONVIF integration."""
import asyncio import asyncio
from contextlib import suppress
from http import HTTPStatus from http import HTTPStatus
import logging import logging
from httpx import RequestError from httpx import RequestError
from onvif.exceptions import ONVIFAuthError, ONVIFError, ONVIFTimeoutError from onvif.exceptions import ONVIFError
from onvif.util import is_auth_error, stringify_onvif_error from onvif.util import is_auth_error, stringify_onvif_error
from zeep.exceptions import Fault, TransportError from zeep.exceptions import Fault, TransportError
@ -120,31 +121,31 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
return await hass.config_entries.async_unload_platforms(entry, device.platforms) return await hass.config_entries.async_unload_platforms(entry, device.platforms)
async def _get_snapshot_auth(device): async def _get_snapshot_auth(device: ONVIFDevice) -> str | None:
"""Determine auth type for snapshots.""" """Determine auth type for snapshots."""
if not device.capabilities.snapshot or not (device.username and device.password): if not device.capabilities.snapshot:
return HTTP_DIGEST_AUTHENTICATION return None
try: for basic_auth in (False, True):
snapshot = await device.device.get_snapshot(device.profiles[0].token) method = HTTP_BASIC_AUTHENTICATION if basic_auth else HTTP_DIGEST_AUTHENTICATION
with suppress(ONVIFError):
if await device.device.get_snapshot(device.profiles[0].token, basic_auth):
return method
if snapshot: return None
return HTTP_DIGEST_AUTHENTICATION
return HTTP_BASIC_AUTHENTICATION
except (ONVIFAuthError, ONVIFTimeoutError):
return HTTP_BASIC_AUTHENTICATION
except ONVIFError:
return HTTP_DIGEST_AUTHENTICATION
async def async_populate_snapshot_auth(hass, device, entry): async def async_populate_snapshot_auth(
hass: HomeAssistant, device: ONVIFDevice, entry: ConfigEntry
) -> None:
"""Check if digest auth for snapshots is possible.""" """Check if digest auth for snapshots is possible."""
auth = await _get_snapshot_auth(device) if auth := await _get_snapshot_auth(device):
new_data = {**entry.data, CONF_SNAPSHOT_AUTH: auth} hass.config_entries.async_update_entry(
hass.config_entries.async_update_entry(entry, data=new_data) entry, data={**entry.data, CONF_SNAPSHOT_AUTH: auth}
)
async def async_populate_options(hass, entry): async def async_populate_options(hass: HomeAssistant, entry: ConfigEntry) -> None:
"""Populate default options for device.""" """Populate default options for device."""
options = { options = {
CONF_EXTRA_ARGUMENTS: DEFAULT_ARGUMENTS, CONF_EXTRA_ARGUMENTS: DEFAULT_ARGUMENTS,