add missing id

Co-authored-by: Franck Nijhof <git@frenck.dev>

.devcontainer/Dockerfile

@@ -1,5 +1,9 @@
 FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.8
 
+ENV DEBIAN_FRONTEND=noninteractive
+
+SHELL ["/bin/bash", "-c"]
+
 WORKDIR /workspaces
 
 # Set Docker daemon config
@@ -8,12 +12,13 @@ RUN \
     && echo '{"storage-driver": "vfs"}' > /etc/docker/daemon.json
 
 # Install Node/Yarn for Frontent
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && apt-get update \
+    && apt-get update && apt-get install -y --no-install-recommends \
         curl \
         git \
         apt-utils \
         apt-transport-https \
-    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
     && apt-get update && apt-get install -y --no-install-recommends \
         nodejs \
@@ -44,6 +49,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         dbus \
         network-manager \
         libpulse0 \
+    && bash <(curl https://getvcn.codenotary.com -L) \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Python dependencies from requirements.txt if it exists

.github/PULL_REQUEST_TEMPLATE.md

@@ -37,6 +37,7 @@
 - This PR fixes or closes issue: fixes #
 - This PR is related to issue:
 - Link to documentation pull request:
+- Link to cli pull request:
 
 ## Checklist
 

.github/workflows/builder.yml

@@ -114,19 +114,56 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        if: needs.init.outputs.publish == 'true'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GIT_USER }}
+          password: ${{ secrets.GIT_TOKEN }}
+
       - name: Set build arguments
         if: needs.init.outputs.publish == 'false'
         run: echo "BUILD_ARGS=--test" >> $GITHUB_ENV
 
       - name: Build supervisor
-        uses: home-assistant/builder@2021.02.0
+        uses: home-assistant/builder@2021.04.0
         with:
           args: |
             $BUILD_ARGS \
             --${{ matrix.arch }} \
             --target /data \
+            --with-codenotary "${{ secrets.VCN_USER }}" "${{ secrets.VCN_PASSWORD }}" "${{ secrets.VCN_ORG }}" \
+            --validate-from "${{ secrets.VCN_ORG }}" \
+            --validate-cache "${{ secrets.VCN_ORG }}" \
             --generic ${{ needs.init.outputs.version }}
 
+  codenotary:
+    name: CodeNotary signature
+    needs: init
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        if: needs.init.outputs.publish == 'true'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set version
+        if: needs.init.outputs.publish == 'true'
+        uses: home-assistant/actions/helpers/version@master
+        with:
+          type: ${{ env.BUILD_TYPE }}
+
+      - name: Signing image
+        if: needs.init.outputs.publish == 'true'
+        uses: home-assistant/actions/helpers/codenotary@master
+        with:
+          source: dir://${{ github.workspace }}
+          user: ${{ secrets.VCN_USER }}
+          password: ${{ secrets.VCN_PASSWORD }}
+          organisation: ${{ secrets.VCN_ORG }}
+
   version:
     name: Update version
     needs: ["init", "run_supervisor"]
@@ -155,13 +192,13 @@ jobs:
   run_supervisor:
     runs-on: ubuntu-latest
     name: Run the Supervisor
-    needs: ["build"]
+    needs: ["build", "codenotary"]
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
 
       - name: Build the Supervisor
-        uses: home-assistant/builder@2021.02.0
+        uses: home-assistant/builder@2021.04.0
         with:
           args: |
             --test \

.github/workflows/ci.yaml

