Update supervisor/api/__init__.py

.devcontainer/devcontainer.json

@@ -10,7 +10,6 @@
     "visualstudioexptteam.vscodeintellicode",
     "esbenp.prettier-vscode"
   ],
-  "mounts": ["type=volume,target=/var/lib/docker"],
   "settings": {
     "terminal.integrated.profiles.linux": {
       "zsh": {
@@ -26,7 +25,7 @@
     "python.linting.pylintEnabled": true,
     "python.linting.enabled": true,
     "python.formatting.provider": "black",
-    "python.formatting.blackArgs": ["--target-version", "py310"],
+    "python.formatting.blackArgs": ["--target-version", "py39"],
     "python.formatting.blackPath": "/usr/local/bin/black",
     "python.linting.banditPath": "/usr/local/bin/bandit",
     "python.linting.flake8Path": "/usr/local/bin/flake8",

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -20,14 +20,22 @@ body:
     attributes:
       value: |
         ## Environment
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: What is the used version of the Supervisor?
+      placeholder: supervisor-
+      description: >
+        Can be found in the Supervisor panel -> System tab. Starts with
+        `supervisor-....`.
   - type: dropdown
     validations:
       required: true
     attributes:
       label: What type of installation are you running?
       description: >
-        If you don't know, can be found in [Settings -> System -> Repairs -> System Information](https://my.home-assistant.io/redirect/system_health/).
-        It is listed as the `Installation Type` value.
+        If you don't know, you can find it in: Configuration panel -> Info.
       options:
         - Home Assistant OS
         - Home Assistant Supervised
@@ -40,6 +48,22 @@ body:
         - Home Assistant Operating System
         - Debian
         - Other (e.g., Raspbian/Raspberry Pi OS/Fedora)
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: What is the version of your installed operating system?
+      placeholder: "5.11"
+      description: Can be found in the Supervisor panel -> System tab.
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: What version of Home Assistant Core is installed?
+      placeholder: core-
+      description: >
+        Can be found in the Supervisor panel -> System tab. Starts with
+        `core-....`.
   - type: markdown
     attributes:
       value: |
@@ -63,30 +87,8 @@ body:
     attributes:
       label: Anything in the Supervisor logs that might be useful for us?
       description: >
-        Supervisor Logs can be found in [Settings -> System -> Logs](https://my.home-assistant.io/redirect/logs/)
-        then choose `Supervisor` in the top right.
-
-        [![Open your Home Assistant instance and show your Supervisor system logs.](https://my.home-assistant.io/badges/supervisor_logs.svg)](https://my.home-assistant.io/redirect/supervisor_logs/)
+        The Supervisor logs can be found in the Supervisor panel -> System tab.
       render: txt
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: System Health information
-      description: >
-        System Health information can be found in the top right menu in [Settings -> System -> Repairs](https://my.home-assistant.io/redirect/repairs/).
-        Click the copy button at the bottom of the pop-up and paste it here.
-        
-        [![Open your Home Assistant instance and show health information about your system.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
-  - type: textarea
-    attributes:
-      label: Supervisor diagnostics
-      placeholder: "drag-and-drop the diagnostics data file here (do not copy-and-paste the content)"
-      description: >-
-        Supervisor diagnostics can be found in [Settings -> Integrations](https://my.home-assistant.io/redirect/integrations/).
-        Find the card that says `Home Assistant Supervisor`, open its menu and select 'Download diagnostics'.
-        
-        **Please drag-and-drop the downloaded file into the textbox below. Do not copy and paste its contents.**
   - type: textarea
     attributes:
       label: Additional information

.github/release-drafter.yml

@@ -31,7 +31,6 @@ categories:
 
   - title: ":arrow_up: Dependency Updates"
     label: "dependencies"
-    collapse-after: 1
 
 include-labels:
   - "breaking-change"

.github/workflows/builder.yml

@@ -33,13 +33,9 @@ on:
       - setup.py
 
 env:
-  DEFAULT_PYTHON: "3.10"
   BUILD_NAME: supervisor
   BUILD_TYPE: supervisor
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.ref }}'
-  cancel-in-progress: true
+  WHEELS_TAG: 3.9-alpine3.14
 
 jobs:
   init:
@@ -53,7 +49,7 @@ jobs:
       requirements: ${{ steps.requirements.outputs.changed }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: 0
 
@@ -88,29 +84,21 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: 0
 
-      - name: Write env-file
-        if: needs.init.outputs.requirements == 'true'
-        run: |
-          (
-            # Fix out of memory issues with rust
-            echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
-          ) > .env_file
-
       - name: Build wheels
         if: needs.init.outputs.requirements == 'true'
-        uses: home-assistant/wheels@2022.10.1
+        uses: home-assistant/wheels@master
         with:
-          abi: cp310
-          tag: musllinux_1_2
+          tag: ${{ env.WHEELS_TAG }}
           arch: ${{ matrix.arch }}
+          wheels-host: wheels.hass.io
           wheels-key: ${{ secrets.WHEELS_KEY }}
-          apk: "libffi-dev;openssl-dev"
+          wheels-user: wheels
+          apk: "build-base;libffi-dev;openssl-dev;cargo"
           skip-binary: aiohttp
-          env-file: true
           requirements: "requirements.txt"
 
       - name: Set version
@@ -121,14 +109,14 @@ jobs:
 
       - name: Login to DockerHub
         if: needs.init.outputs.publish == 'true'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v1.12.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: needs.init.outputs.publish == 'true'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v1.12.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -139,7 +127,7 @@ jobs:
         run: echo "BUILD_ARGS=--test" >> $GITHUB_ENV
 
       - name: Build supervisor
-        uses: home-assistant/builder@2022.11.0
+        uses: home-assistant/builder@2021.12.0
         with:
           args: |
             $BUILD_ARGS \
@@ -150,43 +138,30 @@ jobs:
           CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
 
   codenotary:
-    name: CAS signature
+    name: CodeNotary signature
     needs: init
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
         if: needs.init.outputs.publish == 'true'
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: 0
 
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        if: needs.init.outputs.publish == 'true'
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-
       - name: Set version
         if: needs.init.outputs.publish == 'true'
         uses: home-assistant/actions/helpers/version@master
         with:
           type: ${{ env.BUILD_TYPE }}
 
-      - name: Install dirhash and calc hash
-        if: needs.init.outputs.publish == 'true'
-        id: dirhash
-        run: |
-          pip3 install dirhash
-          dir_hash="$(dirhash "${{ github.workspace }}/supervisor" -a sha256 --match "*.py")"
-          echo "::set-output name=dirhash::${dir_hash}"
-
-      - name: Signing Source
+      - name: Signing image
         if: needs.init.outputs.publish == 'true'
         uses: home-assistant/actions/helpers/codenotary@master
         with:
-          source: hash://${{ steps.dirhash.outputs.dirhash }}
-          asset: supervisor-${{ needs.init.outputs.version }}
-          token: ${{ secrets.CAS_TOKEN }}
+          source: dir://${{ github.workspace }}
+          user: ${{ secrets.VCN_USER }}
+          password: ${{ secrets.VCN_PASSWORD }}
+          organisation: ${{ secrets.VCN_ORG }}
 
   version:
     name: Update version
@@ -195,7 +170,7 @@ jobs:
     steps:
       - name: Checkout the repository
         if: needs.init.outputs.publish == 'true'
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
 
       - name: Initialize git
         if: needs.init.outputs.publish == 'true'
@@ -220,11 +195,11 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
 
       - name: Build the Supervisor
         if: needs.init.outputs.publish != 'true'
-        uses: home-assistant/builder@2022.11.0
+        uses: home-assistant/builder@2021.12.0
         with:
           args: |
             --test \
@@ -271,13 +246,13 @@ jobs:
         run: |
           echo "Checking supervisor info"
           test=$(docker exec hassio_cli ha supervisor info --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
+          if [ "$test" != "ok" ];then
             exit 1
           fi
 
           echo "Checking supervisor network info"
           test=$(docker exec hassio_cli ha network info --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
+          if [ "$test" != "ok" ];then
             exit 1
           fi
 
@@ -285,25 +260,13 @@ jobs:
         run: |
           echo "Install Core SSH Add-on"
           test=$(docker exec hassio_cli ha addons install core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          # Make sure it actually installed
-          test=$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.version')
-          if [[ "$test" == "null" ]]; then
+          if [ "$test" != "ok" ];then
             exit 1
           fi
 
           echo "Start Core SSH Add-on"
           test=$(docker exec hassio_cli ha addons start core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          # Make sure its state is started
-          test="$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.state')"
-          if [ "$test" != "started" ]; then
+          if [ "$test" != "ok" ];then
             exit 1
           fi
 
@@ -312,83 +275,19 @@ jobs:
         run: |
           echo "Enable Content-Trust"
           test=$(docker exec hassio_cli ha security options --content-trust=true --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
+          if [ "$test" != "ok" ];then
             exit 1
           fi
 
           echo "Run supervisor health check"
           test=$(docker exec hassio_cli ha resolution healthcheck --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
+          if [ "$test" != "ok" ];then
             exit 1
           fi
 
           echo "Check supervisor unhealthy"
           test=$(docker exec hassio_cli ha resolution info --no-progress --raw-json | jq -r '.data.unhealthy[]')
-          if [ "$test" != "" ]; then
-            exit 1
-          fi
-
-          echo "Check supervisor supported"
-          test=$(docker exec hassio_cli ha resolution info --no-progress --raw-json | jq -r '.data.unsupported[]')
-          if [[ "$test" =~ source_mods ]]; then
-            exit 1
-          fi
-
-      - name: Create full backup
-        id: backup
-        run: |
-          test=$(docker exec hassio_cli ha backups new --no-progress --raw-json)
-          if [ "$(echo $test | jq -r '.result')" != "ok" ]; then
-            exit 1
-          fi
-          echo "::set-output name=slug::$(echo $test | jq -r '.data.slug')"
-
-      - name: Uninstall SSH add-on
-        run: |
-          test=$(docker exec hassio_cli ha addons uninstall core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-      - name: Restart supervisor
-        run: |
-          test=$(docker exec hassio_cli ha supervisor restart --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-      - name: Wait for Supervisor to come up
-        run: |
-          SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' hassio_supervisor)
-          ping="error"
-          while [ "$ping" != "ok" ]; do
-            ping=$(curl -sSL "http://$SUPERVISOR/supervisor/ping" | jq -r '.result')
-            sleep 5
-          done
-
-      - name: Restore SSH add-on from backup
-        run: |
-          test=$(docker exec hassio_cli ha backups restore ${{ steps.backup.outputs.slug }} --addons core_ssh --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
-            exit 1
-          fi
-
-          # Make sure it actually installed
-          test=$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.version')
-          if [[ "$test" == "null" ]]; then
-            exit 1
-          fi
-
-          # Make sure its state is started
-          test="$(docker exec hassio_cli ha addons info core_ssh --no-progress --raw-json | jq -r '.data.state')"
-          if [ "$test" != "started" ]; then
-            exit 1
-          fi
-
-      - name: Restore SSL directory from backup
-        run: |
-          test=$(docker exec hassio_cli ha backups restore ${{ steps.backup.outputs.slug }} --folders ssl --no-progress --raw-json | jq -r '.result')
-          if [ "$test" != "ok" ]; then
+          if [ "$test" != "" ];then
             exit 1
           fi
 

.github/workflows/ci.yaml

@@ -8,33 +8,30 @@ on:
   pull_request: ~
 
 env:
-  DEFAULT_PYTHON: "3.10"
+  DEFAULT_PYTHON: 3.9
   PRE_COMMIT_HOME: ~/.cache/pre-commit
-  DEFAULT_CAS: v1.0.2
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.ref }}'
-  cancel-in-progress: true
+  DEFAULT_VCN: v0.9.8
 
 jobs:
   # Separate job to pre-populate the base dependency cache
   # This prevent upcoming jobs to do the same individually
   prepare:
     runs-on: ubuntu-latest
-    outputs:
-      python-version: ${{ steps.python.outputs.python-version }}
-    name: Prepare Python dependencies
+    strategy:
+      matrix:
+        python-version: [3.9]
+    name: Prepare Python ${{ matrix.python-version }} dependencies
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v2.3.1
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
+          python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
@@ -48,7 +45,7 @@ jobs:
           pip install -r requirements.txt -r requirements_tests.txt
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -67,19 +64,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -96,7 +93,7 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
       - name: Register hadolint problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/hadolint.json"
@@ -111,19 +108,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -131,7 +128,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -155,19 +152,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -187,19 +184,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -207,7 +204,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -228,19 +225,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -248,7 +245,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -272,19 +269,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -304,19 +301,19 @@ jobs:
     needs: prepare
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -324,7 +321,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -342,26 +339,29 @@ jobs:
   pytest:
     runs-on: ubuntu-latest
     needs: prepare
-    name: Run tests Python ${{ needs.prepare.outputs.python-version }}
+    strategy:
+      matrix:
+        python-version: [3.9]
+    name: Run tests Python ${{ matrix.python-version }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
-      - name: Install CAS tools
-        uses: home-assistant/actions/helpers/cas@master
+          python-version: ${{ matrix.python-version }}
+      - name: Install VCN tools
+        uses: home-assistant/actions/helpers/vcn@master
         with:
-          version: ${{ env.DEFAULT_CAS }}
+          vcn_version: ${{ env.DEFAULT_VCN }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -392,7 +392,7 @@ jobs:
             -o console_output_style=count \
             tests
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v2.3.1
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
@@ -400,29 +400,29 @@ jobs:
   coverage:
     name: Process test coverage
     runs-on: ubuntu-latest
-    needs: ["pytest", "prepare"]
+    needs: pytest
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
-      - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/checkout@v2.4.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.3.1
         id: python
         with:
-          python-version: ${{ needs.prepare.outputs.python-version }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v2.1.7
         with:
           path: venv
           key: |
-            ${{ runner.os }}-venv-${{ needs.prepare.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
+            ${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_tests.txt') }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
           echo "Failed to restore Python virtual environment from cache"
           exit 1
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
       - name: Combine coverage results
         run: |
           . venv/bin/activate
@@ -430,4 +430,4 @@ jobs:
           coverage report
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v2.1.0

.github/workflows/lock.yml

@@ -9,7 +9,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4.0.0
+      - uses: dessant/lock-threads@v3
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "30"

.github/workflows/release-drafter.yml

@@ -11,7 +11,7 @@ jobs:
     name: Release Drafter
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: 0
 
@@ -36,7 +36,7 @@ jobs:
           echo "::set-output name=version::$datepre.$newpost"
 
       - name: Run Release Drafter
-        uses: release-drafter/release-drafter@v5.22.0
+        uses: release-drafter/release-drafter@v5
         with:
           tag: ${{ steps.version.outputs.version }}
           name: ${{ steps.version.outputs.version }}

.github/workflows/sentry.yaml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2.4.0
       - name: Sentry Release
-        uses: getsentry/action-release@v1.2.1
+        uses: getsentry/action-release@v1.1.6
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

.github/workflows/stale.yml

@@ -9,10 +9,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7.0.0
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 30
+          days-before-stale: 60
           days-before-close: 7
           stale-issue-label: "stale"
           exempt-issue-labels: "no-stale,Help%20wanted,help-wanted,pinned,rfc,security"

.pre-commit-config.yaml

@@ -1,34 +1,34 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 21.12b0
     hooks:
       - id: black
         args:
           - --safe
           - --quiet
           - --target-version
-          - py310
+          - py39
         files: ^((supervisor|tests)/.+)?[^/]+\.py$
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.3
     hooks:
       - id: flake8
         additional_dependencies:
-          - flake8-docstrings==1.7.0
-          - pydocstyle==6.3.0
+          - flake8-docstrings==1.5.0
+          - pydocstyle==5.0.2
         files: ^(supervisor|script|tests)/.+\.py$
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v3.1.0
     hooks:
       - id: check-executables-have-shebangs
         stages: [manual]
       - id: check-json
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.9.3
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v2.31.0
     hooks:
       - id: pyupgrade
-        args: [--py310-plus]
+        args: [--py39-plus]

Dockerfile

@@ -5,11 +5,10 @@ ENV \
     S6_SERVICES_GRACETIME=10000 \
     SUPERVISOR_API=http://localhost
 
-ARG \
-    CAS_VERSION
+ARG BUILD_ARCH
+WORKDIR /usr/src
 
 # Install base
-WORKDIR /usr/src
 RUN \
     set -x \
     && apk add --no-cache \
@@ -19,27 +18,14 @@ RUN \
         libffi \
         libpulse \
         musl \
-        openssl \
-    && apk add --no-cache --virtual .build-dependencies \
-        build-base \
-        go \
-    \
-    && git clone -b "v${CAS_VERSION}" --depth 1 \
-        https://github.com/codenotary/cas \
-    && cd cas \
-    && make cas \
-    && mv cas /usr/bin/cas \
-    \
-    && apk del .build-dependencies \
-    && rm -rf /root/go /root/.cache \
-    && rm -rf /usr/src/cas
+        openssl
 
 # Install requirements
 COPY requirements.txt .
 RUN \
     export MAKEFLAGS="-j$(nproc)" \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \
-        "https://wheels.home-assistant.io/musllinux/" \
+        "https://wheels.home-assistant.io/alpine-$(cut -d '.' -f 1-2 < /etc/alpine-release)/${BUILD_ARCH}/" \
         -r ./requirements.txt \
     && rm -f requirements.txt
 

build.yaml

@@ -1,16 +1,14 @@
 image: homeassistant/{arch}-hassio-supervisor
 shadow_repository: ghcr.io/home-assistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base-python:3.10-alpine3.16
-  armhf: ghcr.io/home-assistant/armhf-base-python:3.10-alpine3.16
-  armv7: ghcr.io/home-assistant/armv7-base-python:3.10-alpine3.16
-  amd64: ghcr.io/home-assistant/amd64-base-python:3.10-alpine3.16
-  i386: ghcr.io/home-assistant/i386-base-python:3.10-alpine3.16
+  aarch64: ghcr.io/home-assistant/aarch64-base-python:3.9-alpine3.14
+  armhf: ghcr.io/home-assistant/armhf-base-python:3.9-alpine3.14
+  armv7: ghcr.io/home-assistant/armv7-base-python:3.9-alpine3.14
+  amd64: ghcr.io/home-assistant/amd64-base-python:3.9-alpine3.14
+  i386: ghcr.io/home-assistant/i386-base-python:3.9-alpine3.14
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
-args:
-  CAS_VERSION: 1.0.2
 labels:
   io.hass.type: supervisor
   org.opencontainers.image.title: Home Assistant Supervisor

pylintrc

@@ -12,19 +12,24 @@ extension-pkg-whitelist=
 # locally-disabled - it spams too much
 # duplicate-code - unavoidable
 # cyclic-import - doesn't test if both import on load
+# abstract-class-little-used - prevents from setting right foundation
 # abstract-class-not-used - is flaky, should not show up but does
 # unused-argument - generic callbacks and setup methods create a lot of warnings
+# redefined-variable-type - this is Python, we're duck typing!
 # too-many-* - are not enforced for the sake of readability
 # too-few-* - same as too-many-*
 # abstract-method - with intro of async there are always methods missing
 disable=
   format,
+  abstract-class-little-used,
   abstract-method,
   cyclic-import,
   duplicate-code,
   locally-disabled,
   no-else-return,
+  no-self-use,
   not-context-manager,
+  redefined-variable-type,
   too-few-public-methods,
   too-many-arguments,
   too-many-branches,

pytest.ini

@@ -1,2 +0,0 @@
-[pytest]
-asyncio_mode = auto

requirements.txt

@@ -1,26 +1,22 @@
-aiodns==3.0.0
-aiohttp==3.8.4
+aiohttp==3.8.1
 async_timeout==4.0.2
-atomicwrites-homeassistant==1.4.1
-attrs==22.2.0
-awesomeversion==22.9.0
+atomicwrites==1.4.0
+attrs==21.2.0
+awesomeversion==22.1.0
 brotli==1.0.9
 cchardet==2.1.7
-ciso8601==2.3.0
-colorlog==6.7.0
+ciso8601==2.2.0
+colorlog==6.6.0
 cpe==1.2.1
-cryptography==39.0.2
-debugpy==1.6.6
-deepmerge==1.1.0
-dirhash==0.2.1
-docker==6.0.1
-gitpython==3.1.31
-jinja2==3.1.2
-pulsectl==22.3.2
-pyudev==0.24.0
-ruamel.yaml==0.17.21
-securetar==2022.2.0
-sentry-sdk==1.15.0
-voluptuous==0.13.1
-dbus-fast==1.84.1
-typing_extensions==4.3.0
+cryptography==36.0.1
+debugpy==1.5.1
+deepmerge==1.0.1
+docker==5.0.3
+gitpython==3.1.26
+jinja2==3.0.3
+pulsectl==21.10.5
+pyudev==0.22.0
+ruamel.yaml==0.17.17
+sentry-sdk==1.5.2
+voluptuous==0.12.2
+dbus-next==0.2.3

requirements_tests.txt

@@ -1,17 +1,14 @@
-black==23.1.0
+black==21.12b0
 codecov==2.1.12
-coverage==7.1.0
-flake8-docstrings==1.7.0
-flake8==6.0.0
-pre-commit==3.0.4
-pydocstyle==6.3.0
-pylint==2.15.10
-pytest-aiohttp==1.0.4
-pytest-asyncio==0.18.3
-pytest-cov==4.0.0
-pytest-timeout==2.1.0
-pytest==7.2.1
-pyupgrade==3.3.1
-time-machine==2.9.0
-typing_extensions==4.3.0
-urllib3==1.26.14
+coverage==6.2
+flake8-docstrings==1.6.0
+flake8==4.0.1
+pre-commit==2.17.0
+pydocstyle==6.1.1
+pylint==2.12.2
+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==3.0.0
+pytest-timeout==2.0.2
+pytest==6.2.5
+pyupgrade==2.31.0

rootfs/etc/services.d/supervisor/finish

@@ -1,11 +1,8 @@
-#!/usr/bin/env bashio
+#!/usr/bin/execlineb -S1
 # ==============================================================================
 # Take down the S6 supervision tree when Supervisor fails
 # ==============================================================================
+if { s6-test ${1} -ne 100 }
+if { s6-test ${1} -ne 256 }
 
-if [[ "$1" -ne 100 ]] && [[ "$1" -ne 256 ]]; then
-  bashio::log.warning "Halt Supervisor"
-  /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Supervisor restart after closing"
+redirfd -w 2 /dev/null s6-svscanctl -t /var/run/s6/services

rootfs/etc/services.d/supervisor/run

@@ -3,6 +3,5 @@
 # Start Supervisor service
 # ==============================================================================
 export LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
-export MALLOC_CONF="background_thread:true,metadata_thp:auto"
 
 exec python3 -m supervisor

rootfs/etc/services.d/watchdog/finish

@@ -1,11 +1,8 @@
-#!/usr/bin/env bashio
+#!/usr/bin/execlineb -S1
 # ==============================================================================
 # Take down the S6 supervision tree when Watchdog fails
 # ==============================================================================
+if { s6-test ${1} -ne 0 }
+if { s6-test ${1} -ne 256 }
 
-if [[ "$1" -ne 0 ]] && [[ "$1" -ne 256 ]]; then
-  bashio::log.warning "Halt Supervisor (Wuff)"
-  /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Watchdog restart after closing"
+s6-svscanctl -t /var/run/s6/services

rootfs/etc/services.d/watchdog/run

@@ -31,4 +31,4 @@ do
 
 done
 
-bashio::exit.nok "Watchdog detected issue with Supervisor - taking container down!"
+basio::exit.nok "Watchdog detected issue with Supervisor - taking container down!"

rootfs/root/.cas-trusted-signing-pub-key

@@ -1,4 +0,0 @@
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE03LvYuz79GTJx4uKp3w6NrSe5JZI
-iBtgzzYi0YQYtZO/r+xFpgDJEa0gLHkXtl94fpqrFiN89In83lzaszbZtA==
------END PUBLIC KEY-----

rootfs/root/.cas/config.json

@@ -1,8 +0,0 @@
-{
-  "currentcontext": {
-    "LcHost": "cas.codenotary.com",
-    "LcPort": "443"
-  },
-  "schemaversion": 3,
-  "users": null
-}

setup.py

@@ -49,7 +49,6 @@ setup(
         "supervisor.resolution.evaluations",
         "supervisor.resolution.fixups",
         "supervisor.resolution",
-        "supervisor.security",
         "supervisor.services.modules",
         "supervisor.services",
         "supervisor.store",

supervisor/__main__.py

@@ -28,8 +28,7 @@ if __name__ == "__main__":
     bootstrap.initialize_logging()
 
     # Init async event loop
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
+    loop = asyncio.get_event_loop()
 
     # Check if all information are available to setup Supervisor
     bootstrap.check_environment()

supervisor/addons/__init__.py

@@ -3,7 +3,7 @@ import asyncio
 from contextlib import suppress
 import logging
 import tarfile
-from typing import Union
+from typing import Optional, Union
 
 from ..const import AddonBoot, AddonStartup, AddonState
 from ..coresys import CoreSys, CoreSysAttributes
@@ -23,9 +23,7 @@ from ..jobs.decorator import Job, JobCondition
 from ..resolution.const import ContextType, IssueType, SuggestionType
 from ..store.addon import AddonStore
 from ..utils import check_exception_chain
-from ..utils.sentry import capture_exception
 from .addon import Addon
-from .const import ADDON_UPDATE_CONDITIONS
 from .data import AddonsData
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -54,7 +52,7 @@ class AddonManager(CoreSysAttributes):
         """Return a list of all installed add-ons."""
         return list(self.local.values())
 
-    def get(self, addon_slug: str, local_only: bool = False) -> AnyAddon | None:
+    def get(self, addon_slug: str, local_only: bool = False) -> Optional[AnyAddon]:
         """Return an add-on from slug.
 
         Prio:
@@ -67,7 +65,7 @@ class AddonManager(CoreSysAttributes):
             return self.store.get(addon_slug)
         return None
 
-    def from_token(self, token: str) -> Addon | None:
+    def from_token(self, token: str) -> Optional[Addon]:
         """Return an add-on from Supervisor token."""
         for addon in self.installed:
             if token == addon.supervisor_token:
@@ -115,7 +113,7 @@ class AddonManager(CoreSysAttributes):
                     addon.boot = AddonBoot.MANUAL
                     addon.save_persist()
             except Exception as err:  # pylint: disable=broad-except
-                capture_exception(err)
+                self.sys_capture_exception(err)
             else:
                 continue
 
@@ -143,10 +141,14 @@ class AddonManager(CoreSysAttributes):
                 await addon.stop()
             except Exception as err:  # pylint: disable=broad-except
                 _LOGGER.warning("Can't stop Add-on %s: %s", addon.slug, err)
-                capture_exception(err)
+                self.sys_capture_exception(err)
 
     @Job(
-        conditions=ADDON_UPDATE_CONDITIONS,
+        conditions=[
+            JobCondition.FREE_SPACE,
+            JobCondition.INTERNET_HOST,
+            JobCondition.HEALTHY,
+        ],
         on_condition=AddonsJobError,
     )
     async def install(self, slug: str) -> None:
@@ -158,11 +160,13 @@ class AddonManager(CoreSysAttributes):
         if not store:
             raise AddonsError(f"Add-on {slug} does not exist", _LOGGER.error)
 
-        store.validate_availability()
+        if not store.available:
+            raise AddonsNotSupportedError(
+                f"Add-on {slug} not supported on this platform", _LOGGER.error
+            )
 
         self.data.install(store)
         addon = Addon(self.coresys, slug)
-        await addon.load()
 
         if not addon.path_data.is_dir():
             _LOGGER.info(
@@ -174,7 +178,7 @@ class AddonManager(CoreSysAttributes):
         await addon.install_apparmor()
 
         try:
-            await addon.instance.install(store.version, store.image, arch=addon.arch)
+            await addon.instance.install(store.version, store.image)
         except DockerError as err:
             self.data.uninstall(addon)
             raise AddonsError() from err
@@ -201,7 +205,7 @@ class AddonManager(CoreSysAttributes):
         else:
             addon.state = AddonState.UNKNOWN
 
-        await addon.unload()
+        await addon.remove_data()
 
         # Cleanup audio settings
         if addon.path_pulse.exists():
@@ -241,10 +245,14 @@ class AddonManager(CoreSysAttributes):
         _LOGGER.info("Add-on '%s' successfully removed", slug)
 
     @Job(
-        conditions=ADDON_UPDATE_CONDITIONS,
+        conditions=[
+            JobCondition.FREE_SPACE,
+            JobCondition.INTERNET_HOST,
+            JobCondition.HEALTHY,
+        ],
         on_condition=AddonsJobError,
     )
-    async def update(self, slug: str, backup: bool | None = False) -> None:
+    async def update(self, slug: str, backup: Optional[bool] = False) -> None:
         """Update add-on."""
         if slug not in self.local:
             raise AddonsError(f"Add-on {slug} is not installed", _LOGGER.error)
@@ -260,7 +268,10 @@ class AddonManager(CoreSysAttributes):
             raise AddonsError(f"No update available for add-on {slug}", _LOGGER.warning)
 
         # Check if available, Maybe something have changed
-        store.validate_availability()
+        if not store.available:
+            raise AddonsNotSupportedError(
+                f"Add-on {slug} not supported on that platform", _LOGGER.error
+            )
 
         if backup:
             await self.sys_backups.do_backup_partial(
@@ -416,7 +427,7 @@ class AddonManager(CoreSysAttributes):
                     reference=addon.slug,
                     suggestions=[SuggestionType.EXECUTE_REPAIR],
                 )
-                capture_exception(err)
+                self.sys_capture_exception(err)
             else:
                 self.sys_plugins.dns.add_host(
                     ipv4=addon.ip_address, names=[addon.hostname], write=False

supervisor/addons/addon.py

@@ -1,6 +1,5 @@
 """Init file for Supervisor add-ons."""
 import asyncio
-from collections.abc import Awaitable
 from contextlib import suppress
 from copy import deepcopy
 from ipaddress import IPv4Address
@@ -11,15 +10,13 @@ import secrets
 import shutil
 import tarfile
 from tempfile import TemporaryDirectory
-from typing import Any, Final
+from typing import Any, Awaitable, Final, Optional
 
 import aiohttp
 from deepmerge import Merger
-from securetar import atomic_contents_add, secure_path
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
-from ..bus import EventListener
 from ..const import (
     ATTR_ACCESS_TOKEN,
     ATTR_AUDIO_INPUT,
@@ -50,37 +47,26 @@ from ..const import (
     AddonBoot,
     AddonStartup,
     AddonState,
-    BusEvent,
 )
 from ..coresys import CoreSys
 from ..docker.addon import DockerAddon
-from ..docker.const import ContainerState
-from ..docker.monitor import DockerContainerStateEvent
 from ..docker.stats import DockerStats
 from ..exceptions import (
     AddonConfigurationError,
     AddonsError,
-    AddonsJobError,
     AddonsNotSupportedError,
     ConfigurationFileError,
     DockerError,
+    DockerRequestError,
     HostAppArmorError,
 )
 from ..hardware.data import Device
 from ..homeassistant.const import WSEvent, WSType
-from ..jobs.const import JobExecutionLimit
-from ..jobs.decorator import Job
 from ..utils import check_port
 from ..utils.apparmor import adjust_profile
 from ..utils.json import read_json_file, write_json_file
-from ..utils.sentry import capture_exception
-from .const import (
-    WATCHDOG_MAX_ATTEMPTS,
-    WATCHDOG_RETRY_SECONDS,
-    WATCHDOG_THROTTLE_MAX_CALLS,
-    WATCHDOG_THROTTLE_PERIOD,
-    AddonBackupMode,
-)
+from ..utils.tar import atomic_contents_add, secure_path
+from .const import AddonBackupMode
 from .model import AddonModel, Data
 from .options import AddonOptions
 from .utils import remove_data
@@ -98,6 +84,8 @@ RE_WATCHDOG = re.compile(
     r":\/\/\[HOST\]:(?:\[PORT:)?(?P<t_port>\d+)\]?(?P<s_suffix>.*)$"
 )
 
+RE_OLD_AUDIO = re.compile(r"\d+,\d+")
+
 WATCHDOG_TIMEOUT = aiohttp.ClientTimeout(total=10)
 
 _OPTIONS_MERGER: Final = Merger(
@@ -115,58 +103,6 @@ class Addon(AddonModel):
         super().__init__(coresys, slug)
         self.instance: DockerAddon = DockerAddon(coresys, self)
         self._state: AddonState = AddonState.UNKNOWN
-        self._manual_stop: bool = (
-            self.sys_hardware.helper.last_boot != self.sys_config.last_boot
-        )
-        self._listeners: list[EventListener] = []
-
-        @Job(
-            name=f"addon_{slug}_restart_after_problem",
-            limit=JobExecutionLimit.THROTTLE_RATE_LIMIT,
-            throttle_period=WATCHDOG_THROTTLE_PERIOD,
-            throttle_max_calls=WATCHDOG_THROTTLE_MAX_CALLS,
-            on_condition=AddonsJobError,
-        )
-        async def restart_after_problem(addon: Addon, state: ContainerState):
-            """Restart unhealthy or failed addon."""
-            attempts = 0
-            while await addon.instance.current_state() == state:
-                if not addon.in_progress:
-                    _LOGGER.warning(
-                        "Watchdog found addon %s is %s, restarting...",
-                        addon.name,
-                        state.value,
-                    )
-                    try:
-                        if state == ContainerState.FAILED:
-                            # Ensure failed container is removed before attempting reanimation
-                            if attempts == 0:
-                                with suppress(DockerError):
-                                    await addon.instance.stop(remove_container=True)
-
-                            await addon.start()
-                        else:
-                            await addon.restart()
-                    except AddonsError as err:
-                        attempts = attempts + 1
-                        _LOGGER.error(
-                            "Watchdog restart of addon %s failed!", addon.name
-                        )
-                        capture_exception(err)
-                    else:
-                        break
-
-                if attempts >= WATCHDOG_MAX_ATTEMPTS:
-                    _LOGGER.critical(
-                        "Watchdog cannot restart addon %s, failed all %s attempts",
-                        addon.name,
-                        attempts,
-                    )
-                    break
-
-                await asyncio.sleep(WATCHDOG_RETRY_SECONDS)
-
-        self._restart_after_problem = restart_after_problem
 
     def __repr__(self) -> str:
         """Return internal representation."""
@@ -201,20 +137,15 @@ class Addon(AddonModel):
 
     async def load(self) -> None:
         """Async initialize of object."""
-        self._listeners.append(
-            self.sys_bus.register_event(
-                BusEvent.DOCKER_CONTAINER_STATE_CHANGE, self.container_state_changed
-            )
-        )
-        self._listeners.append(
-            self.sys_bus.register_event(
-                BusEvent.DOCKER_CONTAINER_STATE_CHANGE, self.watchdog_container
-            )
-        )
-
         with suppress(DockerError):
             await self.instance.attach(version=self.version)
 
+            # Evaluate state
+            if await self.instance.is_running():
+                self.state = AddonState.STARTED
+            else:
+                self.state = AddonState.STOPPED
+
     @property
     def ip_address(self) -> IPv4Address:
         """Return IP of add-on instance."""
@@ -251,7 +182,7 @@ class Addon(AddonModel):
         return self._available(self.data_store)
 
     @property
-    def version(self) -> str | None:
+    def version(self) -> Optional[str]:
         """Return installed version."""
         return self.persist[ATTR_VERSION]
 
@@ -275,7 +206,7 @@ class Addon(AddonModel):
         )
 
     @options.setter
-    def options(self, value: dict[str, Any] | None) -> None:
+    def options(self, value: Optional[dict[str, Any]]) -> None:
         """Store user add-on options."""
         self.persist[ATTR_OPTIONS] = {} if value is None else deepcopy(value)
 
@@ -320,17 +251,17 @@ class Addon(AddonModel):
         return self.persist[ATTR_UUID]
 
     @property
-    def supervisor_token(self) -> str | None:
+    def supervisor_token(self) -> Optional[str]:
         """Return access token for Supervisor API."""
         return self.persist.get(ATTR_ACCESS_TOKEN)
 
     @property
-    def ingress_token(self) -> str | None:
+    def ingress_token(self) -> Optional[str]:
         """Return access token for Supervisor API."""
         return self.persist.get(ATTR_INGRESS_TOKEN)
 
     @property
-    def ingress_entry(self) -> str | None:
+    def ingress_entry(self) -> Optional[str]:
         """Return ingress external URL."""
         if self.with_ingress:
             return f"/api/hassio_ingress/{self.ingress_token}"
@@ -352,12 +283,12 @@ class Addon(AddonModel):
         self.persist[ATTR_PROTECTED] = value
 
     @property
-    def ports(self) -> dict[str, int | None] | None:
+    def ports(self) -> Optional[dict[str, Optional[int]]]:
         """Return ports of add-on."""
         return self.persist.get(ATTR_NETWORK, super().ports)
 
     @ports.setter
-    def ports(self, value: dict[str, int | None] | None) -> None:
+    def ports(self, value: Optional[dict[str, Optional[int]]]) -> None:
         """Set custom ports of add-on."""
         if value is None:
             self.persist.pop(ATTR_NETWORK, None)
@@ -372,7 +303,7 @@ class Addon(AddonModel):
         self.persist[ATTR_NETWORK] = new_ports
 
     @property
-    def ingress_url(self) -> str | None:
+    def ingress_url(self) -> Optional[str]:
         """Return URL to ingress url."""
         if not self.with_ingress:
             return None
@@ -383,7 +314,7 @@ class Addon(AddonModel):
         return url
 
     @property
-    def webui(self) -> str | None:
+    def webui(self) -> Optional[str]:
         """Return URL to webui or None."""
         url = super().webui
         if not url:
@@ -411,7 +342,7 @@ class Addon(AddonModel):
         return f"{proto}://[HOST]:{port}{s_suffix}"
 
     @property
-    def ingress_port(self) -> int | None:
+    def ingress_port(self) -> Optional[int]:
         """Return Ingress port."""
         if not self.with_ingress:
             return None
@@ -422,11 +353,8 @@ class Addon(AddonModel):
         return port
 
     @property
-    def ingress_panel(self) -> bool | None:
+    def ingress_panel(self) -> Optional[bool]:
         """Return True if the add-on access support ingress."""
-        if not self.with_ingress:
-            return None
-
         return self.persist[ATTR_INGRESS_PANEL]
 
     @ingress_panel.setter
@@ -435,32 +363,43 @@ class Addon(AddonModel):
         self.persist[ATTR_INGRESS_PANEL] = value
 
     @property
-    def audio_output(self) -> str | None:
+    def audio_output(self) -> Optional[str]:
         """Return a pulse profile for output or None."""
         if not self.with_audio:
             return None
-        return self.persist.get(ATTR_AUDIO_OUTPUT)
+
+        # Fallback with old audio settings
+        # Remove after 210
+        output_data = self.persist.get(ATTR_AUDIO_OUTPUT)
+        if output_data and RE_OLD_AUDIO.fullmatch(output_data):
+            return None
+        return output_data
 
     @audio_output.setter
-    def audio_output(self, value: str | None):
+    def audio_output(self, value: Optional[str]):
         """Set audio output profile settings."""
         self.persist[ATTR_AUDIO_OUTPUT] = value
 
     @property
-    def audio_input(self) -> str | None:
+    def audio_input(self) -> Optional[str]:
         """Return pulse profile for input or None."""
         if not self.with_audio:
             return None
 
-        return self.persist.get(ATTR_AUDIO_INPUT)
+        # Fallback with old audio settings
+        # Remove after 210
+        input_data = self.persist.get(ATTR_AUDIO_INPUT)
+        if input_data and RE_OLD_AUDIO.fullmatch(input_data):
+            return None
+        return input_data
 
     @audio_input.setter
-    def audio_input(self, value: str | None) -> None:
+    def audio_input(self, value: Optional[str]) -> None:
         """Set audio input settings."""
         self.persist[ATTR_AUDIO_INPUT] = value
 
     @property
-    def image(self) -> str | None:
+    def image(self) -> Optional[str]:
         """Return image name of add-on."""
         return self.persist.get(ATTR_IMAGE)
 
@@ -469,11 +408,6 @@ class Addon(AddonModel):
         """Return True if this  add-on need a local build."""
         return ATTR_IMAGE not in self.data
 
-    @property
-    def latest_need_build(self) -> bool:
-        """Return True if the latest version of the addon needs a local build."""
-        return ATTR_IMAGE not in self.data_store
-
     @property
     def path_data(self) -> Path:
         """Return add-on data path inside Supervisor."""
@@ -517,11 +451,6 @@ class Addon(AddonModel):
 
         return options_schema.pwned
 
-    @property
-    def loaded(self) -> bool:
-        """Is add-on loaded."""
-        return bool(self._listeners)
-
     def save_persist(self) -> None:
         """Save data of add-on."""
         self.sys_addons.data.save_data()
@@ -590,11 +519,8 @@ class Addon(AddonModel):
 
         raise AddonConfigurationError()
 
-    async def unload(self) -> None:
-        """Unload add-on and remove data."""
-        for listener in self._listeners:
-            self.sys_bus.remove_listener(listener)
-
+    async def remove_data(self) -> None:
+        """Remove add-on data."""
         if not self.path_data.is_dir():
             return
 
@@ -700,18 +626,27 @@ class Addon(AddonModel):
         # Start Add-on
         try:
             await self.instance.run()
+        except DockerRequestError as err:
+            self.state = AddonState.ERROR
+            raise AddonsError() from err
         except DockerError as err:
             self.state = AddonState.ERROR
             raise AddonsError() from err
+        else:
+            self.state = AddonState.STARTED
 
     async def stop(self) -> None:
         """Stop add-on."""
-        self._manual_stop = True
         try:
             await self.instance.stop()
+        except DockerRequestError as err:
+            self.state = AddonState.ERROR
+            raise AddonsError() from err
         except DockerError as err:
             self.state = AddonState.ERROR
             raise AddonsError() from err
+        else:
+            self.state = AddonState.STOPPED
 
     async def restart(self) -> None:
         """Restart add-on."""
@@ -759,18 +694,16 @@ class Addon(AddonModel):
         try:
             command_return = await self.instance.run_inside(command)
             if command_return.exit_code != 0:
-                _LOGGER.debug(
-                    "Pre-/Post backup command failed with: %s", command_return.output
-                )
-                raise AddonsError(
-                    f"Pre-/Post backup command returned error code: {command_return.exit_code}",
-                    _LOGGER.error,
+                _LOGGER.error(
+                    "Pre-/Post backup command returned error code: %s",
+                    command_return.exit_code,
                 )
+                raise AddonsError()
         except DockerError as err:
-            raise AddonsError(
-                f"Failed running pre-/post backup command {command}: {str(err)}",
-                _LOGGER.error,
-            ) from err
+            _LOGGER.error(
+                "Failed running pre-/post backup command %s: %s", command, err
+            )
+            raise AddonsError() from err
 
     async def backup(self, tar_file: tarfile.TarFile) -> None:
         """Backup state of an add-on."""
@@ -815,7 +748,8 @@ class Addon(AddonModel):
             def _write_tarfile():
                 """Write tar inside loop."""
                 with tar_file as backup:
-                    # Backup metadata
+                    # Backup system
+
                     backup.add(temp, arcname=".")
 
                     # Backup data
@@ -882,10 +816,12 @@ class Addon(AddonModel):
             try:
                 data = SCHEMA_ADDON_BACKUP(data)
             except vol.Invalid as err:
-                raise AddonsError(
-                    f"Can't validate {self.slug}, backup data: {humanize_error(data, err)}",
-                    _LOGGER.error,
-                ) from err
+                _LOGGER.error(
+                    "Can't validate %s, backup data: %s",
+                    self.slug,
+                    humanize_error(data, err),
+                )
+                raise AddonsError() from err
 
             # If available
             if not self._available(data[ATTR_SYSTEM]):
@@ -952,52 +888,8 @@ class Addon(AddonModel):
                     )
                     raise AddonsError() from err
 
-            # Is add-on loaded
-            if not self.loaded:
-                await self.load()
-
             # Run add-on
             if data[ATTR_STATE] == AddonState.STARTED:
                 return await self.start()
 
         _LOGGER.info("Finished restore for add-on %s", self.slug)
-
-    def check_trust(self) -> Awaitable[None]:
-        """Calculate Addon docker content trust.
-
-        Return Coroutine.
-        """
-        return self.instance.check_trust()
-
-    async def container_state_changed(self, event: DockerContainerStateEvent) -> None:
-        """Set addon state from container state."""
-        if event.name != self.instance.name:
-            return
-
-        if event.state in [
-            ContainerState.RUNNING,
-            ContainerState.HEALTHY,
-            ContainerState.UNHEALTHY,
-        ]:
-            self._manual_stop = False
-            self.state = AddonState.STARTED
-        elif event.state == ContainerState.STOPPED:
-            self.state = AddonState.STOPPED
-        elif event.state == ContainerState.FAILED:
-            self.state = AddonState.ERROR
-
-    async def watchdog_container(self, event: DockerContainerStateEvent) -> None:
-        """Process state changes in addon container and restart if necessary."""
-        if event.name != self.instance.name:
-            return
-
-        # Skip watchdog if not enabled or manual stopped
-        if not self.watchdog or self._manual_stop:
-            return
-
-        if event.state in [
-            ContainerState.FAILED,
-            ContainerState.STOPPED,
-            ContainerState.UNHEALTHY,
-        ]:
-            await self._restart_after_problem(self, event.state)

supervisor/addons/build.py

@@ -1,7 +1,6 @@
 """Supervisor add-on build environment."""
 from __future__ import annotations
 
-from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -16,8 +15,7 @@ from ..const import (
     META_ADDON,
 )
 from ..coresys import CoreSys, CoreSysAttributes
-from ..docker.interface import MAP_ARCH
-from ..exceptions import ConfigurationFileError, HassioArchNotFound
+from ..exceptions import ConfigurationFileError
 from ..utils.common import FileConfiguration, find_one_filetype
 from .validate import SCHEMA_BUILD_CONFIG
 
@@ -46,33 +44,15 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
         """Ignore save function."""
         raise RuntimeError()
 
-    @cached_property
-    def arch(self) -> str:
-        """Return arch of the add-on."""
-        return self.sys_arch.match(self.addon.arch)
-
     @property
     def base_image(self) -> str:
         """Return base image for this add-on."""
         if not self._data[ATTR_BUILD_FROM]:
             return f"ghcr.io/home-assistant/{self.sys_arch.default}-base:latest"
 
-        if isinstance(self._data[ATTR_BUILD_FROM], str):
-            return self._data[ATTR_BUILD_FROM]
-
         # Evaluate correct base image
-        if self.arch not in self._data[ATTR_BUILD_FROM]:
-            raise HassioArchNotFound(
-                f"Add-on {self.addon.slug} is not supported on {self.arch}"
-            )
-        return self._data[ATTR_BUILD_FROM][self.arch]
-
-    @property
-    def dockerfile(self) -> Path:
-        """Return Dockerfile path."""
-        if self.addon.path_location.joinpath(f"Dockerfile.{self.arch}").exists():
-            return self.addon.path_location.joinpath(f"Dockerfile.{self.arch}")
-        return self.addon.path_location.joinpath("Dockerfile")
+        arch = self.sys_arch.match(list(self._data[ATTR_BUILD_FROM].keys()))
+        return self._data[ATTR_BUILD_FROM][arch]
 
     @property
     def squash(self) -> bool:
@@ -92,29 +72,24 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
     @property
     def is_valid(self) -> bool:
         """Return true if the build env is valid."""
-        try:
-            return all(
-                [
-                    self.addon.path_location.is_dir(),
-                    self.dockerfile.is_file(),
-                ]
-            )
-        except HassioArchNotFound:
-            return False
+        return all(
+            [
+                self.addon.path_location.is_dir(),
+                Path(self.addon.path_location, "Dockerfile").is_file(),
+            ]
+        )
 
     def get_docker_args(self, version: AwesomeVersion):
         """Create a dict with Docker build arguments."""
         args = {
             "path": str(self.addon.path_location),
             "tag": f"{self.addon.image}:{version!s}",
-            "dockerfile": str(self.dockerfile),
             "pull": True,
             "forcerm": not self.sys_dev,
             "squash": self.squash,
-            "platform": MAP_ARCH[self.arch],
             "labels": {
                 "io.hass.version": version,
-                "io.hass.arch": self.arch,
+                "io.hass.arch": self.sys_arch.default,
                 "io.hass.type": META_ADDON,
                 "io.hass.name": self._fix_label("name"),
                 "io.hass.description": self._fix_label("description"),

supervisor/addons/const.py

@@ -1,9 +1,6 @@
 """Add-on static data."""
-from datetime import timedelta
 from enum import Enum
 
-from ..jobs.const import JobCondition
-
 
 class AddonBackupMode(str, Enum):
     """Backup mode of an Add-on."""
@@ -13,16 +10,3 @@ class AddonBackupMode(str, Enum):
 
 
 ATTR_BACKUP = "backup"
-ATTR_CODENOTARY = "codenotary"
-WATCHDOG_RETRY_SECONDS = 10
-WATCHDOG_MAX_ATTEMPTS = 5
-WATCHDOG_THROTTLE_PERIOD = timedelta(minutes=30)
-WATCHDOG_THROTTLE_MAX_CALLS = 10
-
-ADDON_UPDATE_CONDITIONS = [
-    JobCondition.FREE_SPACE,
-    JobCondition.HEALTHY,
-    JobCondition.INTERNET_HOST,
-    JobCondition.PLUGINS_UPDATED,
-    JobCondition.SUPERVISOR_UPDATED,
-]

supervisor/addons/model.py

@@ -1,13 +1,12 @@
 """Init file for Supervisor add-ons."""
 from abc import ABC, abstractmethod
-from collections.abc import Awaitable, Callable
-from contextlib import suppress
-import logging
 from pathlib import Path
-from typing import Any
+from typing import Any, Awaitable, Optional
 
 from awesomeversion import AwesomeVersion, AwesomeVersionException
 
+from supervisor.addons.const import AddonBackupMode
+
 from ..const import (
     ATTR_ADVANCED,
     ATTR_APPARMOR,
@@ -34,7 +33,6 @@ from ..const import (
     ATTR_HOST_IPC,
     ATTR_HOST_NETWORK,
     ATTR_HOST_PID,
-    ATTR_HOST_UTS,
     ATTR_IMAGE,
     ATTR_INGRESS,
     ATTR_INGRESS_STREAM,
@@ -81,13 +79,10 @@ from ..const import (
 )
 from ..coresys import CoreSys, CoreSysAttributes
 from ..docker.const import Capabilities
-from ..exceptions import AddonsNotSupportedError
-from .const import ATTR_BACKUP, ATTR_CODENOTARY, AddonBackupMode
+from .const import ATTR_BACKUP
 from .options import AddonOptions, UiOptions
 from .validate import RE_SERVICE, RE_VOLUME
 
-_LOGGER: logging.Logger = logging.getLogger(__name__)
-
 Data = dict[str, Any]
 
 
@@ -130,7 +125,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data[ATTR_BOOT]
 
     @property
-    def auto_update(self) -> bool | None:
+    def auto_update(self) -> Optional[bool]:
         """Return if auto update is enable."""
         return None
 
@@ -155,22 +150,22 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data[ATTR_TIMEOUT]
 
     @property
-    def uuid(self) -> str | None:
+    def uuid(self) -> Optional[str]:
         """Return an API token for this add-on."""
         return None
 
     @property
-    def supervisor_token(self) -> str | None:
+    def supervisor_token(self) -> Optional[str]:
         """Return access token for Supervisor API."""
         return None
 
     @property
-    def ingress_token(self) -> str | None:
+    def ingress_token(self) -> Optional[str]:
         """Return access token for Supervisor API."""
         return None
 
     @property
-    def ingress_entry(self) -> str | None:
+    def ingress_entry(self) -> Optional[str]:
         """Return ingress external URL."""
         return None
 
@@ -180,7 +175,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data[ATTR_DESCRIPTON]
 
     @property
-    def long_description(self) -> str | None:
+    def long_description(self) -> Optional[str]:
         """Return README.md as long_description."""
         readme = Path(self.path_location, "README.md")
 
@@ -250,32 +245,32 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data.get(ATTR_DISCOVERY, [])
 
     @property
-    def ports_description(self) -> dict[str, str] | None:
+    def ports_description(self) -> Optional[dict[str, str]]:
         """Return descriptions of ports."""
         return self.data.get(ATTR_PORTS_DESCRIPTION)
 
     @property
-    def ports(self) -> dict[str, int | None] | None:
+    def ports(self) -> Optional[dict[str, Optional[int]]]:
         """Return ports of add-on."""
         return self.data.get(ATTR_PORTS)
 
     @property
-    def ingress_url(self) -> str | None:
+    def ingress_url(self) -> Optional[str]:
         """Return URL to ingress url."""
         return None
 
     @property
-    def webui(self) -> str | None:
+    def webui(self) -> Optional[str]:
         """Return URL to webui or None."""
         return self.data.get(ATTR_WEBUI)
 
     @property
-    def watchdog(self) -> str | None:
+    def watchdog(self) -> Optional[str]:
         """Return URL to for watchdog or None."""
         return self.data.get(ATTR_WATCHDOG)
 
     @property
-    def ingress_port(self) -> int | None:
+    def ingress_port(self) -> Optional[int]:
         """Return Ingress port."""
         return None
 
@@ -309,11 +304,6 @@ class AddonModel(CoreSysAttributes, ABC):
         """Return True if add-on run on host IPC namespace."""
         return self.data[ATTR_HOST_IPC]
 
-    @property
-    def host_uts(self) -> bool:
-        """Return True if add-on run on host UTS namespace."""
-        return self.data[ATTR_HOST_UTS]
-
     @property
     def host_dbus(self) -> bool:
         """Return True if add-on run on host D-BUS."""
@@ -325,7 +315,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return [Path(node) for node in self.data.get(ATTR_DEVICES, [])]
 
     @property
-    def environment(self) -> dict[str, str] | None:
+    def environment(self) -> Optional[dict[str, str]]:
         """Return environment of add-on."""
         return self.data.get(ATTR_ENVIRONMENT)
 
@@ -374,12 +364,12 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data.get(ATTR_BACKUP_EXCLUDE, [])
 
     @property
-    def backup_pre(self) -> str | None:
+    def backup_pre(self) -> Optional[str]:
         """Return pre-backup command."""
         return self.data.get(ATTR_BACKUP_PRE)
 
     @property
-    def backup_post(self) -> str | None:
+    def backup_post(self) -> Optional[str]:
         """Return post-backup command."""
         return self.data.get(ATTR_BACKUP_POST)
 
@@ -404,7 +394,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data[ATTR_INGRESS]
 
     @property
-    def ingress_panel(self) -> bool | None:
+    def ingress_panel(self) -> Optional[bool]:
         """Return True if the add-on access support ingress."""
         return None
 
@@ -454,7 +444,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data[ATTR_DEVICETREE]
 
     @property
-    def with_tmpfs(self) -> str | None:
+    def with_tmpfs(self) -> Optional[str]:
         """Return if tmp is in memory of add-on."""
         return self.data[ATTR_TMPFS]
 
@@ -474,12 +464,12 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data[ATTR_VIDEO]
 
     @property
-    def homeassistant_version(self) -> str | None:
+    def homeassistant_version(self) -> Optional[str]:
         """Return min Home Assistant version they needed by Add-on."""
         return self.data.get(ATTR_HOMEASSISTANT)
 
     @property
-    def url(self) -> str | None:
+    def url(self) -> Optional[str]:
         """Return URL of add-on."""
         return self.data.get(ATTR_URL)
 
@@ -514,15 +504,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return self.data.get(ATTR_MACHINE, [])
 
     @property
-    def arch(self) -> str:
-        """Return architecture to use for the addon's image."""
-        if ATTR_IMAGE in self.data:
-            return self.sys_arch.match(self.data[ATTR_ARCH])
-
-        return self.sys_arch.default
-
-    @property
-    def image(self) -> str | None:
+    def image(self) -> Optional[str]:
         """Generate image name from data."""
         return self._image(self.data)
 
@@ -583,7 +565,7 @@ class AddonModel(CoreSysAttributes, ABC):
         return AddonOptions(self.coresys, raw_schema, self.name, self.slug)
 
     @property
-    def schema_ui(self) -> list[dict[any, any]] | None:
+    def schema_ui(self) -> Optional[list[dict[any, any]]]:
         """Create a UI schema for add-on options."""
         raw_schema = self.data[ATTR_SCHEMA]
 
@@ -596,64 +578,31 @@ class AddonModel(CoreSysAttributes, ABC):
         """Return True if the add-on accesses the system journal."""
         return self.data[ATTR_JOURNALD]
 
-    @property
-    def signed(self) -> bool:
-        """Return True if the image is signed."""
-        return ATTR_CODENOTARY in self.data
-
-    @property
-    def codenotary(self) -> str | None:
-        """Return Signer email address for CAS."""
-        return self.data.get(ATTR_CODENOTARY)
-
-    def validate_availability(self) -> None:
-        """Validate if addon is available for current system."""
-        return self._validate_availability(self.data, logger=_LOGGER.error)
-
     def __eq__(self, other):
         """Compaired add-on objects."""
         if not isinstance(other, AddonModel):
             return False
         return self.slug == other.slug
 
-    def _validate_availability(
-        self, config, *, logger: Callable[..., None] | None = None
-    ) -> None:
-        """Validate if addon is available for current system."""
+    def _available(self, config) -> bool:
+        """Return True if this add-on is available on this platform."""
         # Architecture
         if not self.sys_arch.is_supported(config[ATTR_ARCH]):
-            raise AddonsNotSupportedError(
-                f"Add-on {self.slug} not supported on this platform, supported architectures: {', '.join(config[ATTR_ARCH])}",
-                logger,
-            )
+            return False
 
         # Machine / Hardware
         machine = config.get(ATTR_MACHINE)
-        if machine and (
-            f"!{self.sys_machine}" in machine or self.sys_machine not in machine
-        ):
-            raise AddonsNotSupportedError(
-                f"Add-on {self.slug} not supported on this machine, supported machine types: {', '.join(machine)}",
-                logger,
-            )
-
-        # Home Assistant
-        version: AwesomeVersion | None = config.get(ATTR_HOMEASSISTANT)
-        with suppress(AwesomeVersionException, TypeError):
-            if self.sys_homeassistant.version < version:
-                raise AddonsNotSupportedError(
-                    f"Add-on {self.slug} not supported on this system, requires Home Assistant version {version} or greater",
-                    logger,
-                )
-
-    def _available(self, config) -> bool:
-        """Return True if this add-on is available on this platform."""
-        try:
-            self._validate_availability(config)
-        except AddonsNotSupportedError:
+        if machine and f"!{self.sys_machine}" in machine:
+            return False
+        elif machine and self.sys_machine not in machine:
             return False
 
-        return True
+        # Home Assistant
+        version: Optional[AwesomeVersion] = config.get(ATTR_HOMEASSISTANT)
+        try:
+            return self.sys_homeassistant.version >= version
+        except (AwesomeVersionException, TypeError):
+            return True
 
     def _image(self, config) -> str:
         """Generate image name from data."""
@@ -673,7 +622,7 @@ class AddonModel(CoreSysAttributes, ABC):
         """Uninstall this add-on."""
         return self.sys_addons.uninstall(self.slug)
 
-    def update(self, backup: bool | None = False) -> Awaitable[None]:
+    def update(self, backup: Optional[bool] = False) -> Awaitable[None]:
         """Update this add-on."""
         return self.sys_addons.update(self.slug, backup=backup)
 

supervisor/addons/options.py

@@ -3,7 +3,7 @@ import hashlib
 import logging
 from pathlib import Path
 import re
-from typing import Any
+from typing import Any, Union
 
 import voluptuous as vol
 
@@ -293,7 +293,7 @@ class UiOptions(CoreSysAttributes):
         multiple: bool = False,
     ) -> None:
         """Validate a single element."""
-        ui_node: dict[str, str | bool | float | list[str]] = {"name": key}
+        ui_node: dict[str, Union[str, bool, float, list[str]]] = {"name": key}
 
         # If multiple
         if multiple:

supervisor/addons/utils.py

@@ -16,10 +16,10 @@ _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 def rating_security(addon: AddonModel) -> int:
-    """Return 1-8 for security rating.
+    """Return 1-6 for security rating.
 
     1 = not secure
-    8 = high secure
+    6 = high secure
     """
     rating = 5
 
@@ -35,10 +35,6 @@ def rating_security(addon: AddonModel) -> int:
     elif addon.access_auth_api:
         rating += 1
 
-    # Signed
-    if addon.signed:
-        rating += 1
-
     # Privileged options
     if (
         any(
@@ -70,15 +66,11 @@ def rating_security(addon: AddonModel) -> int:
     if addon.host_pid:
         rating += -2
 
-    # UTS host namespace allows to set hostname only with SYS_ADMIN
-    if addon.host_uts and Capabilities.SYS_ADMIN in addon.privileged:
-        rating += -1
-
     # Docker Access & full Access
     if addon.access_docker_api or addon.with_full_access:
         rating = 1
 
-    return max(min(8, rating), 1)
+    return max(min(6, rating), 1)
 
 
 async def remove_data(folder: Path) -> None:

supervisor/addons/validate.py

@@ -7,6 +7,8 @@ import uuid
 
 import voluptuous as vol
 
+from supervisor.addons.const import AddonBackupMode
+
 from ..const import (
     ARCH_ALL,
     ATTR_ACCESS_TOKEN,
@@ -41,7 +43,6 @@ from ..const import (
     ATTR_HOST_IPC,
     ATTR_HOST_NETWORK,
     ATTR_HOST_PID,
-    ATTR_HOST_UTS,
     ATTR_IMAGE,
     ATTR_INGRESS,
     ATTR_INGRESS_ENTRY,
@@ -109,7 +110,7 @@ from ..validate import (
     uuid_match,
     version_tag,
 )
-from .const import ATTR_BACKUP, ATTR_CODENOTARY, AddonBackupMode
+from .const import ATTR_BACKUP
 from .options import RE_SCHEMA_ELEMENT
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -284,7 +285,6 @@ _SCHEMA_ADDON_CONFIG = vol.Schema(
         vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
         vol.Optional(ATTR_HOST_PID, default=False): vol.Boolean(),
         vol.Optional(ATTR_HOST_IPC, default=False): vol.Boolean(),
-        vol.Optional(ATTR_HOST_UTS, default=False): vol.Boolean(),
         vol.Optional(ATTR_HOST_DBUS, default=False): vol.Boolean(),
         vol.Optional(ATTR_DEVICES): [str],
         vol.Optional(ATTR_UDEV, default=False): vol.Boolean(),
@@ -317,7 +317,6 @@ _SCHEMA_ADDON_CONFIG = vol.Schema(
         vol.Optional(ATTR_BACKUP, default=AddonBackupMode.HOT): vol.Coerce(
             AddonBackupMode
         ),
-        vol.Optional(ATTR_CODENOTARY): vol.Email(),
         vol.Optional(ATTR_OPTIONS, default={}): dict,
         vol.Optional(ATTR_SCHEMA, default={}): vol.Any(
             vol.Schema(
@@ -353,9 +352,8 @@ SCHEMA_ADDON_CONFIG = vol.All(
 # pylint: disable=no-value-for-parameter
 SCHEMA_BUILD_CONFIG = vol.Schema(
     {
-        vol.Optional(ATTR_BUILD_FROM, default=dict): vol.Any(
-            vol.Match(RE_DOCKER_IMAGE_BUILD),
-            vol.Schema({vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD)}),
+        vol.Optional(ATTR_BUILD_FROM, default=dict): vol.Schema(
+            {vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD)}
         ),
         vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
         vol.Optional(ATTR_ARGS, default=dict): vol.Schema({str: str}),

supervisor/api/__init__.py

@@ -1,14 +1,11 @@
 """Init file for Supervisor RESTful API."""
-from functools import partial
 import logging
 from pathlib import Path
-from typing import Any
+from typing import Optional
 
 from aiohttp import web
 
-from ..const import AddonState
 from ..coresys import CoreSys, CoreSysAttributes
-from ..exceptions import APIAddonNotInstalled
 from .addons import APIAddons
 from .audio import APIAudio
 from .auth import APIAuth
@@ -20,6 +17,7 @@ from .docker import APIDocker
 from .hardware import APIHardware
 from .homeassistant import APIHomeAssistant
 from .host import APIHost
+from .info import APIInfo
 from .ingress import APIIngress
 from .jobs import APIJobs
 from .middleware.security import SecurityMiddleware
@@ -29,18 +27,15 @@ from .observer import APIObserver
 from .os import APIOS
 from .proxy import APIProxy
 from .resolution import APIResoulution
-from .root import APIRoot
 from .security import APISecurity
 from .services import APIServices
 from .store import APIStore
 from .supervisor import APISupervisor
-from .utils import api_process
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
-MAX_CLIENT_SIZE: int = 1024**2 * 16
-MAX_LINE_SIZE: int = 24570
+MAX_CLIENT_SIZE: int = 1024 ** 2 * 16
 
 
 class RestAPI(CoreSysAttributes):
@@ -53,20 +48,14 @@ class RestAPI(CoreSysAttributes):
         self.webapp: web.Application = web.Application(
             client_max_size=MAX_CLIENT_SIZE,
             middlewares=[
-                self.security.block_bad_requests,
                 self.security.system_validation,
                 self.security.token_validation,
-                self.security.core_proxy,
             ],
-            handler_args={
-                "max_line_size": MAX_LINE_SIZE,
-                "max_field_size": MAX_LINE_SIZE,
-            },
         )
 
         # service stuff
         self._runner: web.AppRunner = web.AppRunner(self.webapp)
-        self._site: web.TCPSite | None = None
+        self._site: Optional[web.TCPSite] = None
 
     async def load(self) -> None:
         """Register REST API Calls."""
@@ -81,7 +70,7 @@ class RestAPI(CoreSysAttributes):
         self._register_hardware()
         self._register_homeassistant()
         self._register_host()
-        self._register_root()
+        self._register_info()
         self._register_ingress()
         self._register_multicast()
         self._register_network()
@@ -106,36 +95,16 @@ class RestAPI(CoreSysAttributes):
         self.webapp.add_routes(
             [
                 web.get("/host/info", api_host.info),
-                web.get("/host/logs", api_host.advanced_logs),
-                web.get(
-                    "/host/logs/follow",
-                    partial(api_host.advanced_logs, follow=True),
-                ),
-                web.get("/host/logs/identifiers", api_host.list_identifiers),
-                web.get("/host/logs/identifiers/{identifier}", api_host.advanced_logs),
-                web.get(
-                    "/host/logs/identifiers/{identifier}/follow",
-                    partial(api_host.advanced_logs, follow=True),
-                ),
-                web.get("/host/logs/boots", api_host.list_boots),
-                web.get("/host/logs/boots/{bootid}", api_host.advanced_logs),
-                web.get(
-                    "/host/logs/boots/{bootid}/follow",
-                    partial(api_host.advanced_logs, follow=True),
-                ),
-                web.get(
-                    "/host/logs/boots/{bootid}/identifiers/{identifier}",
-                    api_host.advanced_logs,
-                ),
-                web.get(
-                    "/host/logs/boots/{bootid}/identifiers/{identifier}/follow",
-                    partial(api_host.advanced_logs, follow=True),
-                ),
+                web.get("/host/logs", api_host.logs),
                 web.post("/host/reboot", api_host.reboot),
                 web.post("/host/shutdown", api_host.shutdown),
                 web.post("/host/reload", api_host.reload),
                 web.post("/host/options", api_host.options),
                 web.get("/host/services", api_host.services),
+                web.post("/host/services/{service}/stop", api_host.service_stop),
+                web.post("/host/services/{service}/start", api_host.service_start),
+                web.post("/host/services/{service}/restart", api_host.service_restart),
+                web.post("/host/services/{service}/reload", api_host.service_reload),
             ]
         )
 
@@ -181,15 +150,6 @@ class RestAPI(CoreSysAttributes):
             ]
         )
 
-        # Boards endpoints
-        self.webapp.add_routes(
-            [
-                web.get("/os/boards/yellow", api_os.boards_yellow_info),
-                web.post("/os/boards/yellow", api_os.boards_yellow_options),
-                web.get("/os/boards/{board}", api_os.boards_other_info),
-            ]
-        )
-
     def _register_security(self) -> None:
         """Register Security functions."""
         api_security = APISecurity()
@@ -199,7 +159,6 @@ class RestAPI(CoreSysAttributes):
             [
                 web.get("/security/info", api_security.info),
                 web.post("/security/options", api_security.options),
-                web.post("/security/integrity", api_security.integrity_check),
             ]
         )
 
@@ -269,21 +228,12 @@ class RestAPI(CoreSysAttributes):
             ]
         )
 
-    def _register_root(self) -> None:
-        """Register root functions."""
-        api_root = APIRoot()
-        api_root.coresys = self.coresys
+    def _register_info(self) -> None:
+        """Register info functions."""
+        api_info = APIInfo()
+        api_info.coresys = self.coresys
 
-        self.webapp.add_routes([web.get("/info", api_root.info)])
-        self.webapp.add_routes([web.post("/refresh_updates", api_root.refresh_updates)])
-        self.webapp.add_routes(
-            [web.get("/available_updates", api_root.available_updates)]
-        )
-
-        # Remove: 2023
-        self.webapp.add_routes(
-            [web.get("/supervisor/available_updates", api_root.available_updates)]
-        )
+        self.webapp.add_routes([web.get("/info", api_info.info)])
 
     def _register_resolution(self) -> None:
         """Register info functions."""
@@ -309,10 +259,6 @@ class RestAPI(CoreSysAttributes):
                     "/resolution/issue/{issue}",
                     api_resolution.dismiss_issue,
                 ),
-                web.get(
-                    "/resolution/issue/{issue}/suggestions",
-                    api_resolution.suggestions_for_issue,
-                ),
                 web.post("/resolution/healthcheck", api_resolution.healthcheck),
             ]
         )
@@ -338,6 +284,10 @@ class RestAPI(CoreSysAttributes):
 
         self.webapp.add_routes(
             [
+                web.get(
+                    "/supervisor/available_updates", api_supervisor.available_updates
+                ),
+                web.post("/refresh_updates", api_supervisor.reload),
                 web.get("/supervisor/ping", api_supervisor.ping),
                 web.get("/supervisor/info", api_supervisor.info),
                 web.get("/supervisor/stats", api_supervisor.stats),
@@ -367,22 +317,17 @@ class RestAPI(CoreSysAttributes):
                 web.post("/core/start", api_hass.start),
                 web.post("/core/check", api_hass.check),
                 web.post("/core/rebuild", api_hass.rebuild),
-            ]
-        )
-
-        # Reroute from legacy
-        self.webapp.add_routes(
-            [
+                # Remove with old Supervisor fallback
                 web.get("/homeassistant/info", api_hass.info),
                 web.get("/homeassistant/logs", api_hass.logs),
                 web.get("/homeassistant/stats", api_hass.stats),
                 web.post("/homeassistant/options", api_hass.options),
+                web.post("/homeassistant/update", api_hass.update),
                 web.post("/homeassistant/restart", api_hass.restart),
                 web.post("/homeassistant/stop", api_hass.stop),
                 web.post("/homeassistant/start", api_hass.start),
-                web.post("/homeassistant/update", api_hass.update),
-                web.post("/homeassistant/rebuild", api_hass.rebuild),
                 web.post("/homeassistant/check", api_hass.check),
+                web.post("/homeassistant/rebuild", api_hass.rebuild),
             ]
         )
 
@@ -399,12 +344,7 @@ class RestAPI(CoreSysAttributes):
                 web.post("/core/api/{path:.+}", api_proxy.api),
                 web.get("/core/api/{path:.+}", api_proxy.api),
                 web.get("/core/api/", api_proxy.api),
-            ]
-        )
-
-        # Reroute from legacy
-        self.webapp.add_routes(
-            [
+                # Remove with old Supervisor fallback
                 web.get("/homeassistant/api/websocket", api_proxy.websocket),
                 web.get("/homeassistant/websocket", api_proxy.websocket),
                 web.get("/homeassistant/api/stream", api_proxy.stream),
@@ -422,6 +362,8 @@ class RestAPI(CoreSysAttributes):
         self.webapp.add_routes(
             [
                 web.get("/addons", api_addons.list),
+                web.post("/addons/reload", api_addons.reload),
+                web.get("/addons/{addon}/info", api_addons.info),
                 web.post("/addons/{addon}/uninstall", api_addons.uninstall),
                 web.post("/addons/{addon}/start", api_addons.start),
                 web.post("/addons/{addon}/stop", api_addons.stop),
@@ -433,31 +375,16 @@ class RestAPI(CoreSysAttributes):
                 web.get("/addons/{addon}/options/config", api_addons.options_config),
                 web.post("/addons/{addon}/rebuild", api_addons.rebuild),
                 web.get("/addons/{addon}/logs", api_addons.logs),
+                web.get("/addons/{addon}/icon", api_addons.icon),
+                web.get("/addons/{addon}/logo", api_addons.logo),
+                web.get("/addons/{addon}/changelog", api_addons.changelog),
+                web.get("/addons/{addon}/documentation", api_addons.documentation),
                 web.post("/addons/{addon}/stdin", api_addons.stdin),
                 web.post("/addons/{addon}/security", api_addons.security),
                 web.get("/addons/{addon}/stats", api_addons.stats),
             ]
         )
 
-        # Legacy routing to support requests for not installed addons
-        api_store = APIStore()
-        api_store.coresys = self.coresys
-
-        @api_process
-        async def addons_addon_info(request: web.Request) -> dict[str, Any]:
-            """Route to store if info requested for not installed addon."""
-            try:
-                return await api_addons.info(request)
-            except APIAddonNotInstalled:
-                # Route to store/{addon}/info but add missing fields
-                return dict(
-                    await api_store.addons_addon_info_wrapped(request),
-                    state=AddonState.UNKNOWN,
-                    options=self.sys_addons.store[request.match_info["addon"]].options,
-                )
-
-        self.webapp.add_routes([web.get("/addons/{addon}/info", addons_addon_info)])
-
     def _register_ingress(self) -> None:
         """Register Ingress functions."""
         api_ingress = APIIngress()
@@ -479,14 +406,27 @@ class RestAPI(CoreSysAttributes):
 
         self.webapp.add_routes(
             [
+                web.get("/snapshots", api_backups.list),
+                web.post("/snapshots/reload", api_backups.reload),
+                web.post("/snapshots/new/full", api_backups.backup_full),
+                web.post("/snapshots/new/partial", api_backups.backup_partial),
+                web.post("/snapshots/new/upload", api_backups.upload),
+                web.get("/snapshots/{slug}/info", api_backups.info),
+                web.delete("/snapshots/{slug}", api_backups.remove),
+                web.post("/snapshots/{slug}/restore/full", api_backups.restore_full),
+                web.post(
+                    "/snapshots/{slug}/restore/partial",
+                    api_backups.restore_partial,
+                ),
+                web.get("/snapshots/{slug}/download", api_backups.download),
+                web.post("/snapshots/{slug}/remove", api_backups.remove),
+                # June 2021: /snapshots was renamed to /backups
                 web.get("/backups", api_backups.list),
-                web.get("/backups/info", api_backups.info),
-                web.post("/backups/options", api_backups.options),
                 web.post("/backups/reload", api_backups.reload),
                 web.post("/backups/new/full", api_backups.backup_full),
                 web.post("/backups/new/partial", api_backups.backup_partial),
                 web.post("/backups/new/upload", api_backups.upload),
-                web.get("/backups/{slug}/info", api_backups.backup_info),
+                web.get("/backups/{slug}/info", api_backups.info),
                 web.delete("/backups/{slug}", api_backups.remove),
                 web.post("/backups/{slug}/restore/full", api_backups.restore_full),
                 web.post(
@@ -546,8 +486,6 @@ class RestAPI(CoreSysAttributes):
         """Register Audio functions."""
         api_audio = APIAudio()
         api_audio.coresys = self.coresys
-        api_host = APIHost()
-        api_host.coresys = self.coresys
 
         self.webapp.add_routes(
             [
@@ -577,15 +515,6 @@ class RestAPI(CoreSysAttributes):
                 web.get("/store/addons", api_store.addons_list),
                 web.get("/store/addons/{addon}", api_store.addons_addon_info),
                 web.get("/store/addons/{addon}/{version}", api_store.addons_addon_info),
-                web.get("/store/addons/{addon}/icon", api_store.addons_addon_icon),
-                web.get("/store/addons/{addon}/logo", api_store.addons_addon_logo),
-                web.get(
-                    "/store/addons/{addon}/changelog", api_store.addons_addon_changelog
-                ),
-                web.get(
-                    "/store/addons/{addon}/documentation",
-                    api_store.addons_addon_documentation,
-                ),
                 web.post(
                     "/store/addons/{addon}/install", api_store.addons_addon_install
                 ),
@@ -604,26 +533,14 @@ class RestAPI(CoreSysAttributes):
                     "/store/repositories/{repository}",
                     api_store.repositories_repository_info,
                 ),
-                web.post("/store/repositories", api_store.add_repository),
-                web.delete(
-                    "/store/repositories/{repository}", api_store.remove_repository
-                ),
             ]
         )
 
         # Reroute from legacy
         self.webapp.add_routes(
             [
-                web.post("/addons/reload", api_store.reload),
                 web.post("/addons/{addon}/install", api_store.addons_addon_install),
                 web.post("/addons/{addon}/update", api_store.addons_addon_update),
-                web.get("/addons/{addon}/icon", api_store.addons_addon_icon),
-                web.get("/addons/{addon}/logo", api_store.addons_addon_logo),
-                web.get("/addons/{addon}/changelog", api_store.addons_addon_changelog),
-                web.get(
-                    "/addons/{addon}/documentation",
-                    api_store.addons_addon_documentation,
-                ),
             ]
         )
 

supervisor/api/addons.py

@@ -1,8 +1,7 @@
 """Init file for Supervisor Home Assistant RESTful API."""
 import asyncio
-from collections.abc import Awaitable
 import logging
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import voluptuous as vol
@@ -46,7 +45,6 @@ from ..const import (
     ATTR_HOST_IPC,
     ATTR_HOST_NETWORK,
     ATTR_HOST_PID,
-    ATTR_HOST_UTS,
     ATTR_HOSTNAME,
     ATTR_ICON,
     ATTR_INGRESS,
@@ -54,11 +52,13 @@ from ..const import (
     ATTR_INGRESS_PANEL,
     ATTR_INGRESS_PORT,
     ATTR_INGRESS_URL,
+    ATTR_INSTALLED,
     ATTR_IP_ADDRESS,
     ATTR_KERNEL_MODULES,
     ATTR_LOGO,
     ATTR_LONG_DESCRIPTION,
     ATTR_MACHINE,
+    ATTR_MAINTAINER,
     ATTR_MEMORY_LIMIT,
     ATTR_MEMORY_PERCENT,
     ATTR_MEMORY_USAGE,
@@ -73,10 +73,12 @@ from ..const import (
     ATTR_PROTECTED,
     ATTR_PWNED,
     ATTR_RATING,
+    ATTR_REPOSITORIES,
     ATTR_REPOSITORY,
     ATTR_SCHEMA,
     ATTR_SERVICES,
     ATTR_SLUG,
+    ATTR_SOURCE,
     ATTR_STAGE,
     ATTR_STARTUP,
     ATTR_STATE,
@@ -93,20 +95,17 @@ from ..const import (
     ATTR_VIDEO,
     ATTR_WATCHDOG,
     ATTR_WEBUI,
+    CONTENT_TYPE_BINARY,
+    CONTENT_TYPE_PNG,
+    CONTENT_TYPE_TEXT,
     REQUEST_FROM,
     AddonBoot,
+    AddonState,
 )
 from ..coresys import CoreSysAttributes
 from ..docker.stats import DockerStats
-from ..exceptions import (
-    APIAddonNotInstalled,
-    APIError,
-    APIForbidden,
-    PwnedError,
-    PwnedSecret,
-)
+from ..exceptions import APIError, APIForbidden, PwnedError, PwnedSecret
 from ..validate import docker_ports
-from .const import ATTR_SIGNED, CONTENT_TYPE_BINARY
 from .utils import api_process, api_process_raw, api_validate, json_loads
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -133,7 +132,7 @@ SCHEMA_SECURITY = vol.Schema({vol.Optional(ATTR_PROTECTED): vol.Boolean()})
 class APIAddons(CoreSysAttributes):
     """Handle RESTful API for add-on functions."""
 
-    def _extract_addon(self, request: web.Request) -> Addon:
+    def _extract_addon(self, request: web.Request) -> AnyAddon:
         """Return addon, throw an exception it it doesn't exist."""
         addon_slug: str = request.match_info.get("addon")
 
@@ -147,11 +146,15 @@ class APIAddons(CoreSysAttributes):
         addon = self.sys_addons.get(addon_slug)
         if not addon:
             raise APIError(f"Addon {addon_slug} does not exist")
-        if not isinstance(addon, Addon) or not addon.is_installed:
-            raise APIAddonNotInstalled("Addon is not installed")
 
         return addon
 
+    def _extract_addon_installed(self, request: web.Request) -> Addon:
+        addon = self._extract_addon(request)
+        if not isinstance(addon, Addon) or not addon.is_installed:
+            raise APIError("Addon is not installed")
+        return addon
+
     @api_process
     async def list(self, request: web.Request) -> dict[str, Any]:
         """Return all add-ons or repositories."""
@@ -162,29 +165,42 @@ class APIAddons(CoreSysAttributes):
                 ATTR_DESCRIPTON: addon.description,
                 ATTR_ADVANCED: addon.advanced,
                 ATTR_STAGE: addon.stage,
-                ATTR_VERSION: addon.version,
+                ATTR_VERSION: addon.version if addon.is_installed else None,
                 ATTR_VERSION_LATEST: addon.latest_version,
-                ATTR_UPDATE_AVAILABLE: addon.need_update,
+                ATTR_UPDATE_AVAILABLE: addon.need_update
+                if addon.is_installed
+                else False,
+                ATTR_INSTALLED: addon.is_installed,
                 ATTR_AVAILABLE: addon.available,
                 ATTR_DETACHED: addon.is_detached,
                 ATTR_HOMEASSISTANT: addon.homeassistant_version,
-                ATTR_STATE: addon.state,
                 ATTR_REPOSITORY: addon.repository,
                 ATTR_BUILD: addon.need_build,
                 ATTR_URL: addon.url,
                 ATTR_ICON: addon.with_icon,
                 ATTR_LOGO: addon.with_logo,
             }
-            for addon in self.sys_addons.installed
+            for addon in self.sys_addons.all
         ]
 
-        return {ATTR_ADDONS: data_addons}
+        data_repositories = [
+            {
+                ATTR_SLUG: repository.slug,
+                ATTR_NAME: repository.name,
+                ATTR_SOURCE: repository.source,
+                ATTR_URL: repository.url,
+                ATTR_MAINTAINER: repository.maintainer,
+            }
+            for repository in self.sys_store.all
+        ]
+        return {ATTR_ADDONS: data_addons, ATTR_REPOSITORIES: data_repositories}
 
     @api_process
     async def reload(self, request: web.Request) -> None:
         """Reload all add-on data from store."""
         await asyncio.shield(self.sys_store.reload())
 
+    @api_process
     async def info(self, request: web.Request) -> dict[str, Any]:
         """Return add-on information."""
         addon: AnyAddon = self._extract_addon(request)
@@ -198,8 +214,11 @@ class APIAddons(CoreSysAttributes):
             ATTR_LONG_DESCRIPTION: addon.long_description,
             ATTR_ADVANCED: addon.advanced,
             ATTR_STAGE: addon.stage,
+            ATTR_AUTO_UPDATE: None,
             ATTR_REPOSITORY: addon.repository,
+            ATTR_VERSION: None,
             ATTR_VERSION_LATEST: addon.latest_version,
+            ATTR_UPDATE_AVAILABLE: False,
             ATTR_PROTECTED: addon.protected,
             ATTR_RATING: rating_security(addon),
             ATTR_BOOT: addon.boot,
@@ -209,6 +228,7 @@ class APIAddons(CoreSysAttributes):
             ATTR_MACHINE: addon.supported_machine,
             ATTR_HOMEASSISTANT: addon.homeassistant_version,
             ATTR_URL: addon.url,
+            ATTR_STATE: AddonState.UNKNOWN,
             ATTR_DETACHED: addon.is_detached,
             ATTR_AVAILABLE: addon.available,
             ATTR_BUILD: addon.need_build,
@@ -217,16 +237,17 @@ class APIAddons(CoreSysAttributes):
             ATTR_HOST_NETWORK: addon.host_network,
             ATTR_HOST_PID: addon.host_pid,
             ATTR_HOST_IPC: addon.host_ipc,
-            ATTR_HOST_UTS: addon.host_uts,
             ATTR_HOST_DBUS: addon.host_dbus,
             ATTR_PRIVILEGED: addon.privileged,
             ATTR_FULL_ACCESS: addon.with_full_access,
             ATTR_APPARMOR: addon.apparmor,
+            ATTR_DEVICES: addon.static_devices,
             ATTR_ICON: addon.with_icon,
             ATTR_LOGO: addon.with_logo,
             ATTR_CHANGELOG: addon.with_changelog,
             ATTR_DOCUMENTATION: addon.with_documentation,
             ATTR_STDIN: addon.with_stdin,
+            ATTR_WEBUI: None,
             ATTR_HASSIO_API: addon.access_hassio_api,
             ATTR_HASSIO_ROLE: addon.hassio_role,
             ATTR_AUTH_API: addon.access_auth_api,
@@ -240,35 +261,48 @@ class APIAddons(CoreSysAttributes):
             ATTR_DOCKER_API: addon.access_docker_api,
             ATTR_VIDEO: addon.with_video,
             ATTR_AUDIO: addon.with_audio,
+            ATTR_AUDIO_INPUT: None,
+            ATTR_AUDIO_OUTPUT: None,
             ATTR_STARTUP: addon.startup,
             ATTR_SERVICES: _pretty_services(addon),
             ATTR_DISCOVERY: addon.discovery,
+            ATTR_IP_ADDRESS: None,
             ATTR_TRANSLATIONS: addon.translations,
             ATTR_INGRESS: addon.with_ingress,
-            ATTR_SIGNED: addon.signed,
-            ATTR_STATE: addon.state,
-            ATTR_WEBUI: addon.webui,
-            ATTR_INGRESS_ENTRY: addon.ingress_entry,
-            ATTR_INGRESS_URL: addon.ingress_url,
-            ATTR_INGRESS_PORT: addon.ingress_port,
-            ATTR_INGRESS_PANEL: addon.ingress_panel,
-            ATTR_AUDIO_INPUT: addon.audio_input,
-            ATTR_AUDIO_OUTPUT: addon.audio_output,
-            ATTR_AUTO_UPDATE: addon.auto_update,
-            ATTR_IP_ADDRESS: str(addon.ip_address),
-            ATTR_VERSION: addon.version,
-            ATTR_UPDATE_AVAILABLE: addon.need_update,
-            ATTR_WATCHDOG: addon.watchdog,
-            ATTR_DEVICES: addon.static_devices
-            + [device.path for device in addon.devices],
+            ATTR_INGRESS_ENTRY: None,
+            ATTR_INGRESS_URL: None,
+            ATTR_INGRESS_PORT: None,
+            ATTR_INGRESS_PANEL: None,
+            ATTR_WATCHDOG: None,
         }
 
+        if isinstance(addon, Addon) and addon.is_installed:
+            data.update(
+                {
+                    ATTR_STATE: addon.state,
+                    ATTR_WEBUI: addon.webui,
+                    ATTR_INGRESS_ENTRY: addon.ingress_entry,
+                    ATTR_INGRESS_URL: addon.ingress_url,
+                    ATTR_INGRESS_PORT: addon.ingress_port,
+                    ATTR_INGRESS_PANEL: addon.ingress_panel,
+                    ATTR_AUDIO_INPUT: addon.audio_input,
+                    ATTR_AUDIO_OUTPUT: addon.audio_output,
+                    ATTR_AUTO_UPDATE: addon.auto_update,
+                    ATTR_IP_ADDRESS: str(addon.ip_address),
+                    ATTR_VERSION: addon.version,
+                    ATTR_UPDATE_AVAILABLE: addon.need_update,
+                    ATTR_WATCHDOG: addon.watchdog,
+                    ATTR_DEVICES: addon.static_devices
+                    + [device.path for device in addon.devices],
+                }
+            )
+
         return data
 
     @api_process
     async def options(self, request: web.Request) -> None:
         """Store user options for add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
 
         # Update secrets for validation
         await self.sys_homeassistant.secrets.reload()
@@ -303,7 +337,7 @@ class APIAddons(CoreSysAttributes):
     @api_process
     async def options_validate(self, request: web.Request) -> None:
         """Validate user options for add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         data = {ATTR_MESSAGE: "", ATTR_VALID: True, ATTR_PWNED: False}
 
         options = await request.json(loads=json_loads) or addon.options
@@ -345,7 +379,7 @@ class APIAddons(CoreSysAttributes):
         slug: str = request.match_info.get("addon")
         if slug != "self":
             raise APIForbidden("This can be only read by the Add-on itself!")
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
 
         # Lookup/reload secrets
         await self.sys_homeassistant.secrets.reload()
@@ -357,7 +391,7 @@ class APIAddons(CoreSysAttributes):
     @api_process
     async def security(self, request: web.Request) -> None:
         """Store security options for add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         body: dict[str, Any] = await api_validate(SCHEMA_SECURITY, request)
 
         if ATTR_PROTECTED in body:
@@ -369,7 +403,7 @@ class APIAddons(CoreSysAttributes):
     @api_process
     async def stats(self, request: web.Request) -> dict[str, Any]:
         """Return resource information."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
 
         stats: DockerStats = await addon.stats()
 
@@ -387,43 +421,83 @@ class APIAddons(CoreSysAttributes):
     @api_process
     def uninstall(self, request: web.Request) -> Awaitable[None]:
         """Uninstall add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         return asyncio.shield(addon.uninstall())
 
     @api_process
     def start(self, request: web.Request) -> Awaitable[None]:
         """Start add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         return asyncio.shield(addon.start())
 
     @api_process
     def stop(self, request: web.Request) -> Awaitable[None]:
         """Stop add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         return asyncio.shield(addon.stop())
 
     @api_process
     def restart(self, request: web.Request) -> Awaitable[None]:
         """Restart add-on."""
-        addon: Addon = self._extract_addon(request)
+        addon: Addon = self._extract_addon_installed(request)
         return asyncio.shield(addon.restart())
 
     @api_process
     def rebuild(self, request: web.Request) -> Awaitable[None]:
         """Rebuild local build add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         return asyncio.shield(addon.rebuild())
 
     @api_process_raw(CONTENT_TYPE_BINARY)
     def logs(self, request: web.Request) -> Awaitable[bytes]:
         """Return logs from add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         return addon.logs()
 
+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def icon(self, request: web.Request) -> bytes:
+        """Return icon from add-on."""
+        addon = self._extract_addon(request)
+        if not addon.with_icon:
+            raise APIError(f"No icon found for add-on {addon.slug}!")
+
+        with addon.path_icon.open("rb") as png:
+            return png.read()
+
+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def logo(self, request: web.Request) -> bytes:
+        """Return logo from add-on."""
+        addon = self._extract_addon(request)
+        if not addon.with_logo:
+            raise APIError(f"No logo found for add-on {addon.slug}!")
+
+        with addon.path_logo.open("rb") as png:
+            return png.read()
+
+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def changelog(self, request: web.Request) -> str:
+        """Return changelog from add-on."""
+        addon = self._extract_addon(request)
+        if not addon.with_changelog:
+            raise APIError(f"No changelog found for add-on {addon.slug}!")
+
+        with addon.path_changelog.open("r") as changelog:
+            return changelog.read()
+
+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def documentation(self, request: web.Request) -> str:
+        """Return documentation from add-on."""
+        addon = self._extract_addon(request)
+        if not addon.with_documentation:
+            raise APIError(f"No documentation found for add-on {addon.slug}!")
+
+        with addon.path_documentation.open("r") as documentation:
+            return documentation.read()
+
     @api_process
     async def stdin(self, request: web.Request) -> None:
         """Write to stdin of add-on."""
-        addon = self._extract_addon(request)
+        addon = self._extract_addon_installed(request)
         if not addon.with_stdin:
             raise APIError(f"STDIN not supported the {addon.slug} add-on")
 
@@ -431,6 +505,6 @@ class APIAddons(CoreSysAttributes):
         await asyncio.shield(addon.write_stdin(data))
 
 
-def _pretty_services(addon: Addon) -> list[str]:
+def _pretty_services(addon: AnyAddon) -> list[str]:
     """Return a simplified services role list."""
     return [f"{name}:{access}" for name, access in addon.services_role.items()]

supervisor/api/audio.py

@@ -1,8 +1,7 @@
 """Init file for Supervisor Audio RESTful API."""
 import asyncio
-from collections.abc import Awaitable
 import logging
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import attr
@@ -30,12 +29,12 @@ from ..const import (
     ATTR_VERSION,
     ATTR_VERSION_LATEST,
     ATTR_VOLUME,
+    CONTENT_TYPE_BINARY,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
 from ..host.sound import StreamType
 from ..validate import version_tag
-from .const import CONTENT_TYPE_BINARY
 from .utils import api_process, api_process_raw, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/api/auth.py

@@ -8,10 +8,15 @@ from aiohttp.web_exceptions import HTTPUnauthorized
 import voluptuous as vol
 
 from ..addons.addon import Addon
-from ..const import ATTR_PASSWORD, ATTR_USERNAME, REQUEST_FROM
+from ..const import (
+    ATTR_PASSWORD,
+    ATTR_USERNAME,
+    CONTENT_TYPE_JSON,
+    CONTENT_TYPE_URL,
+    REQUEST_FROM,
+)
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIForbidden
-from .const import CONTENT_TYPE_JSON, CONTENT_TYPE_URL
 from .utils import api_process, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/api/backups.py

@@ -9,14 +9,12 @@ from aiohttp import web
 from aiohttp.hdrs import CONTENT_DISPOSITION
 import voluptuous as vol
 
-from ..backups.validate import ALL_FOLDERS, FOLDER_HOMEASSISTANT, days_until_stale
+from ..backups.validate import ALL_FOLDERS
 from ..const import (
     ATTR_ADDONS,
     ATTR_BACKUPS,
-    ATTR_COMPRESSED,
     ATTR_CONTENT,
     ATTR_DATE,
-    ATTR_DAYS_UNTIL_STALE,
     ATTR_FOLDERS,
     ATTR_HOMEASSISTANT,
     ATTR_NAME,
@@ -25,30 +23,25 @@ from ..const import (
     ATTR_REPOSITORIES,
     ATTR_SIZE,
     ATTR_SLUG,
-    ATTR_SUPERVISOR_VERSION,
     ATTR_TYPE,
     ATTR_VERSION,
+    CONTENT_TYPE_TAR,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
-from .const import CONTENT_TYPE_TAR
 from .utils import api_process, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 RE_SLUGIFY_NAME = re.compile(r"[^A-Za-z0-9]+")
 
-# Backwards compatible
-# Remove: 2022.08
-_ALL_FOLDERS = ALL_FOLDERS + [FOLDER_HOMEASSISTANT]
-
 # pylint: disable=no-value-for-parameter
 SCHEMA_RESTORE_PARTIAL = vol.Schema(
     {
         vol.Optional(ATTR_PASSWORD): vol.Maybe(str),
         vol.Optional(ATTR_HOMEASSISTANT): vol.Boolean(),
         vol.Optional(ATTR_ADDONS): vol.All([str], vol.Unique()),
-        vol.Optional(ATTR_FOLDERS): vol.All([vol.In(_ALL_FOLDERS)], vol.Unique()),
+        vol.Optional(ATTR_FOLDERS): vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
     }
 )
 
@@ -58,24 +51,17 @@ SCHEMA_BACKUP_FULL = vol.Schema(
     {
         vol.Optional(ATTR_NAME): str,
         vol.Optional(ATTR_PASSWORD): vol.Maybe(str),
-        vol.Optional(ATTR_COMPRESSED): vol.Maybe(vol.Boolean()),
     }
 )
 
 SCHEMA_BACKUP_PARTIAL = SCHEMA_BACKUP_FULL.extend(
     {
         vol.Optional(ATTR_ADDONS): vol.All([str], vol.Unique()),
-        vol.Optional(ATTR_FOLDERS): vol.All([vol.In(_ALL_FOLDERS)], vol.Unique()),
+        vol.Optional(ATTR_FOLDERS): vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
         vol.Optional(ATTR_HOMEASSISTANT): vol.Boolean(),
     }
 )
 
-SCHEMA_OPTIONS = vol.Schema(
-    {
-        vol.Optional(ATTR_DAYS_UNTIL_STALE): days_until_stale,
-    }
-)
-
 
 class APIBackups(CoreSysAttributes):
     """Handle RESTful API for backups functions."""
@@ -87,30 +73,26 @@ class APIBackups(CoreSysAttributes):
             raise APIError("Backup does not exist")
         return backup
 
-    def _list_backups(self):
-        """Return list of backups."""
-        return [
-            {
-                ATTR_SLUG: backup.slug,
-                ATTR_NAME: backup.name,
-                ATTR_DATE: backup.date,
-                ATTR_TYPE: backup.sys_type,
-                ATTR_SIZE: backup.size,
-                ATTR_PROTECTED: backup.protected,
-                ATTR_COMPRESSED: backup.compressed,
-                ATTR_CONTENT: {
-                    ATTR_HOMEASSISTANT: backup.homeassistant_version is not None,
-                    ATTR_ADDONS: backup.addon_list,
-                    ATTR_FOLDERS: backup.folders,
-                },
-            }
-            for backup in self.sys_backups.list_backups
-        ]
-
     @api_process
     async def list(self, request):
         """Return backup list."""
-        data_backups = self._list_backups()
+        data_backups = []
+        for backup in self.sys_backups.list_backups:
+            data_backups.append(
+                {
+                    ATTR_SLUG: backup.slug,
+                    ATTR_NAME: backup.name,
+                    ATTR_DATE: backup.date,
+                    ATTR_TYPE: backup.sys_type,
+                    ATTR_SIZE: backup.size,
+                    ATTR_PROTECTED: backup.protected,
+                    ATTR_CONTENT: {
+                        ATTR_HOMEASSISTANT: backup.homeassistant_version is not None,
+                        ATTR_ADDONS: backup.addon_list,
+                        ATTR_FOLDERS: backup.folders,
+                    },
+                }
+            )
 
         if request.path == "/snapshots":
             # Kept for backwards compability
@@ -118,24 +100,6 @@ class APIBackups(CoreSysAttributes):
 
         return {ATTR_BACKUPS: data_backups}
 
-    @api_process
-    async def info(self, request):
-        """Return backup list and manager info."""
-        return {
-            ATTR_BACKUPS: self._list_backups(),
-            ATTR_DAYS_UNTIL_STALE: self.sys_backups.days_until_stale,
-        }
-
-    @api_process
-    async def options(self, request):
-        """Set backup manager options."""
-        body = await api_validate(SCHEMA_OPTIONS, request)
-
-        if ATTR_DAYS_UNTIL_STALE in body:
-            self.sys_backups.days_until_stale = body[ATTR_DAYS_UNTIL_STALE]
-
-        self.sys_backups.save_data()
-
     @api_process
     async def reload(self, request):
         """Reload backup list."""
@@ -143,7 +107,7 @@ class APIBackups(CoreSysAttributes):
         return True
 
     @api_process
-    async def backup_info(self, request):
+    async def info(self, request):
         """Return backup info."""
         backup = self._extract_slug(request)
 
@@ -164,9 +128,7 @@ class APIBackups(CoreSysAttributes):
             ATTR_NAME: backup.name,
             ATTR_DATE: backup.date,
             ATTR_SIZE: backup.size,
-            ATTR_COMPRESSED: backup.compressed,
             ATTR_PROTECTED: backup.protected,
-            ATTR_SUPERVISOR_VERSION: backup.supervisor_version,
             ATTR_HOMEASSISTANT: backup.homeassistant_version,
             ATTR_ADDONS: data_addons,
             ATTR_REPOSITORIES: backup.repositories,

supervisor/api/const.py

@@ -1,52 +1,15 @@
 """Const for API."""
 
-CONTENT_TYPE_BINARY = "application/octet-stream"
-CONTENT_TYPE_JSON = "application/json"
-CONTENT_TYPE_PNG = "image/png"
-CONTENT_TYPE_TAR = "application/tar"
-CONTENT_TYPE_TEXT = "text/plain"
-CONTENT_TYPE_URL = "application/x-www-form-urlencoded"
-
-COOKIE_INGRESS = "ingress_session"
-
 ATTR_AGENT_VERSION = "agent_version"
-ATTR_APPARMOR_VERSION = "apparmor_version"
-ATTR_ATTRIBUTES = "attributes"
-ATTR_AVAILABLE_UPDATES = "available_updates"
 ATTR_BOOT_TIMESTAMP = "boot_timestamp"
-ATTR_BOOTS = "boots"
-ATTR_BROADCAST_LLMNR = "broadcast_llmnr"
-ATTR_BROADCAST_MDNS = "broadcast_mdns"
-ATTR_BY_ID = "by_id"
-ATTR_CHILDREN = "children"
-ATTR_CONNECTION_BUS = "connection_bus"
 ATTR_DATA_DISK = "data_disk"
 ATTR_DEVICE = "device"
-ATTR_DEV_PATH = "dev_path"
-ATTR_DISK_LED = "disk_led"
-ATTR_DRIVES = "drives"
 ATTR_DT_SYNCHRONIZED = "dt_synchronized"
 ATTR_DT_UTC = "dt_utc"
-ATTR_EJECTABLE = "ejectable"
-ATTR_FALLBACK = "fallback"
-ATTR_FILESYSTEMS = "filesystems"
-ATTR_HEARTBEAT_LED = "heartbeat_led"
-ATTR_IDENTIFIERS = "identifiers"
-ATTR_LLMNR = "llmnr"
-ATTR_LLMNR_HOSTNAME = "llmnr_hostname"
-ATTR_MDNS = "mdns"
-ATTR_MODEL = "model"
-ATTR_MOUNT_POINTS = "mount_points"
-ATTR_PANEL_PATH = "panel_path"
-ATTR_POWER_LED = "power_led"
-ATTR_REMOVABLE = "removable"
-ATTR_REVISION = "revision"
-ATTR_SEAT = "seat"
-ATTR_SIGNED = "signed"
 ATTR_STARTUP_TIME = "startup_time"
-ATTR_SUBSYSTEM = "subsystem"
-ATTR_SYSFS = "sysfs"
-ATTR_TIME_DETECTED = "time_detected"
-ATTR_UPDATE_TYPE = "update_type"
 ATTR_USE_NTP = "use_ntp"
-ATTR_VENDOR = "vendor"
+ATTR_USE_RTC = "use_rtc"
+ATTR_APPARMOR_VERSION = "apparmor_version"
+ATTR_PANEL_PATH = "panel_path"
+ATTR_UPDATE_TYPE = "update_type"
+ATTR_AVAILABLE_UPDATES = "available_updates"

supervisor/api/dns.py

@@ -1,8 +1,7 @@
 """Init file for Supervisor DNS RESTful API."""
 import asyncio
-from collections.abc import Awaitable
 import logging
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import voluptuous as vol
@@ -22,22 +21,17 @@ from ..const import (
     ATTR_UPDATE_AVAILABLE,
     ATTR_VERSION,
     ATTR_VERSION_LATEST,
+    CONTENT_TYPE_BINARY,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
 from ..validate import dns_server_list, version_tag
-from .const import ATTR_FALLBACK, ATTR_LLMNR, ATTR_MDNS, CONTENT_TYPE_BINARY
 from .utils import api_process, api_process_raw, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 # pylint: disable=no-value-for-parameter
-SCHEMA_OPTIONS = vol.Schema(
-    {
-        vol.Optional(ATTR_SERVERS): dns_server_list,
-        vol.Optional(ATTR_FALLBACK): vol.Boolean(),
-    }
-)
+SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_SERVERS): dns_server_list})
 
 SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): version_tag})
 
@@ -55,26 +49,15 @@ class APICoreDNS(CoreSysAttributes):
             ATTR_HOST: str(self.sys_docker.network.dns),
             ATTR_SERVERS: self.sys_plugins.dns.servers,
             ATTR_LOCALS: self.sys_plugins.dns.locals,
-            ATTR_MDNS: self.sys_plugins.dns.mdns,
-            ATTR_LLMNR: self.sys_plugins.dns.llmnr,
-            ATTR_FALLBACK: self.sys_plugins.dns.fallback,
         }
 
     @api_process
     async def options(self, request: web.Request) -> None:
         """Set DNS options."""
         body = await api_validate(SCHEMA_OPTIONS, request)
-        restart_required = False
 
         if ATTR_SERVERS in body:
             self.sys_plugins.dns.servers = body[ATTR_SERVERS]
-            restart_required = True
-
-        if ATTR_FALLBACK in body:
-            self.sys_plugins.dns.fallback = body[ATTR_FALLBACK]
-            restart_required = True
-
-        if restart_required:
             self.sys_create_task(self.sys_plugins.dns.restart())
 
         self.sys_plugins.dns.save_data()

supervisor/api/hardware.py

@@ -4,49 +4,23 @@ from typing import Any
 
 from aiohttp import web
 
-from ..const import (
-    ATTR_AUDIO,
-    ATTR_DEVICES,
-    ATTR_ID,
-    ATTR_INPUT,
-    ATTR_NAME,
-    ATTR_OUTPUT,
-    ATTR_SERIAL,
-    ATTR_SIZE,
-    ATTR_SYSTEM,
-)
+from ..const import ATTR_AUDIO, ATTR_DEVICES, ATTR_INPUT, ATTR_NAME, ATTR_OUTPUT
 from ..coresys import CoreSysAttributes
-from ..dbus.udisks2 import UDisks2
-from ..dbus.udisks2.block import UDisks2Block
-from ..dbus.udisks2.drive import UDisks2Drive
-from ..hardware.data import Device
-from .const import (
+from ..hardware.const import (
     ATTR_ATTRIBUTES,
     ATTR_BY_ID,
-    ATTR_CHILDREN,
-    ATTR_CONNECTION_BUS,
     ATTR_DEV_PATH,
-    ATTR_DEVICE,
-    ATTR_DRIVES,
-    ATTR_EJECTABLE,
-    ATTR_FILESYSTEMS,
-    ATTR_MODEL,
-    ATTR_MOUNT_POINTS,
-    ATTR_REMOVABLE,
-    ATTR_REVISION,
-    ATTR_SEAT,
     ATTR_SUBSYSTEM,
     ATTR_SYSFS,
-    ATTR_TIME_DETECTED,
-    ATTR_VENDOR,
 )
+from ..hardware.data import Device
 from .utils import api_process
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 def device_struct(device: Device) -> dict[str, Any]:
-    """Return a dict with information of a interface to be used in the API."""
+    """Return a dict with information of a interface to be used in th API."""
     return {
         ATTR_NAME: device.name,
         ATTR_SYSFS: device.sysfs,
@@ -54,43 +28,6 @@ def device_struct(device: Device) -> dict[str, Any]:
         ATTR_SUBSYSTEM: device.subsystem,
         ATTR_BY_ID: device.by_id,
         ATTR_ATTRIBUTES: device.attributes,
-        ATTR_CHILDREN: device.children,
-    }
-
-
-def filesystem_struct(fs_block: UDisks2Block) -> dict[str, Any]:
-    """Return a dict with information of a filesystem block device to be used in the API."""
-    return {
-        ATTR_DEVICE: str(fs_block.device),
-        ATTR_ID: fs_block.id,
-        ATTR_SIZE: fs_block.size,
-        ATTR_NAME: fs_block.id_label,
-        ATTR_SYSTEM: fs_block.hint_system,
-        ATTR_MOUNT_POINTS: [
-            str(mount_point) for mount_point in fs_block.filesystem.mount_points
-        ],
-    }
-
-
-def drive_struct(udisks2: UDisks2, drive: UDisks2Drive) -> dict[str, Any]:
-    """Return a dict with information of a disk to be used in the API."""
-    return {
-        ATTR_VENDOR: drive.vendor,
-        ATTR_MODEL: drive.model,
-        ATTR_REVISION: drive.revision,
-        ATTR_SERIAL: drive.serial,
-        ATTR_ID: drive.id,
-        ATTR_SIZE: drive.size,
-        ATTR_TIME_DETECTED: drive.time_detected.isoformat(),
-        ATTR_CONNECTION_BUS: drive.connection_bus,
-        ATTR_SEAT: drive.seat,
-        ATTR_REMOVABLE: drive.removable,
-        ATTR_EJECTABLE: drive.ejectable,
-        ATTR_FILESYSTEMS: [
-            filesystem_struct(block)
-            for block in udisks2.block_devices
-            if block.filesystem and block.drive == drive.object_path
-        ],
     }
 
 
@@ -103,11 +40,7 @@ class APIHardware(CoreSysAttributes):
         return {
             ATTR_DEVICES: [
                 device_struct(device) for device in self.sys_hardware.devices
-            ],
-            ATTR_DRIVES: [
-                drive_struct(self.sys_dbus.udisks2, drive)
-                for drive in self.sys_dbus.udisks2.drives
-            ],
+            ]
         }
 
     @api_process

supervisor/api/homeassistant.py

@@ -1,8 +1,7 @@
 """Init file for Supervisor Home Assistant RESTful API."""
 import asyncio
-from collections.abc import Awaitable
 import logging
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import voluptuous as vol
@@ -30,12 +29,13 @@ from ..const import (
     ATTR_UPDATE_AVAILABLE,
     ATTR_VERSION,
     ATTR_VERSION_LATEST,
+    ATTR_WAIT_BOOT,
     ATTR_WATCHDOG,
+    CONTENT_TYPE_BINARY,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
 from ..validate import docker_image, network_port, version_tag
-from .const import CONTENT_TYPE_BINARY
 from .utils import api_process, api_process_raw, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -48,6 +48,7 @@ SCHEMA_OPTIONS = vol.Schema(
         vol.Optional(ATTR_PORT): network_port,
         vol.Optional(ATTR_SSL): vol.Boolean(),
         vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
+        vol.Optional(ATTR_WAIT_BOOT): vol.All(vol.Coerce(int), vol.Range(min=60)),
         vol.Optional(ATTR_REFRESH_TOKEN): vol.Maybe(str),
         vol.Optional(ATTR_AUDIO_OUTPUT): vol.Maybe(str),
         vol.Optional(ATTR_AUDIO_INPUT): vol.Maybe(str),
@@ -80,8 +81,11 @@ class APIHomeAssistant(CoreSysAttributes):
             ATTR_PORT: self.sys_homeassistant.api_port,
             ATTR_SSL: self.sys_homeassistant.api_ssl,
             ATTR_WATCHDOG: self.sys_homeassistant.watchdog,
+            ATTR_WAIT_BOOT: self.sys_homeassistant.wait_boot,
             ATTR_AUDIO_INPUT: self.sys_homeassistant.audio_input,
             ATTR_AUDIO_OUTPUT: self.sys_homeassistant.audio_output,
+            # Remove end of Q3 2020
+            "last_version": self.sys_homeassistant.latest_version,
         }
 
     @api_process
@@ -104,6 +108,9 @@ class APIHomeAssistant(CoreSysAttributes):
         if ATTR_WATCHDOG in body:
             self.sys_homeassistant.watchdog = body[ATTR_WATCHDOG]
 
+        if ATTR_WAIT_BOOT in body:
+            self.sys_homeassistant.wait_boot = body[ATTR_WAIT_BOOT]
+
         if ATTR_REFRESH_TOKEN in body:
             self.sys_homeassistant.refresh_token = body[ATTR_REFRESH_TOKEN]
 

supervisor/api/host.py

@@ -1,12 +1,9 @@
 """Init file for Supervisor host RESTful API."""
 import asyncio
-from contextlib import suppress
-import logging
+from typing import Awaitable
 
 from aiohttp import web
-from aiohttp.hdrs import ACCEPT, RANGE
 import voluptuous as vol
-from voluptuous.error import CoerceInvalid
 
 from ..const import (
     ATTR_CHASSIS,
@@ -25,32 +22,22 @@ from ..const import (
     ATTR_SERVICES,
     ATTR_STATE,
     ATTR_TIMEZONE,
+    CONTENT_TYPE_BINARY,
 )
 from ..coresys import CoreSysAttributes
-from ..exceptions import APIError, HostLogError
-from ..host.const import PARAM_BOOT_ID, PARAM_FOLLOW, PARAM_SYSLOG_IDENTIFIER
 from .const import (
     ATTR_AGENT_VERSION,
     ATTR_APPARMOR_VERSION,
     ATTR_BOOT_TIMESTAMP,
-    ATTR_BOOTS,
-    ATTR_BROADCAST_LLMNR,
-    ATTR_BROADCAST_MDNS,
     ATTR_DT_SYNCHRONIZED,
     ATTR_DT_UTC,
-    ATTR_IDENTIFIERS,
-    ATTR_LLMNR_HOSTNAME,
     ATTR_STARTUP_TIME,
     ATTR_USE_NTP,
-    CONTENT_TYPE_TEXT,
+    ATTR_USE_RTC,
 )
-from .utils import api_process, api_validate
+from .utils import api_process, api_process_raw, api_validate
 
-_LOGGER: logging.Logger = logging.getLogger(__name__)
-
-IDENTIFIER = "identifier"
-BOOTID = "bootid"
-DEFAULT_RANGE = 100
+SERVICE = "service"
 
 SCHEMA_OPTIONS = vol.Schema({vol.Optional(ATTR_HOSTNAME): str})
 
@@ -73,17 +60,15 @@ class APIHost(CoreSysAttributes):
             ATTR_DISK_LIFE_TIME: self.sys_host.info.disk_life_time,
             ATTR_FEATURES: self.sys_host.features,
             ATTR_HOSTNAME: self.sys_host.info.hostname,
-            ATTR_LLMNR_HOSTNAME: self.sys_host.info.llmnr_hostname,
             ATTR_KERNEL: self.sys_host.info.kernel,
             ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
             ATTR_TIMEZONE: self.sys_host.info.timezone,
             ATTR_DT_UTC: self.sys_host.info.dt_utc,
             ATTR_DT_SYNCHRONIZED: self.sys_host.info.dt_synchronized,
             ATTR_USE_NTP: self.sys_host.info.use_ntp,
+            ATTR_USE_RTC: self.sys_host.info.use_rtc,
             ATTR_STARTUP_TIME: self.sys_host.info.startup_time,
             ATTR_BOOT_TIMESTAMP: self.sys_host.info.boot_timestamp,
-            ATTR_BROADCAST_LLMNR: self.sys_host.info.broadcast_llmnr,
-            ATTR_BROADCAST_MDNS: self.sys_host.info.broadcast_mdns,
         }
 
     @api_process
@@ -110,7 +95,11 @@ class APIHost(CoreSysAttributes):
     @api_process
     def reload(self, request):
         """Reload host data."""
-        return asyncio.shield(self.sys_host.reload())
+        return asyncio.shield(
+            asyncio.wait(
+                [self.sys_host.reload(), self.sys_resolution.evaluate.evaluate_system()]
+            )
+        )
 
     @api_process
     async def services(self, request):
@@ -128,75 +117,30 @@ class APIHost(CoreSysAttributes):
         return {ATTR_SERVICES: services}
 
     @api_process
-    async def list_boots(self, _: web.Request):
-        """Return a list of boot IDs."""
-        boot_ids = await self.sys_host.logs.get_boot_ids()
-        return {
-            ATTR_BOOTS: {
-                str(1 + i - len(boot_ids)): boot_id
-                for i, boot_id in enumerate(boot_ids)
-            }
-        }
+    def service_start(self, request):
+        """Start a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.start(unit))
 
     @api_process
-    async def list_identifiers(self, _: web.Request):
-        """Return a list of syslog identifiers."""
-        return {ATTR_IDENTIFIERS: await self.sys_host.logs.get_identifiers()}
-
-    async def _get_boot_id(self, possible_offset: str) -> str:
-        """Convert offset into boot ID if required."""
-        with suppress(CoerceInvalid):
-            offset = vol.Coerce(int)(possible_offset)
-            try:
-                return await self.sys_host.logs.get_boot_id(offset)
-            except (ValueError, HostLogError) as err:
-                raise APIError() from err
-        return possible_offset
+    def service_stop(self, request):
+        """Stop a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.stop(unit))
 
     @api_process
-    async def advanced_logs(
-        self, request: web.Request, identifier: str | None = None, follow: bool = False
-    ) -> web.StreamResponse:
-        """Return systemd-journald logs."""
-        params = {}
-        if identifier:
-            params[PARAM_SYSLOG_IDENTIFIER] = identifier
-        elif IDENTIFIER in request.match_info:
-            params[PARAM_SYSLOG_IDENTIFIER] = request.match_info.get(IDENTIFIER)
-        else:
-            params[PARAM_SYSLOG_IDENTIFIER] = self.sys_host.logs.default_identifiers
+    def service_reload(self, request):
+        """Reload a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.reload(unit))
 
-        if BOOTID in request.match_info:
-            params[PARAM_BOOT_ID] = await self._get_boot_id(
-                request.match_info.get(BOOTID)
-            )
-        if follow:
-            params[PARAM_FOLLOW] = ""
+    @api_process
+    def service_restart(self, request):
+        """Restart a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.restart(unit))
 
-        if ACCEPT in request.headers and request.headers[ACCEPT] not in [
-            CONTENT_TYPE_TEXT,
-            "*/*",
-        ]:
-            raise APIError(
-                "Invalid content type requested. Only text/plain supported for now."
-            )
-
-        if RANGE in request.headers:
-            range_header = request.headers.get(RANGE)
-        else:
-            range_header = f"entries=:-{DEFAULT_RANGE}:"
-
-        async with self.sys_host.logs.journald_logs(
-            params=params, range_header=range_header
-        ) as resp:
-            try:
-                response = web.StreamResponse()
-                response.content_type = CONTENT_TYPE_TEXT
-                await response.prepare(request)
-                async for data in resp.content:
-                    await response.write(data)
-            except ConnectionResetError as ex:
-                raise APIError(
-                    "Connection reset when trying to fetch data from systemd-journald."
-                ) from ex
-            return response
+    @api_process_raw(CONTENT_TYPE_BINARY)
+    def logs(self, request: web.Request) -> Awaitable[bytes]:
+        """Return host kernel logs."""
+        return self.sys_host.info.get_dmesg()

supervisor/api/info.py

@@ -0,0 +1,52 @@
+"""Init file for Supervisor info RESTful API."""
+import logging
+from typing import Any
+
+from aiohttp import web
+
+from ..const import (
+    ATTR_ARCH,
+    ATTR_CHANNEL,
+    ATTR_DOCKER,
+    ATTR_FEATURES,
+    ATTR_HASSOS,
+    ATTR_HOMEASSISTANT,
+    ATTR_HOSTNAME,
+    ATTR_LOGGING,
+    ATTR_MACHINE,
+    ATTR_OPERATING_SYSTEM,
+    ATTR_STATE,
+    ATTR_SUPERVISOR,
+    ATTR_SUPPORTED,
+    ATTR_SUPPORTED_ARCH,
+    ATTR_TIMEZONE,
+)
+from ..coresys import CoreSysAttributes
+from .utils import api_process
+
+_LOGGER: logging.Logger = logging.getLogger(__name__)
+
+
+class APIInfo(CoreSysAttributes):
+    """Handle RESTful API for info functions."""
+
+    @api_process
+    async def info(self, request: web.Request) -> dict[str, Any]:
+        """Show system info."""
+        return {
+            ATTR_SUPERVISOR: self.sys_supervisor.version,
+            ATTR_HOMEASSISTANT: self.sys_homeassistant.version,
+            ATTR_HASSOS: self.sys_os.version,
+            ATTR_DOCKER: self.sys_docker.info.version,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
+            ATTR_FEATURES: self.sys_host.features,
+            ATTR_MACHINE: self.sys_machine,
+            ATTR_ARCH: self.sys_arch.default,
+            ATTR_STATE: self.sys_core.state,
+            ATTR_SUPPORTED_ARCH: self.sys_arch.supported,
+            ATTR_SUPPORTED: self.sys_core.supported,
+            ATTR_CHANNEL: self.sys_updater.channel,
+            ATTR_LOGGING: self.sys_config.logging,
+            ATTR_TIMEZONE: self.sys_timezone,
+        }

supervisor/api/ingress.py

@@ -2,7 +2,7 @@
 import asyncio
 from ipaddress import ip_address
 import logging
-from typing import Any
+from typing import Any, Union
 
 import aiohttp
 from aiohttp import ClientTimeout, hdrs, web
@@ -22,11 +22,11 @@ from ..const import (
     ATTR_PANELS,
     ATTR_SESSION,
     ATTR_TITLE,
+    COOKIE_INGRESS,
     HEADER_TOKEN,
     HEADER_TOKEN_OLD,
 )
 from ..coresys import CoreSysAttributes
-from .const import COOKIE_INGRESS
 from .utils import api_process, api_validate, require_home_assistant
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -85,9 +85,10 @@ 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
-    ) -> web.Response | web.StreamResponse | web.WebSocketResponse:
+    ) -> Union[web.Response, web.StreamResponse, web.WebSocketResponse]:
         """Route data to Supervisor ingress service."""
 
         # Check Ingress Session
@@ -158,7 +159,7 @@ class APIIngress(CoreSysAttributes):
 
     async def _handle_request(
         self, request: web.Request, addon: Addon, path: str
-    ) -> web.Response | web.StreamResponse:
+    ) -> Union[web.Response, web.StreamResponse]:
         """Ingress route for request."""
         url = self._create_url(addon, path)
         source_header = _init_header(request, addon)
@@ -181,7 +182,6 @@ class APIIngress(CoreSysAttributes):
             allow_redirects=False,
             data=data,
             timeout=ClientTimeout(total=None),
-            skip_auto_headers={hdrs.CONTENT_TYPE},
         ) as result:
             headers = _response_header(result)
 
@@ -218,7 +218,9 @@ class APIIngress(CoreSysAttributes):
             return response
 
 
-def _init_header(request: web.Request, addon: str) -> CIMultiDict | dict[str, str]:
+def _init_header(
+    request: web.Request, addon: str
+) -> Union[CIMultiDict, dict[str, str]]:
     """Create initial header."""
     headers = {}
 

supervisor/api/middleware/security.py

@@ -1,12 +1,9 @@
 """Handle security part of this API."""
 import logging
 import re
-from typing import Final
-from urllib.parse import unquote
 
 from aiohttp.web import Request, RequestHandler, Response, middleware
-from aiohttp.web_exceptions import HTTPBadRequest, HTTPForbidden, HTTPUnauthorized
-from awesomeversion import AwesomeVersion
+from aiohttp.web_exceptions import HTTPForbidden, HTTPUnauthorized
 
 from ...const import (
     REQUEST_FROM,
@@ -21,22 +18,11 @@ from ...coresys import CoreSys, CoreSysAttributes
 from ..utils import api_return_error, excract_supervisor_token
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
-_CORE_VERSION: Final = AwesomeVersion("2023.3.0")
 
 # fmt: off
 
-_CORE_FRONTEND_PATHS: Final = (
-    r"|/app/.*\.(?:js|gz|json|map)"
-    r"|/(store/)?addons/[^/]+/(logo|icon)"
-)
-
-CORE_FRONTEND: Final = re.compile(
-    r"^(?:" + _CORE_FRONTEND_PATHS + r")$"
-)
-
-
 # Block Anytime
-BLACKLIST: Final = re.compile(
+BLACKLIST = re.compile(
     r"^(?:"
     r"|/homeassistant/api/hassio/.*"
     r"|/core/api/hassio/.*"
@@ -44,27 +30,25 @@ BLACKLIST: Final = re.compile(
 )
 
 # Free to call or have own security concepts
-NO_SECURITY_CHECK: Final = re.compile(
+NO_SECURITY_CHECK = re.compile(
     r"^(?:"
     r"|/homeassistant/api/.*"
     r"|/homeassistant/websocket"
     r"|/core/api/.*"
     r"|/core/websocket"
     r"|/supervisor/ping"
-    r"|/ingress/[^/]+/.*"
-    + _CORE_FRONTEND_PATHS
-    + r")$"
+    r")$"
 )
 
 # Observer allow API calls
-OBSERVER_CHECK: Final = re.compile(
+OBSERVER_CHECK = re.compile(
     r"^(?:"
     r"|/.+/info"
     r")$"
 )
 
 # Can called by every add-on
-ADDONS_API_BYPASS: Final = re.compile(
+ADDONS_API_BYPASS = re.compile(
     r"^(?:"
     r"|/addons/self/(?!security|update)[^/]+"
     r"|/addons/self/options/config"
@@ -76,7 +60,7 @@ ADDONS_API_BYPASS: Final = re.compile(
 )
 
 # Policy role add-on API access
-ADDONS_ROLE_ACCESS: dict[str, re.Pattern] = {
+ADDONS_ROLE_ACCESS = {
     ROLE_DEFAULT: re.compile(
         r"^(?:"
         r"|/.+/info"
@@ -93,6 +77,7 @@ ADDONS_ROLE_ACCESS: dict[str, re.Pattern] = {
         r"^(?:"
         r"|/.+/info"
         r"|/backups.*"
+        r"|/snapshots.*"
         r")$"
     ),
     ROLE_MANAGER: re.compile(
@@ -127,26 +112,6 @@ ADDONS_ROLE_ACCESS: dict[str, re.Pattern] = {
     ),
 }
 
-FILTERS: Final = re.compile(
-    r"(?:"
-
-    # Common exploits
-    r"proc/self/environ"
-    r"|(<|%3C).*script.*(>|%3E)"
-
-    # File Injections
-    r"|(\.\.//?)+"  # ../../anywhere
-    r"|[a-zA-Z0-9_]=/([a-z0-9_.]//?)+"  # .html?v=/.//test
-
-    # SQL Injections
-    r"|union.*select.*\("
-    r"|union.*all.*select.*"
-    r"|concat.*\("
-
-    r")",
-    flags=re.IGNORECASE,
-)
-
 # fmt: on
 
 
@@ -157,32 +122,6 @@ class SecurityMiddleware(CoreSysAttributes):
         """Initialize security middleware."""
         self.coresys: CoreSys = coresys
 
-    def _recursive_unquote(self, value: str) -> str:
-        """Handle values that are encoded multiple times."""
-        if (unquoted := unquote(value)) != value:
-            unquoted = self._recursive_unquote(unquoted)
-        return unquoted
-
-    @middleware
-    async def block_bad_requests(
-        self, request: Request, handler: RequestHandler
-    ) -> Response:
-        """Process request and tblock commonly known exploit attempts."""
-        if FILTERS.search(self._recursive_unquote(request.path)):
-            _LOGGER.warning(
-                "Filtered a potential harmful request to: %s", request.raw_path
-            )
-            raise HTTPBadRequest
-
-        if FILTERS.search(self._recursive_unquote(request.query_string)):
-            _LOGGER.warning(
-                "Filtered a request with a potential harmful query string: %s",
-                request.raw_path,
-            )
-            raise HTTPBadRequest
-
-        return await handler(request)
-
     @middleware
     async def system_validation(
         self, request: Request, handler: RequestHandler
@@ -215,7 +154,6 @@ class SecurityMiddleware(CoreSysAttributes):
         # Ignore security check
         if NO_SECURITY_CHECK.match(request.path):
             _LOGGER.debug("Passthrough %s", request.path)
-            request[REQUEST_FROM] = None
             return await handler(request)
 
         # Not token
@@ -268,45 +206,3 @@ class SecurityMiddleware(CoreSysAttributes):
 
         _LOGGER.error("Invalid token for access %s", request.path)
         raise HTTPForbidden()
-
-    @middleware
-    async def core_proxy(self, request: Request, handler: RequestHandler) -> Response:
-        """Validate user from Core API proxy."""
-        if (
-            request[REQUEST_FROM] != self.sys_homeassistant
-            or self.sys_homeassistant.version >= _CORE_VERSION
-        ):
-            return await handler(request)
-
-        authorization_index: int | None = None
-        content_type_index: int | None = None
-        user_request: bool = False
-        admin_request: bool = False
-        ingress_request: bool = False
-
-        for idx, (key, value) in enumerate(request.raw_headers):
-            if key in (b"Authorization", b"X-Hassio-Key"):
-                authorization_index = idx
-            elif key == b"Content-Type":
-                content_type_index = idx
-            elif key == b"X-Hass-User-ID":
-                user_request = True
-            elif key == b"X-Hass-Is-Admin":
-                admin_request = value == b"1"
-            elif key == b"X-Ingress-Path":
-                ingress_request = True
-
-        if user_request or admin_request:
-            return await handler(request)
-
-        is_proxy_request = (
-            authorization_index is not None
-            and content_type_index is not None
-            and content_type_index - authorization_index == 1
-        )
-
-        if (
-            not CORE_FRONTEND.match(request.path) and is_proxy_request
-        ) or ingress_request:
-            raise HTTPBadRequest()
-        return await handler(request)

supervisor/api/multicast.py

@@ -1,8 +1,7 @@
 """Init file for Supervisor Multicast RESTful API."""
 import asyncio
-from collections.abc import Awaitable
 import logging
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import voluptuous as vol
@@ -19,11 +18,11 @@ from ..const import (
     ATTR_UPDATE_AVAILABLE,
     ATTR_VERSION,
     ATTR_VERSION_LATEST,
+    CONTENT_TYPE_BINARY,
 )
 from ..coresys import CoreSysAttributes
 from ..exceptions import APIError
 from ..validate import version_tag
-from .const import CONTENT_TYPE_BINARY
 from .utils import api_process, api_process_raw, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)

supervisor/api/network.py

@@ -1,8 +1,7 @@
 """REST API for network."""
 import asyncio
-from collections.abc import Awaitable
 from ipaddress import ip_address, ip_interface
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import attr
@@ -31,7 +30,6 @@ from ..const import (
     ATTR_PARENT,
     ATTR_PRIMARY,
     ATTR_PSK,
-    ATTR_READY,
     ATTR_SIGNAL,
     ATTR_SSID,
     ATTR_SUPERVISOR_INTERNET,
@@ -91,7 +89,6 @@ def ipconfig_struct(config: IpConfig) -> dict[str, Any]:
         ATTR_ADDRESS: [address.with_prefixlen for address in config.address],
         ATTR_NAMESERVERS: [str(address) for address in config.nameservers],
         ATTR_GATEWAY: str(config.gateway) if config.gateway else None,
-        ATTR_READY: config.ready,
     }
 
 
@@ -144,7 +141,9 @@ class APINetwork(CoreSysAttributes):
 
     def _get_interface(self, name: str) -> Interface:
         """Get Interface by name or default."""
-        if name.lower() == "default":
+        name = name.lower()
+
+        if name == "default":
             for interface in self.sys_host.network.interfaces:
                 if not interface.primary:
                     continue
@@ -197,14 +196,12 @@ class APINetwork(CoreSysAttributes):
         for key, config in body.items():
             if key == ATTR_IPV4:
                 interface.ipv4 = attr.evolve(
-                    interface.ipv4
-                    or IpConfig(InterfaceMethod.STATIC, [], None, [], None),
+                    interface.ipv4 or IpConfig(InterfaceMethod.STATIC, [], None, []),
                     **config,
                 )
             elif key == ATTR_IPV6:
                 interface.ipv6 = attr.evolve(
-                    interface.ipv6
-                    or IpConfig(InterfaceMethod.STATIC, [], None, [], None),
+                    interface.ipv6 or IpConfig(InterfaceMethod.STATIC, [], None, []),
                     **config,
                 )
             elif key == ATTR_WIFI:
@@ -223,9 +220,7 @@ class APINetwork(CoreSysAttributes):
     @api_process
     def reload(self, request: web.Request) -> Awaitable[None]:
         """Reload network data."""
-        return asyncio.shield(
-            self.sys_host.network.update(force_connectivity_check=True)
-        )
+        return asyncio.shield(self.sys_host.network.update())
 
     @api_process
     async def scan_accesspoints(self, request: web.Request) -> dict[str, Any]:
@@ -262,7 +257,6 @@ class APINetwork(CoreSysAttributes):
                 body[ATTR_IPV4].get(ATTR_ADDRESS, []),
                 body[ATTR_IPV4].get(ATTR_GATEWAY, None),
                 body[ATTR_IPV4].get(ATTR_NAMESERVERS, []),
-                None,
             )
 
         ipv6_config = None
@@ -272,7 +266,6 @@ class APINetwork(CoreSysAttributes):
                 body[ATTR_IPV6].get(ATTR_ADDRESS, []),
                 body[ATTR_IPV6].get(ATTR_GATEWAY, None),
                 body[ATTR_IPV6].get(ATTR_NAMESERVERS, []),
-                None,
             )
 
         vlan_interface = Interface(

supervisor/api/os.py

@@ -1,9 +1,8 @@
 """Init file for Supervisor HassOS RESTful API."""
 import asyncio
-from collections.abc import Awaitable
 import logging
 from pathlib import Path
-from typing import Any
+from typing import Any, Awaitable
 
 from aiohttp import web
 import voluptuous as vol
@@ -17,16 +16,8 @@ from ..const import (
     ATTR_VERSION_LATEST,
 )
 from ..coresys import CoreSysAttributes
-from ..exceptions import BoardInvalidError
-from ..resolution.const import ContextType, IssueType, SuggestionType
 from ..validate import version_tag
-from .const import (
-    ATTR_DATA_DISK,
-    ATTR_DEVICE,
-    ATTR_DISK_LED,
-    ATTR_HEARTBEAT_LED,
-    ATTR_POWER_LED,
-)
+from .const import ATTR_DATA_DISK, ATTR_DEVICE
 from .utils import api_process, api_validate
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -34,15 +25,6 @@ _LOGGER: logging.Logger = logging.getLogger(__name__)
 SCHEMA_VERSION = vol.Schema({vol.Optional(ATTR_VERSION): version_tag})
 SCHEMA_DISK = vol.Schema({vol.Required(ATTR_DEVICE): vol.All(str, vol.Coerce(Path))})
 
-# pylint: disable=no-value-for-parameter
-SCHEMA_YELLOW_OPTIONS = vol.Schema(
-    {
-        vol.Optional(ATTR_DISK_LED): vol.Boolean(),
-        vol.Optional(ATTR_HEARTBEAT_LED): vol.Boolean(),
-        vol.Optional(ATTR_POWER_LED): vol.Boolean(),
-    }
-)
-
 
 class APIOS(CoreSysAttributes):
     """Handle RESTful API for OS functions."""
@@ -85,42 +67,3 @@ class APIOS(CoreSysAttributes):
         return {
             ATTR_DEVICES: self.sys_os.datadisk.available_disks,
         }
-
-    @api_process
-    async def boards_yellow_info(self, request: web.Request) -> dict[str, Any]:
-        """Get yellow board settings."""
-        return {
-            ATTR_DISK_LED: self.sys_dbus.agent.board.yellow.disk_led,
-            ATTR_HEARTBEAT_LED: self.sys_dbus.agent.board.yellow.heartbeat_led,
-            ATTR_POWER_LED: self.sys_dbus.agent.board.yellow.power_led,
-        }
-
-    @api_process
-    async def boards_yellow_options(self, request: web.Request) -> None:
-        """Update yellow board settings."""
-        body = await api_validate(SCHEMA_YELLOW_OPTIONS, request)
-
-        if ATTR_DISK_LED in body:
-            self.sys_dbus.agent.board.yellow.disk_led = body[ATTR_DISK_LED]
-
-        if ATTR_HEARTBEAT_LED in body:
-            self.sys_dbus.agent.board.yellow.heartbeat_led = body[ATTR_HEARTBEAT_LED]
-
-        if ATTR_POWER_LED in body:
-            self.sys_dbus.agent.board.yellow.power_led = body[ATTR_POWER_LED]
-
-        self.sys_resolution.create_issue(
-            IssueType.REBOOT_REQUIRED,
-            ContextType.SYSTEM,
-            suggestions=[SuggestionType.EXECUTE_REBOOT],
-        )
-
-    @api_process
-    async def boards_other_info(self, request: web.Request) -> dict[str, Any]:
-        """Empty success return if board is in use, error otherwise."""
-        if request.match_info["board"] != self.sys_os.board:
-            raise BoardInvalidError(
-                f"{request.match_info['board']} board is not in use", _LOGGER.error
-            )
-
-        return {}

supervisor/api/panel/entrypoint.js

@@ -1,14 +1,14 @@
 
 function loadES5() {
   var el = document.createElement('script');
-  el.src = '/api/hassio/app/frontend_es5/entrypoint.5c6aba93.js';
+  el.src = '/api/hassio/app/frontend_es5/entrypoint.5d40ff8b.js';
   document.body.appendChild(el);
 }
 if (/.*Version\/(?:11|12)(?:\.\d+)*.*Safari\//.test(navigator.userAgent)) {
     loadES5();
 } else {
   try {
-    new Function("import('/api/hassio/app/frontend_latest/entrypoint.499355be.js')")();
+    new Function("import('/api/hassio/app/frontend_latest/entrypoint.f09e9f8e.js')")();
   } catch (err) {
     loadES5();
   }

supervisor/api/panel/frontend_es5/0845e41a.js.LICENSE.txt

@@ -1 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

supervisor/api/panel/frontend_es5/0977644e.js.LICENSE.txt

@@ -1 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

supervisor/api/panel/frontend_es5/1138ca90.js.LICENSE.txt

@@ -1 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

supervisor/api/panel/frontend_es5/169c6b48.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunkhome_assistant_frontend=self.webpackChunkhome_assistant_frontend||[]).push([[2811],{32811:function(n,e,s){s.r(e);var t=s(56087);t.ZP.mount(t.V8,new t.lK),e.default=t.ZP}}]);

supervisor/api/panel/frontend_es5/16b7d5e1.js.LICENSE.txt

@@ -1,19 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
-
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @license
- * Copyright 2020 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-LIcense-Identifier: Apache-2.0
- */

supervisor/api/panel/frontend_es5/1f74f712.js.LICENSE.txt

@@ -1 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

supervisor/api/panel/frontend_es5/26f4e401.js.LICENSE.txt

@@ -1,13 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
-
-/**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */

supervisor/api/panel/frontend_es5/28522eac.js.LICENSE.txt

@@ -1 +0,0 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */