jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-26 10:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unknown options from input (#213)

Browse Source 
* Update validate.py

* Update validate.py

* Cleanup unneeded code
This commit is contained in:
Pascal Vizeli 2017-10-09 10:09:43 +02:00 committed by GitHub
parent 361969aca2
commit 38f96d7ddd
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
hassio/addons/validate.py
View File

@ -1,4 +1,5 @@
"""Validate addons options schema.""" """Validate addons options schema."""
import logging
import re import re
import voluptuous as vol import voluptuous as vol
@ -17,6 +18,8 @@ from ..const import (
ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN) ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN)
from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_CHANNEL from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_CHANNEL
_LOGGER = logging.getLogger(__name__)
RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$") RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$")
@ -176,8 +179,10 @@ def validate_options(raw_schema):
# read options # read options
for key, value in struct.items(): for key, value in struct.items():
# Ignore unknown options / remove from list
if key not in raw_schema: if key not in raw_schema:
raise vol.Invalid("Unknown options {}.".format(key)) _LOGGER.warning("Unknown options %s", key)
continue
typ = raw_schema[key] typ = raw_schema[key]
try: try:
@ -202,42 +207,38 @@ def validate_options(raw_schema):
# pylint: disable=no-value-for-parameter # pylint: disable=no-value-for-parameter
def _single_validate(typ, value, key): def _single_validate(typ, value, key):
"""Validate a single element.""" """Validate a single element."""
try: # if required argument
# if required argument if value is None:
if value is None: raise vol.Invalid("Missing required option '{}'.".format(key))
raise vol.Invalid("Missing required option '{}'.".format(key))
# parse extend data from type # parse extend data from type
match = RE_SCHEMA_ELEMENT.match(typ) match = RE_SCHEMA_ELEMENT.match(typ)
# prepare range # prepare range
range_args = {} range_args = {}
for group_name in ('i_min', 'i_max', 'f_min', 'f_max'): for group_name in ('i_min', 'i_max', 'f_min', 'f_max'):
group_value = match.group(group_name) group_value = match.group(group_name)
if group_value: if group_value:
range_args[group_name[2:]] = float(group_value) range_args[group_name[2:]] = float(group_value)
if typ.startswith(V_STR): if typ.startswith(V_STR):
return str(value) return str(value)
elif typ.startswith(V_INT): elif typ.startswith(V_INT):
return vol.All(vol.Coerce(int), vol.Range(**range_args))(value) return vol.All(vol.Coerce(int), vol.Range(**range_args))(value)
elif typ.startswith(V_FLOAT): elif typ.startswith(V_FLOAT):
return vol.All(vol.Coerce(float), vol.Range(**range_args))(value) return vol.All(vol.Coerce(float), vol.Range(**range_args))(value)
elif typ.startswith(V_BOOL): elif typ.startswith(V_BOOL):
return vol.Boolean()(value) return vol.Boolean()(value)
elif typ.startswith(V_EMAIL): elif typ.startswith(V_EMAIL):
return vol.Email()(value) return vol.Email()(value)
elif typ.startswith(V_URL): elif typ.startswith(V_URL):
return vol.Url()(value) return vol.Url()(value)
elif typ.startswith(V_PORT): elif typ.startswith(V_PORT):
return NETWORK_PORT(value) return NETWORK_PORT(value)
elif typ.startswith(V_MATCH): elif typ.startswith(V_MATCH):
return vol.Match(match.group('match'))(str(value)) return vol.Match(match.group('match'))(str(value))
raise vol.Invalid("Fatal error for {} type {}".format(key, typ)) raise vol.Invalid("Fatal error for {} type {}".format(key, typ))
except ValueError:
raise vol.Invalid(
"Type {} error for '{}' on {}.".format(typ, value, key)) from None
def _nested_validate_list(typ, data_list, key): def _nested_validate_list(typ, data_list, key):
@ -249,9 +250,10 @@ def _nested_validate_list(typ, data_list, key):
if isinstance(typ, dict): if isinstance(typ, dict):
c_options = {} c_options = {}
for c_key, c_value in element.items(): for c_key, c_value in element.items():
# Ignore unknown options / remove from list
if c_key not in typ: if c_key not in typ:
raise vol.Invalid( _LOGGER.warning("Unknown options %s", c_key)
"Unknown nested options {}".format(c_key)) continue
c_options[c_key] = _single_validate(typ[c_key], c_value, c_key) c_options[c_key] = _single_validate(typ[c_key], c_value, c_key)
options.append(c_options) options.append(c_options)
@ -267,8 +269,10 @@ def _nested_validate_dict(typ, data_dict, key):
options = {} options = {}
for c_key, c_value in data_dict.items(): for c_key, c_value in data_dict.items():
# Ignore unknown options / remove from list
if c_key not in typ: if c_key not in typ:
raise vol.Invalid("Unknow nested dict options {}".format(c_key)) _LOGGER.warning("Unknown options %s", c_key)
continue
options[c_key] = _single_validate(typ[c_key], c_value, c_key) options[c_key] = _single_validate(typ[c_key], c_value, c_key)