From c315a158168fa7e4883a77f379e7cf5a067f9fec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 09:30:22 -0500 Subject: [PATCH] Bump securetar from 2025.2.0 to 2025.2.1 (#5671) * Bump securetar from 2025.2.0 to 2025.2.1 Bumps [securetar](https://github.com/pvizeli/securetar) from 2025.2.0 to 2025.2.1. - [Release notes](https://github.com/pvizeli/securetar/releases) - [Commits](https://github.com/pvizeli/securetar/compare/2025.2.0...2025.2.1) --- updated-dependencies: - dependency-name: securetar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Handle new AddFileError where atomic_contents_add is used --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Agner --- requirements.txt | 2 +- supervisor/addons/addon.py | 4 ++-- supervisor/backups/backup.py | 4 ++-- supervisor/homeassistant/module.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 40d656563..565d72a6e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pulsectl==24.12.0 pyudev==0.24.3 PyYAML==6.0.2 requests==2.32.3 -securetar==2025.2.0 +securetar==2025.2.1 sentry-sdk==2.22.0 setuptools==75.8.1 voluptuous==0.15.2 diff --git a/supervisor/addons/addon.py b/supervisor/addons/addon.py index a0d51327c..415ed664c 100644 --- a/supervisor/addons/addon.py +++ b/supervisor/addons/addon.py @@ -20,7 +20,7 @@ from typing import Any, Final import aiohttp from awesomeversion import AwesomeVersionCompareException from deepmerge import Merger -from securetar import atomic_contents_add, secure_path +from securetar import AddFileError, atomic_contents_add, secure_path import voluptuous as vol from voluptuous.humanize import humanize_error @@ -1327,7 +1327,7 @@ class Addon(AddonModel): ) ) _LOGGER.info("Finish backup for addon %s", self.slug) - except (tarfile.TarError, OSError) as err: + except (tarfile.TarError, OSError, AddFileError) as err: raise AddonsError( f"Can't write tarfile {tar_file}: {err}", _LOGGER.error ) from err diff --git a/supervisor/backups/backup.py b/supervisor/backups/backup.py index 6ded4acfa..78c73f72c 100644 --- a/supervisor/backups/backup.py +++ b/supervisor/backups/backup.py @@ -19,7 +19,7 @@ from typing import Any, Self from awesomeversion import AwesomeVersion, AwesomeVersionCompareException from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes -from securetar import SecureTarFile, atomic_contents_add, secure_path +from securetar import AddFileError, SecureTarFile, atomic_contents_add, secure_path import voluptuous as vol from voluptuous.humanize import humanize_error @@ -741,7 +741,7 @@ class Backup(JobGroup): try: if await self.sys_run_in_executor(_save): self._data[ATTR_FOLDERS].append(name) - except (tarfile.TarError, OSError) as err: + except (tarfile.TarError, OSError, AddFileError) as err: raise BackupError( f"Can't backup folder {name}: {str(err)}", _LOGGER.error ) from err diff --git a/supervisor/homeassistant/module.py b/supervisor/homeassistant/module.py index 395ed31b3..3b9b76cb2 100644 --- a/supervisor/homeassistant/module.py +++ b/supervisor/homeassistant/module.py @@ -13,7 +13,7 @@ from typing import Any from uuid import UUID from awesomeversion import AwesomeVersion, AwesomeVersionException -from securetar import atomic_contents_add, secure_path +from securetar import AddFileError, atomic_contents_add, secure_path import voluptuous as vol from voluptuous.humanize import humanize_error @@ -435,7 +435,7 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes): file_filter=_is_excluded_by_filter, arcname="data", ) - except (tarfile.TarError, OSError) as err: + except (tarfile.TarError, OSError, AddFileError) as err: raise HomeAssistantBackupError( f"Can't backup Home Assistant Core config folder: {str(err)}", _LOGGER.error,