From fe4d971427bee22cd8fd74a098b5cfc63e4e231b Mon Sep 17 00:00:00 2001 From: Josh Wright Date: Tue, 31 May 2016 17:00:12 -0400 Subject: [PATCH] Re-add config validation for the http component (#2186) This commit adds back the config validation for the http component. It was removed during the WSGI shuffle. This is just a direct copy of what @robbiet480 added in ab294d12f7 (with some testing to verify it still works). --- homeassistant/components/http.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/homeassistant/components/http.py b/homeassistant/components/http.py index ae7fa238069..a537ec74528 100644 --- a/homeassistant/components/http.py +++ b/homeassistant/components/http.py @@ -5,6 +5,7 @@ import logging import mimetypes import threading import re +import voluptuous as vol import homeassistant.core as ha import homeassistant.remote as rem @@ -13,6 +14,7 @@ from homeassistant.const import ( SERVER_PORT, HTTP_HEADER_HA_AUTH, HTTP_HEADER_CACHE_CONTROL) from homeassistant.helpers.entity import split_entity_id import homeassistant.util.dt as dt_util +import homeassistant.helpers.config_validation as cv DOMAIN = "http" REQUIREMENTS = ("eventlet==0.19.0", "static3==0.7.0", "Werkzeug==0.11.5",) @@ -30,6 +32,18 @@ _FINGERPRINT = re.compile(r'^(.+)-[a-z0-9]{32}\.(\w+)$', re.IGNORECASE) _LOGGER = logging.getLogger(__name__) +CONFIG_SCHEMA = vol.Schema({ + DOMAIN: vol.Schema({ + vol.Optional(CONF_API_PASSWORD): cv.string, + vol.Optional(CONF_SERVER_HOST): cv.string, + vol.Optional(CONF_SERVER_PORT, default=SERVER_PORT): + vol.All(vol.Coerce(int), vol.Range(min=1, max=65535)), + vol.Optional(CONF_DEVELOPMENT): cv.string, + vol.Optional(CONF_SSL_CERTIFICATE): cv.isfile, + vol.Optional(CONF_SSL_KEY): cv.isfile, + }), +}, extra=vol.ALLOW_EXTRA) + class HideSensitiveFilter(logging.Filter): """Filter API password calls."""