From 22b29a800501bc3959c1035b7664acff82908a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=BDdrale?= Date: Sun, 20 Oct 2019 18:43:44 +0200 Subject: [PATCH] Add option to disable HTTPS verification in Luci component (#27946) * Add option to disable HTTPS verification in Luci component * Update code owners * Update code owners --- CODEOWNERS | 2 +- homeassistant/components/luci/device_tracker.py | 11 ++++++++++- homeassistant/components/luci/manifest.json | 7 +++++-- requirements_all.txt | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 2f228105cbb..30946fb14f2 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -171,7 +171,7 @@ homeassistant/components/liveboxplaytv/* @pschmitt homeassistant/components/logger/* @home-assistant/core homeassistant/components/logi_circle/* @evanjd homeassistant/components/lovelace/* @home-assistant/frontend -homeassistant/components/luci/* @fbradyirl +homeassistant/components/luci/* @fbradyirl @mzdrale homeassistant/components/luftdaten/* @fabaff homeassistant/components/mastodon/* @fabaff homeassistant/components/matrix/* @tinloaf diff --git a/homeassistant/components/luci/device_tracker.py b/homeassistant/components/luci/device_tracker.py index 87a32767cc2..59c3251a437 100644 --- a/homeassistant/components/luci/device_tracker.py +++ b/homeassistant/components/luci/device_tracker.py @@ -8,12 +8,19 @@ from homeassistant.components.device_tracker import ( PLATFORM_SCHEMA, DeviceScanner, ) -from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_SSL, CONF_USERNAME +from homeassistant.const import ( + CONF_HOST, + CONF_PASSWORD, + CONF_SSL, + CONF_USERNAME, + CONF_VERIFY_SSL, +) import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) DEFAULT_SSL = False +DEFAULT_VERIFY_SSL = True PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { @@ -21,6 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_PASSWORD): cv.string, vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean, + vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean, } ) @@ -44,6 +52,7 @@ class LuciDeviceScanner(DeviceScanner): config[CONF_USERNAME], config[CONF_PASSWORD], config[CONF_SSL], + config[CONF_VERIFY_SSL], ) self.last_results = {} diff --git a/homeassistant/components/luci/manifest.json b/homeassistant/components/luci/manifest.json index 646fc1a3cbf..d7cf72ebaf5 100644 --- a/homeassistant/components/luci/manifest.json +++ b/homeassistant/components/luci/manifest.json @@ -3,8 +3,11 @@ "name": "Luci", "documentation": "https://www.home-assistant.io/integrations/luci", "requirements": [ - "openwrt-luci-rpc==1.1.1" + "openwrt-luci-rpc==1.1.2" ], "dependencies": [], - "codeowners": ["@fbradyirl"] + "codeowners": [ + "@fbradyirl", + "@mzdrale" + ] } diff --git a/requirements_all.txt b/requirements_all.txt index c79e36413a9..0b86ae2d7da 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -917,7 +917,7 @@ opensensemap-api==0.1.5 openwebifpy==3.1.1 # homeassistant.components.luci -openwrt-luci-rpc==1.1.1 +openwrt-luci-rpc==1.1.2 # homeassistant.components.oru oru==0.1.9