diff --git a/hassio/addons/data.py b/hassio/addons/data.py index ad2d79d3a..197ad7cb8 100644 --- a/hassio/addons/data.py +++ b/hassio/addons/data.py @@ -17,7 +17,7 @@ from ..const import ( ATTR_STARTUP, ATTR_BOOT, ATTR_MAP, ATTR_OPTIONS, ATTR_PORTS, BOOT_AUTO, ATTR_SCHEMA, ATTR_IMAGE, ATTR_REPOSITORY, ATTR_URL, ATTR_ARCH, ATTR_LOCATON, ATTR_DEVICES, ATTR_ENVIRONMENT, ATTR_HOST_NETWORK, - ATTR_TMPFS) + ATTR_TMPFS, ATTR_PRIVILEGED) from ..config import Config from ..tools import read_json_file, write_json_file @@ -313,6 +313,10 @@ class AddonsData(Config): """Return environment of addon.""" return self._system_data[addon].get(ATTR_ENVIRONMENT) + def get_privileged(self, addon): + """Return list of privilege.""" + return self._system_data[addon].get(ATTR_PRIVILEGED) + def get_url(self, addon): """Return url of addon.""" if addon in self._addons_cache: diff --git a/hassio/addons/validate.py b/hassio/addons/validate.py index f5eecb9d2..62a0e824d 100644 --- a/hassio/addons/validate.py +++ b/hassio/addons/validate.py @@ -7,7 +7,7 @@ from ..const import ( STARTUP_BEFORE, STARTUP_INITIALIZE, BOOT_AUTO, BOOT_MANUAL, ATTR_SCHEMA, ATTR_IMAGE, ATTR_URL, ATTR_MAINTAINER, ATTR_ARCH, ATTR_DEVICES, ATTR_ENVIRONMENT, ATTR_HOST_NETWORK, ARCH_ARMHF, ARCH_AARCH64, ARCH_AMD64, - ARCH_I386, ATTR_TMPFS) + ARCH_I386, ATTR_TMPFS, ATTR_PRIVILEGED) MAP_VOLUME = r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$" @@ -25,6 +25,10 @@ ARCH_ALL = [ ARCH_ARMHF, ARCH_AARCH64, ARCH_AMD64, ARCH_I386 ] +PRIVILEGE_ALL = [ + "NET_ADMIN" +] + def check_network(data): """Validate network settings.""" @@ -56,6 +60,7 @@ SCHEMA_ADDON_CONFIG = vol.Schema(vol.All({ vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"), vol.Optional(ATTR_MAP, default=[]): [vol.Match(MAP_VOLUME)], vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)}, + vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGE_ALL)], vol.Required(ATTR_OPTIONS): dict, vol.Required(ATTR_SCHEMA): { vol.Coerce(str): vol.Any(ADDON_ELEMENT, [ diff --git a/hassio/const.py b/hassio/const.py index 5dae70b5f..cc80513fe 100644 --- a/hassio/const.py +++ b/hassio/const.py @@ -80,6 +80,7 @@ ATTR_DEVICES = 'devices' ATTR_ENVIRONMENT = 'environment' ATTR_HOST_NETWORK = 'host_network' ATTR_TMPFS = 'tmpfs' +ATTR_PRIVILEGED = 'privileged' STARTUP_INITIALIZE = 'initialize' STARTUP_BEFORE = 'before' diff --git a/hassio/dock/addon.py b/hassio/dock/addon.py index c998cb51f..fbd8bca02 100644 --- a/hassio/dock/addon.py +++ b/hassio/dock/addon.py @@ -107,6 +107,7 @@ class DockerAddon(DockerBase): network_mode=self.addons_data.get_network_mode(self.addon), ports=self.addons_data.get_ports(self.addon), devices=self.addons_data.get_devices(self.addon), + cap_add=self.addons_data.get_privileged(self.addon), environment=self.environment, volumes=self.volumes, tmpfs=self.tmpfs