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

Fix Synology Camera SSL certificate option (#4201) [BREAKING CHANGE]

Browse Source 
* Fix Synology SSL config

* Revert "Fix Synology SSL config"

This reverts commit b8dc2a92abee6249b3dd42c99d0786820ebbeb72.

* Revert "Fix Synology SSL config"

This reverts commit 805e87f3af300a1b7627bb5df0792285fcf38901.

* Fix Synology SSL config
This commit is contained in:
jgriff2 2016-11-03 18:41:32 -07:00 committed by Paulus Schoutsen
parent c128919b5f
commit a01939c6e9
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/camera/synology.py
View File

@ -15,7 +15,7 @@ import async_timeout
from homeassistant.const import ( from homeassistant.const import (
CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_NAME, CONF_USERNAME, CONF_PASSWORD,
CONF_URL, CONF_WHITELIST) CONF_URL, CONF_WHITELIST, CONF_VERIFY_SSL)
from homeassistant.components.camera import ( from homeassistant.components.camera import (
Camera, PLATFORM_SCHEMA) Camera, PLATFORM_SCHEMA)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -28,7 +28,6 @@ DEFAULT_STREAM_ID = '0'
TIMEOUT = 5 TIMEOUT = 5
CONF_CAMERA_NAME = 'camera_name' CONF_CAMERA_NAME = 'camera_name'
CONF_STREAM_ID = 'stream_id' CONF_STREAM_ID = 'stream_id'
CONF_VALID_CERT = 'valid_cert'
QUERY_CGI = 'query.cgi' QUERY_CGI = 'query.cgi'
QUERY_API = 'SYNO.API.Info' QUERY_API = 'SYNO.API.Info'
@ -51,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Required(CONF_URL): cv.string, vol.Required(CONF_URL): cv.string,
vol.Optional(CONF_WHITELIST, default=[]): cv.ensure_list, vol.Optional(CONF_WHITELIST, default=[]): cv.ensure_list,
vol.Optional(CONF_VALID_CERT, default=True): cv.boolean, vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
}) })
@ -73,7 +72,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
query_req = yield from hass.websession.get( query_req = yield from hass.websession.get(
syno_api_url, syno_api_url,
params=query_payload, params=query_payload,
verify=config.get(CONF_VALID_CERT) verify_ssl=config.get(CONF_VERIFY_SSL)
) )
except asyncio.TimeoutError: except asyncio.TimeoutError:
_LOGGER.error("Timeout on %s", syno_api_url) _LOGGER.error("Timeout on %s", syno_api_url)
@ -97,7 +96,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
config.get(CONF_USERNAME), config.get(CONF_USERNAME),
config.get(CONF_PASSWORD), config.get(CONF_PASSWORD),
syno_auth_url, syno_auth_url,
config.get(CONF_VALID_CERT) config.get(CONF_VERIFY_SSL)
) )
# Use SessionID to get cameras in system # Use SessionID to get cameras in system
@ -114,7 +113,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
camera_req = yield from hass.websession.get( camera_req = yield from hass.websession.get(
syno_camera_url, syno_camera_url,
params=camera_payload, params=camera_payload,
verify_ssl=config.get(CONF_VALID_CERT), verify_ssl=config.get(CONF_VERIFY_SSL),
cookies={'id': session_id} cookies={'id': session_id}
) )
except asyncio.TimeoutError: except asyncio.TimeoutError:
@ -193,7 +192,7 @@ class SynologyCamera(Camera):
self._login_url = config.get(CONF_URL) + '/webapi/' + 'auth.cgi' self._login_url = config.get(CONF_URL) + '/webapi/' + 'auth.cgi'
self._camera_name = config.get(CONF_CAMERA_NAME) self._camera_name = config.get(CONF_CAMERA_NAME)
self._stream_id = config.get(CONF_STREAM_ID) self._stream_id = config.get(CONF_STREAM_ID)
self._valid_cert = config.get(CONF_VALID_CERT) self._valid_cert = config.get(CONF_VERIFY_SSL)
self._camera_id = camera_id self._camera_id = camera_id
self._snapshot_path = snapshot_path self._snapshot_path = snapshot_path
self._streaming_path = streaming_path self._streaming_path = streaming_path