github/ha-core
1
Fork 0
mirror of https://github.com/home-assistant/core synced 2024-08-31 05:57:13 +02:00
Code Releases Activity

Encode ONVIF username password in URL (#49512)

Browse Source 
* onvif: encode username password in url

Signed-off-by: Xuefer <xuefer@gmail.com>

* onvif: use yarl to set username password for steam url

Signed-off-by: Xuefer <xuefer@gmail.com>
This commit is contained in:
Xuefer 2021-04-23 16:43:02 +08:00 committed by GitHub
parent d168749a51
commit 7579a321df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/onvif/camera.py
View File

@ -5,6 +5,7 @@ from haffmpeg.camera import CameraMjpeg
from haffmpeg.tools import IMAGE_JPEG, ImageFrame
from onvif.exceptions import ONVIFError
import voluptuous as vol
from yarl import URL
from homeassistant.components.camera import SUPPORT_STREAM, Camera
from homeassistant.components.ffmpeg import CONF_EXTRA_ARGUMENTS, DATA_FFMPEG
@ -175,9 +176,10 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
async def async_added_to_hass(self):
"""Run when entity about to be added to hass."""
uri_no_auth = await self.device.async_get_stream_uri(self.profile)
self._stream_uri = uri_no_auth.replace(
"rtsp://", f"rtsp://{self.device.username}:{self.device.password}@", 1
)
url = URL(uri_no_auth)
url = url.with_user(self.device.username)
url = url.with_password(self.device.password)
self._stream_uri = str(url)
async def async_perform_ptz(
self,