@@ -25,12 +25,12 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -47,7 +47,7 @@ jobs:
           pip install -r requirements.txt -r requirements_tests.txt
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -68,13 +68,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -112,13 +112,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -130,7 +130,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -156,13 +156,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -188,13 +188,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -206,7 +206,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -229,13 +229,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -247,7 +247,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -273,13 +273,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -305,13 +305,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -323,7 +323,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -349,13 +349,17 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install CodeNotary
+        shell: bash
+        run: |
+          bash <(curl https://getvcn.codenotary.com -L)
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -390,7 +394,7 @@ jobs:
             -o console_output_style=count \
             tests
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v2.2.3
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
@@ -403,13 +407,13 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: venv
           key: |
@@ -428,4 +432,4 @@ jobs:
           coverage report
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.2.1
+        uses: codecov/codecov-action@v1.3.2

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3.0.17
+      - uses: actions/stale@v3.0.18
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 60

.hadolint.yaml

@@ -1,5 +1,6 @@
 ignored:
-  - DL3018
+  - DL3003
   - DL3006
   - DL3013
+  - DL3018
   - SC2155

.vcnignore

@@ -0,0 +1,21 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# Distribution / packaging
+*.egg-info/
+
+# General files
+.git
+.github
+.devcontainer
+.vscode
+.tox
+
+# Data
+home-assistant-polymer/
+script/
+tests/
+data/
+venv/

Dockerfile

@@ -1,13 +1,18 @@
 ARG BUILD_FROM
-FROM $BUILD_FROM
+FROM ${BUILD_FROM}
 
 ENV \
     S6_SERVICES_GRACETIME=10000 \
     SUPERVISOR_API=http://localhost
 
+ARG BUILD_ARCH
+ARG VCN_VERSION
+WORKDIR /usr/src
+
 # Install base
 RUN \
-    apk add --no-cache \
+    set -x \
+    && apk add --no-cache \
         eudev \
         eudev-libs \
         git \
@@ -15,10 +20,37 @@ RUN \
         libffi \
         libpulse \
         musl \
-        openssl
-
-ARG BUILD_ARCH
-WORKDIR /usr/src
+        openssl \
+    && apk add --no-cache --virtual .build-dependencies \
+        build-base \
+        go \
+    \
+    && git clone -b v${VCN_VERSION} --depth 1 \
+        https://github.com/codenotary/vcn \
+    && cd vcn \
+    \
+    # Fix: https://github.com/codenotary/vcn/issues/131
+    && go get github.com/codenotary/immudb@4cf9e2ae06ac2e6ec98a60364c3de3eab5524757 \
+    \
+    && if [ "${BUILD_ARCH}" = "armhf" ]; then \
+        GOARM=6 GOARCH=arm go build -o vcn -ldflags="-s -w" ./cmd/vcn; \
+    elif [ "${BUILD_ARCH}" = "armv7" ]; then \
+        GOARM=7 GOARCH=arm go build -o vcn -ldflags="-s -w" ./cmd/vcn; \
+    elif [ "${BUILD_ARCH}" = "aarch64" ]; then \
+        GOARCH=arm64 go build -o vcn -ldflags="-s -w" ./cmd/vcn; \
+    elif [ "${BUILD_ARCH}" = "i386" ]; then \
+        GOARCH=386 go build -o vcn -ldflags="-s -w" ./cmd/vcn; \
+    elif [ "${BUILD_ARCH}" = "amd64" ]; then \
+        GOARCH=amd64 go build -o vcn -ldflags="-s -w" ./cmd/vcn; \
+    else \
+        exit 1; \
+    fi \
+    \
+    && rm -rf /root/go /root/.cache \
+    && mv vcn /usr/bin/vcn \
+    \
+    && apk del .build-dependencies \
+    && rm -rf /usr/src/vcn
 
 # Install requirements
 COPY requirements.txt .

build.json

@@ -1,13 +1,18 @@
 {
   "image": "homeassistant/{arch}-hassio-supervisor",
+  "shadow_repository": "ghcr.io/home-assistant",
   "build_from": {
-    "aarch64": "homeassistant/aarch64-base-python:3.8-alpine3.13",
-    "armhf": "homeassistant/armhf-base-python:3.8-alpine3.13",
-    "armv7": "homeassistant/armv7-base-python:3.8-alpine3.13",
-    "amd64": "homeassistant/amd64-base-python:3.8-alpine3.13",
-    "i386": "homeassistant/i386-base-python:3.8-alpine3.13"
+    "aarch64": "ghcr.io/home-assistant/aarch64-base-python:3.8-alpine3.13",
+    "armhf": "ghcr.io/home-assistant/armhf-base-python:3.8-alpine3.13",
+    "armv7": "ghcr.io/home-assistant/armv7-base-python:3.8-alpine3.13",
+    "amd64": "ghcr.io/home-assistant/amd64-base-python:3.8-alpine3.13",
+    "i386": "ghcr.io/home-assistant/i386-base-python:3.8-alpine3.13"
+  },
+  "args": {
+    "VCN_VERSION": "0.9.4"
   },
   "labels": {
-    "io.hass.type": "supervisor"
+    "io.hass.type": "supervisor",
+    "org.opencontainers.image.source": "https://github.com/home-assistant/supervisor"
   }
 }

requirements.txt

@@ -1,20 +1,20 @@
-aiohttp==3.7.4
+aiohttp==3.7.4.post0
 async_timeout==3.0.1
 atomicwrites==1.4.0
 attrs==20.3.0
-awesomeversion==21.2.3
+awesomeversion==21.4.0
 brotli==1.0.9
 cchardet==2.1.7
-colorlog==4.7.2
+colorlog==4.8.0
 cpe==1.2.1
 cryptography==3.4.6
 debugpy==1.2.1
-docker==4.4.4
+docker==5.0.0
 gitpython==3.1.14
 jinja2==2.11.3
-pulsectl==21.2.0
+pulsectl==21.3.4
 pytz==2021.1
 pyudev==0.22.0
 ruamel.yaml==0.15.100
-sentry-sdk==0.20.3
+sentry-sdk==1.0.0
 voluptuous==0.12.1

requirements_tests.txt

@@ -1,14 +1,14 @@
 black==20.8b1
 codecov==2.1.11
 coverage==5.5
-flake8-docstrings==1.5.0
-flake8==3.8.4
-pre-commit==2.10.1
-pydocstyle==5.1.1
-pylint==2.7.2
+flake8-docstrings==1.6.0
+flake8==3.9.0
+pre-commit==2.12.0
+pydocstyle==6.0.0
+pylint==2.7.4
 pytest-aiohttp==0.3.0
 pytest-asyncio==0.12.0 # NB!: Versions over 0.12.0 breaks pytest-aiohttp (https://github.com/aio-libs/pytest-aiohttp/issues/16)
 pytest-cov==2.11.1
 pytest-timeout==1.4.2
-pytest==6.2.2
-pyupgrade==2.10.0
+pytest==6.2.3
+pyupgrade==2.12.0

setup.py

@@ -44,7 +44,9 @@ setup(
         "supervisor.jobs",
         "supervisor.misc",
         "supervisor.plugins",
+        "supervisor.resolution.checks",
         "supervisor.resolution.evaluations",
+        "supervisor.resolution.fixups",
         "supervisor.resolution",
         "supervisor.services.modules",
         "supervisor.services",

supervisor/addons/__init__.py

@@ -154,17 +154,16 @@ class AddonManager(CoreSysAttributes):
     async def install(self, slug: str) -> None:
         """Install an add-on."""
         if slug in self.local:
-            _LOGGER.warning("Add-on %s is already installed", slug)
-            return
+            raise AddonsError(f"Add-on {slug} is already installed", _LOGGER.warning)
         store = self.store.get(slug)
 
         if not store:
-            _LOGGER.error("Add-on %s not exists", slug)
-            raise AddonsError()
+            raise AddonsError(f"Add-on {slug} not exists", _LOGGER.error)
 
         if not store.available:
-            _LOGGER.error("Add-on %s not supported on that platform", slug)
-            raise AddonsNotSupportedError()
+            raise AddonsNotSupportedError(
+                f"Add-on {slug} not supported on that platform", _LOGGER.error
+            )
 
         self.data.install(store)
         addon = Addon(self.coresys, slug)
@@ -256,23 +255,23 @@ class AddonManager(CoreSysAttributes):
     async def update(self, slug: str) -> None:
         """Update add-on."""
         if slug not in self.local:
-            _LOGGER.error("Add-on %s is not installed", slug)
-            raise AddonsError()
+            raise AddonsError(f"Add-on {slug} is not installed", _LOGGER.error)
         addon = self.local[slug]
 
         if addon.is_detached:
-            _LOGGER.error("Add-on %s is not available inside store", slug)
-            raise AddonsError()
+            raise AddonsError(
+                f"Add-on {slug} is not available inside store", _LOGGER.error
+            )
         store = self.store[slug]
 
         if addon.version == store.version:
-            _LOGGER.warning("No update available for add-on %s", slug)
-            return
+            raise AddonsError(f"No update available for add-on {slug}", _LOGGER.warning)
 
         # Check if available, Maybe something have changed
         if not store.available:
-            _LOGGER.error("Add-on %s not supported on that platform", slug)
-            raise AddonsNotSupportedError()
+            raise AddonsNotSupportedError(
+                f"Add-on {slug} not supported on that platform", _LOGGER.error
+            )
 
         # Update instance
         last_state: AddonState = addon.state

supervisor/addons/build.py

@@ -14,6 +14,7 @@ from ..const import (
     META_ADDON,
 )
 from ..coresys import CoreSys, CoreSysAttributes
+from ..exceptions import ConfigurationFileError
 from ..utils.common import FileConfiguration, find_one_filetype
 from .validate import SCHEMA_BUILD_CONFIG
 
@@ -29,12 +30,14 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
         self.coresys: CoreSys = coresys
         self.addon = addon
 
-        super().__init__(
-            find_one_filetype(
+        try:
+            build_file = find_one_filetype(
                 self.addon.path_location, "build", FILE_SUFFIX_CONFIGURATION
-            ),
-            SCHEMA_BUILD_CONFIG,
-        )
+            )
+        except ConfigurationFileError:
+            build_file = self.addon.path_location / "build.json"
+
+        super().__init__(build_file, SCHEMA_BUILD_CONFIG)
 
     def save_data(self):
         """Ignore save function."""

supervisor/addons/model.py

@@ -32,6 +32,7 @@ from ..const import (
     ATTR_IMAGE,
     ATTR_INGRESS,
     ATTR_INIT,
+    ATTR_JOURNALD,
     ATTR_KERNEL_MODULES,
     ATTR_LEGACY,
     ATTR_LOCATON,
@@ -550,6 +551,11 @@ class AddonModel(CoreSysAttributes, ABC):
             return None
         return UiOptions(self.coresys)(raw_schema)
 
+    @property
+    def with_journald(self) -> bool:
+        """Return True if the add-on accesses the system journal."""
+        return self.data[ATTR_JOURNALD]
+
     def __eq__(self, other):
         """Compaired add-on objects."""
         if not isinstance(other, AddonModel):

supervisor/addons/options.py

@@ -241,8 +241,15 @@ class AddonOptions(CoreSysAttributes):
         """Check if all options are exists."""
         missing = set(origin) - set(exists)
         for miss_opt in missing:
-            if isinstance(origin[miss_opt], str) and origin[miss_opt].endswith("?"):
+            miss_schema = origin[miss_opt]
+
+            # If its a list then value in list decides if its optional like ["str?"]
+            if isinstance(miss_schema, list) and len(miss_schema) > 0:
+                miss_schema = miss_schema[0]
+
+            if isinstance(miss_schema, str) and miss_schema.endswith("?"):
                 continue
+
             raise vol.Invalid(
                 f"Missing option '{miss_opt}' in {root} in {self._name} ({self._slug})"
             ) from None

supervisor/addons/validate.py

@@ -45,6 +45,7 @@ from ..const import (
     ATTR_INGRESS_PORT,
     ATTR_INGRESS_TOKEN,
     ATTR_INIT,
+    ATTR_JOURNALD,
     ATTR_KERNEL_MODULES,
     ATTR_LEGACY,
     ATTR_LOCATON,
@@ -299,6 +300,7 @@ _SCHEMA_ADDON_CONFIG = vol.Schema(
         vol.Optional(ATTR_TIMEOUT, default=10): vol.All(
             vol.Coerce(int), vol.Range(min=10, max=300)
         ),
+        vol.Optional(ATTR_JOURNALD, default=False): vol.Boolean(),
     },
     extra=vol.REMOVE_EXTRA,
 )
@@ -332,7 +334,10 @@ SCHEMA_TRANSLATION_CONFIGURATION = vol.Schema(
 
 
 SCHEMA_ADDON_TRANSLATIONS = vol.Schema(
-    {vol.Optional(ATTR_CONFIGURATION): {str: SCHEMA_TRANSLATION_CONFIGURATION}},
+    {
+        vol.Optional(ATTR_CONFIGURATION): {str: SCHEMA_TRANSLATION_CONFIGURATION},
+        vol.Optional(ATTR_NETWORK): {str: str},
+    },
     extra=vol.REMOVE_EXTRA,
 )
 

supervisor/api/__init__.py

@@ -228,6 +228,10 @@ class RestAPI(CoreSysAttributes):
         self.webapp.add_routes(
             [
                 web.get("/resolution/info", api_resolution.info),
+                web.post(
+                    "/resolution/check/{check}/options", api_resolution.options_check
+                ),
+                web.post("/resolution/check/{check}/run", api_resolution.run_check),
                 web.post(
                     "/resolution/suggestion/{suggestion}",
                     api_resolution.apply_suggestion,

supervisor/api/addons.py

@@ -103,7 +103,8 @@ from ..const import (
 )
 from ..coresys import CoreSysAttributes
 from ..docker.stats import DockerStats
-from ..exceptions import APIError, APIForbidden
+from ..exceptions import APIError, APIForbidden, PwnedError, PwnedSecret
+from ..utils.pwned import check_pwned_password
 from ..validate import docker_ports
 from .utils import api_process, api_process_raw, api_validate
 
@@ -338,12 +339,30 @@ class APIAddons(CoreSysAttributes):
         """Validate user options for add-on."""
         addon = self._extract_addon_installed(request)
         data = {ATTR_MESSAGE: "", ATTR_VALID: True}
+
+        # Validate config
         try:
             addon.schema(addon.options)
         except vol.Invalid as ex:
             data[ATTR_MESSAGE] = humanize_error(addon.options, ex)
             data[ATTR_VALID] = False
 
+        # Validate security
+        if self.sys_config.force_security:
+            for secret in addon.pwned:
+                try:
+                    await check_pwned_password(self.sys_websession, secret)
+                    continue
+                except PwnedSecret:
+                    data[ATTR_MESSAGE] = "Add-on use pwned secrets!"
+                except PwnedError as err:
+                    data[
+                        ATTR_MESSAGE
+                    ] = f"Error happening on pwned secrets check: {err!s}!"
+
+                data[ATTR_VALID] = False
+                break
+
         return data
 
     @api_process

supervisor/api/discovery.py

@@ -13,7 +13,7 @@ from ..const import (
 from ..coresys import CoreSysAttributes
 from ..discovery.validate import valid_discovery_service
 from ..exceptions import APIError, APIForbidden
-from .utils import api_process, api_validate
+from .utils import api_process, api_validate, require_home_assistant
 
 SCHEMA_DISCOVERY = vol.Schema(
     {
@@ -33,15 +33,10 @@ class APIDiscovery(CoreSysAttributes):
             raise APIError("Discovery message not found")
         return message
 
-    def _check_permission_ha(self, request):
-        """Check permission for API call / Home Assistant."""
-        if request[REQUEST_FROM] != self.sys_homeassistant:
-            raise APIForbidden("Only HomeAssistant can use this API!")
-
     @api_process
+    @require_home_assistant
     async def list(self, request):
         """Show register services."""
-        self._check_permission_ha(request)
 
         # Get available discovery
         discovery = []
@@ -79,13 +74,11 @@ class APIDiscovery(CoreSysAttributes):
         return {ATTR_UUID: message.uuid}
 
     @api_process
+    @require_home_assistant
     async def get_discovery(self, request):
         """Read data into a discovery message."""
         message = self._extract_message(request)
 
-        # HomeAssistant?
-        self._check_permission_ha(request)
-
         return {
             ATTR_ADDON: message.addon,
             ATTR_SERVICE: message.service,

supervisor/api/ingress.py

@@ -25,10 +25,9 @@ from ..const import (
     COOKIE_INGRESS,
     HEADER_TOKEN,
     HEADER_TOKEN_OLD,
-    REQUEST_FROM,
 )
 from ..coresys import CoreSysAttributes
-from .utils import api_process, api_validate
+from .utils import api_process, api_validate, require_home_assistant
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
@@ -50,11 +49,6 @@ class APIIngress(CoreSysAttributes):
 
         return addon
 
-    def _check_ha_access(self, request: web.Request) -> None:
-        if request[REQUEST_FROM] != self.sys_homeassistant:
-            _LOGGER.warning("Ingress is only available behind Home Assistant")
-            raise HTTPUnauthorized()
-
     def _create_url(self, addon: Addon, path: str) -> str:
         """Create URL to container."""
         return f"http://{addon.ip_address}:{addon.ingress_port}/{path}"
@@ -74,18 +68,16 @@ class APIIngress(CoreSysAttributes):
         return {ATTR_PANELS: addons}
 
     @api_process
+    @require_home_assistant
     async def create_session(self, request: web.Request) -> Dict[str, Any]:
         """Create a new session."""
-        self._check_ha_access(request)
-
         session = self.sys_ingress.create_session()
         return {ATTR_SESSION: session}
 
     @api_process
+    @require_home_assistant
     async def validate_session(self, request: web.Request) -> Dict[str, Any]:
         """Validate session and extending how long it's valid for."""
-        self._check_ha_access(request)
-
         data = await api_validate(VALIDATE_SESSION_DATA, request)
 
         # Check Ingress Session
@@ -93,11 +85,11 @@ class APIIngress(CoreSysAttributes):
             _LOGGER.warning("No valid ingress session %s", data[ATTR_SESSION])
             raise HTTPUnauthorized()
 
+    @require_home_assistant
     async def handler(
         self, request: web.Request
     ) -> Union[web.Response, web.StreamResponse, web.WebSocketResponse]:
         """Route data to Supervisor ingress service."""
-        self._check_ha_access(request)
 
         # Check Ingress Session
         session = request.cookies.get(COOKIE_INGRESS)

supervisor/api/jobs.py

@@ -36,6 +36,8 @@ class APIJobs(CoreSysAttributes):
 
         self.sys_jobs.save_data()
 
+        await self.sys_resolution.evaluate.evaluate_system()
+
     @api_process
     async def reset(self, request: web.Request) -> None:
         """Reset options for JobManager."""

supervisor/api/panel/entrypoint.js

@@ -1,9 +1,9 @@
 
 try {
-  new Function("import('/api/hassio/app/frontend_latest/entrypoint.a5b7c2a9.js')")();
+  new Function("import('/api/hassio/app/frontend_latest/entrypoint.4050b348.js')")();
 } catch (err) {
   var el = document.createElement('script');
-  el.src = '/api/hassio/app/frontend_es5/entrypoint.3a11130b.js';
+  el.src = '/api/hassio/app/frontend_es5/entrypoint.bcf8e8ff.js';
   document.body.appendChild(el);
 }
   

supervisor/api/panel/frontend_es5/chunk.114930542eafd429baaa.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.114930542eafd429baaa.js","sources":["webpack://home-assistant-frontend/chunk.114930542eafd429baaa.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.120191275627a8d9d962.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.120191275627a8d9d962.js","sources":["webpack://home-assistant-frontend/chunk.120191275627a8d9d962.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.144785285e77c1827c0e.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.144785285e77c1827c0e.js","sources":["webpack://home-assistant-frontend/chunk.144785285e77c1827c0e.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.1552fa5e505d681ebfad.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.1552fa5e505d681ebfad.js","sources":["webpack://home-assistant-frontend/chunk.1552fa5e505d681ebfad.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.28ab065538efa89db557.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.28ab065538efa89db557.js","sources":["webpack://home-assistant-frontend/chunk.28ab065538efa89db557.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.2e5192dd0552c13e5623.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.2e5192dd0552c13e5623.js","sources":["webpack://home-assistant-frontend/chunk.2e5192dd0552c13e5623.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.3a76f0ea2b0888f970db.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.3a76f0ea2b0888f970db.js","sources":["webpack://home-assistant-frontend/chunk.3a76f0ea2b0888f970db.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.3c156057c501c13568ee.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.3c156057c501c13568ee.js","sources":["webpack://home-assistant-frontend/chunk.3c156057c501c13568ee.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.480c85c27dcb0da9fc2a.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.480c85c27dcb0da9fc2a.js","sources":["webpack://home-assistant-frontend/chunk.480c85c27dcb0da9fc2a.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.4be5dbabe183027348af.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.4be5dbabe183027348af.js","sources":["webpack://home-assistant-frontend/chunk.4be5dbabe183027348af.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.4e6beec37a57a13ae7aa.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.4e6beec37a57a13ae7aa.js","sources":["webpack://home-assistant-frontend/chunk.4e6beec37a57a13ae7aa.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.529fc71790bcecf6b53f.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.529fc71790bcecf6b53f.js","sources":["webpack://home-assistant-frontend/chunk.529fc71790bcecf6b53f.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.555bab815b35ce22d731.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.555bab815b35ce22d731.js","sources":["webpack://home-assistant-frontend/chunk.555bab815b35ce22d731.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.56fb4c97119c34fdf0bc.js

@@ -1,2 +0,0 @@
-(self.webpackChunkhome_assistant_frontend=self.webpackChunkhome_assistant_frontend||[]).push([[914],{92914:function(r,o,a){"use strict";a.r(o),a.d(o,{keymap:function(){return t.$f},EditorView:function(){return t.tk},EditorState:function(){return p.yy},Prec:function(){return p.Wl},tagExtension:function(){return p.kU},defaultKeymap:function(){return l.wQ},lineNumbers:function(){return d.Eu},searchKeymap:function(){return g.Lp},highlightSelectionMatches:function(){return g.sW},history:function(){return u.m8},historyKeymap:function(){return u.f$},langs:function(){return s},tabKeyBindings:function(){return m},theme:function(){return b},highlightStyle:function(){return v}});var e=a(49619),t=a(19753),n=a(11163),c=a(49413),i=a(8987),l=a(86876),p=a(77885),d=a(11254),g=a(72360),u=a(62118),s={jinja2:n.i.define(c.b),yaml:n.i.define(i.r)},m=[{key:"Tab",run:l.at},{key:"Shift-Tab",run:l.xi}],b=t.tk.theme({$:{color:"var(--primary-text-color)",backgroundColor:"var(--code-editor-background-color, var(--card-background-color))","& ::selection":{backgroundColor:"rgba(var(--rgb-primary-color), 0.3)"},height:"var(--code-mirror-height, auto)"},$content:{caretColor:"var(--secondary-text-color)"},$$focused:{outline:"none"},"$$focused $cursor":{borderLeftColor:"#var(--secondary-text-color)"},"$$focused $selectionBackground, $selectionBackground":{backgroundColor:"rgba(var(--rgb-primary-color), 0.3)"},$panels:{backgroundColor:"var(--primary-background-color)",color:"var(--primary-text-color)"},"$panels.top":{borderBottom:"1px solid var(--divider-color)"},"$panels.bottom":{borderTop:"1px solid var(--divider-color)"},"$panel.search":{padding:"2px 6px 4px",position:"relative","& [name=close]":{position:"absolute",top:"0",right:"4px",backgroundColor:"inherit",border:"none",font:"inherit",padding:"4px",margin:0,outline:"none",fontSize:"150%"}},$button:{border:"1px solid var(--primary-color)",padding:"8px",textTransform:"uppercase",margin:"4px",background:"none"},$textfield:{backgroundColor:"var(--secondary-background-color)",padding:"8px"},$selectionMatch:{backgroundColor:"rgba(var(--rgb-primary-color), 0.1)"},$searchMatch:{backgroundColor:"rgba(var(--rgb-accent-color), .2)",outline:"1px solid rgba(var(--rgb-accent-color), .4)"},"$searchMatch.selected":{backgroundColor:"rgba(var(--rgb-accent-color), .4)",outline:"1px solid var(--accent-color)"},$gutters:{backgroundColor:"var(--paper-dialog-background-color, var(--primary-background-color))",color:"var(--paper-dialog-color, var(--secondary-text-color))",border:"none",borderRight:"1px solid var(--paper-input-container-color, var(--secondary-text-color))",paddingRight:"1px"},"$$focused $gutters":{borderRight:"2px solid var(--paper-input-container-focus-color, var(--primary-color))",paddingRight:"0"},"$gutterElementags.lineNumber":{color:"inherit"}}),v=e.Qf.define({tag:e.pJ.keyword,color:"var(--codemirror-keyword, #6262FF)"},{tag:[e.pJ.name,e.pJ.deleted,e.pJ.character,e.pJ.propertyName,e.pJ.macroName],color:"var(--codemirror-property, #905)"},{tag:[e.pJ.function(e.pJ.variableName),e.pJ.labelName],color:"var(--codemirror-variable, #07a)"},{tag:[e.pJ.color,e.pJ.constant(e.pJ.name),e.pJ.standard(e.pJ.name)],color:"var(--codemirror-qualifier, #690)"},{tag:[e.pJ.definition(e.pJ.name),e.pJ.separator],color:"var(--codemirror-def, #8DA6CE)"},{tag:[e.pJ.typeName,e.pJ.className,e.pJ.number,e.pJ.changed,e.pJ.annotation,e.pJ.modifier,e.pJ.self,e.pJ.namespace],color:"var(--codemirror-number, #ca7841)"},{tag:[e.pJ.operator,e.pJ.operatorKeyword,e.pJ.url,e.pJ.escape,e.pJ.regexp,e.pJ.link,e.pJ.special(e.pJ.string)],color:"var(--codemirror-operator, #cda869)"},{tag:e.pJ.comment,color:"var(--codemirror-comment, #777)"},{tag:e.pJ.meta,color:"var(--codemirror-meta, var(--primary-text-color))"},{tag:e.pJ.strong,fontWeight:"bold"},{tag:e.pJ.emphasis,fontStyle:"italic"},{tag:e.pJ.link,color:"var(--primary-color)",textDecoration:"underline"},{tag:e.pJ.heading,fontWeight:"bold"},{tag:e.pJ.atom,color:"var(--codemirror-atom, #F90)"},{tag:e.pJ.bool,color:"var(--codemirror-atom, #F90)"},{tag:e.pJ.special(e.pJ.variableName),color:"var(--codemirror-variable-2, #690)"},{tag:e.pJ.processingInstruction,color:"var(--secondary-text-color)"},{tag:e.pJ.string,color:"var(--codemirror-string, #07a)"},{tag:e.pJ.inserted,color:"var(--codemirror-string2, #07a)"},{tag:e.pJ.invalid,color:"var(--error-color)"})}}]);
-//# sourceMappingURL=chunk.56fb4c97119c34fdf0bc.js.map

supervisor/api/panel/frontend_es5/chunk.56fb4c97119c34fdf0bc.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.56fb4c97119c34fdf0bc.js","sources":["webpack://home-assistant-frontend/chunk.56fb4c97119c34fdf0bc.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.69339833f81fc6a02f8b.js.LICENSE.txt

@@ -0,0 +1,14 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */

supervisor/api/panel/frontend_es5/chunk.69339833f81fc6a02f8b.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.69339833f81fc6a02f8b.js","sources":["webpack://home-assistant-frontend/chunk.69339833f81fc6a02f8b.js"],"mappings":";AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.727437146a6e434a2ec2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.727437146a6e434a2ec2.js","sources":["webpack://home-assistant-frontend/chunk.727437146a6e434a2ec2.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.b729c536fbd35941bc86.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.b729c536fbd35941bc86.js","sources":["webpack://home-assistant-frontend/chunk.b729c536fbd35941bc86.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.d30d63ed3a1b37c81772.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.d30d63ed3a1b37c81772.js","sources":["webpack://home-assistant-frontend/chunk.d30d63ed3a1b37c81772.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.fba36c0c74567a38a911.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.fba36c0c74567a38a911.js","sources":["webpack://home-assistant-frontend/chunk.fba36c0c74567a38a911.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/chunk.fdd4272cf21810fd4c58.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chunk.fdd4272cf21810fd4c58.js","sources":["webpack://home-assistant-frontend/chunk.fdd4272cf21810fd4c58.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/entrypoint.3a11130b.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"entrypoint.3a11130b.js","sources":["webpack://home-assistant-frontend/entrypoint.3a11130b.js"],"mappings":";AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/entrypoint.bcf8e8ff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entrypoint.bcf8e8ff.js","sources":["webpack://home-assistant-frontend/entrypoint.bcf8e8ff.js"],"mappings":";AAAA","sourceRoot":""}

supervisor/api/panel/frontend_es5/manifest.json

@@ -1,3 +1,3 @@
 {
-  "entrypoint.js": "/api/hassio/app/frontend_es5/entrypoint.3a11130b.js"
+  "entrypoint.js": "/api/hassio/app/frontend_es5/entrypoint.bcf8e8ff.js"
 }

supervisor/api/panel/frontend_latest/chunk.0f4111e74a2057900776.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.0f4111e74a2057900776.js","sources":["webpack://home-assistant-frontend/chunk.0f4111e74a2057900776.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_latest/chunk.16eb801fbdda95ad5759.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.16eb801fbdda95ad5759.js","sources":["webpack://home-assistant-frontend/chunk.16eb801fbdda95ad5759.js"],"mappings":"AAAA","sourceRoot":""}

supervisor/api/panel/frontend_latest/chunk.3f24c6c1c6f5b1535478.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chunk.3f24c6c1c6f5b1535478.js","sources":["webpack://home-assistant-frontend/chunk.3f24c6c1c6f5b1535478.js"],"mappings":"AAAA;;;AA6HA;AACA;AACA;;AAEA;;;AAGA;;AAEA;;AAKA;;AAEA;AACA;;;AAGA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;;;AAIA;AACA;;;AAGA;;;AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+FA","sourceRoot":""}