jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-08 10:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump securetar to 2025.1.3 (#135762)

Browse Source 
* Bump securetar to 2025.1.3

* Remove outdated fixture
This commit is contained in:
Erik Montnemery
2025-01-16 13:26:52 +01:00
committed by GitHub
parent 1cff45b8b7
commit 6cbe18ebbd
11 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/backup/util.py
View File

@@ -13,13 +13,7 @@ import tarfile
from typing import IO, Self, cast
import aiohttp
from securetar import (
PLAINTEXT_SIZE_HEADER,
VERSION_HEADER,
SecureTarError,
SecureTarFile,
SecureTarReadError,
)
from securetar import SecureTarError, SecureTarFile, SecureTarReadError
from homeassistant.backup_restore import password_to_key
from homeassistant.core import HomeAssistant
@@ -205,8 +199,6 @@ def validate_password_stream(
for obj in input_tar:
if not obj.name.endswith((".tar", ".tgz", ".tar.gz")):
continue
if obj.pax_headers.get(VERSION_HEADER) != "2.0":
raise UnsupportedSecureTarVersion
istf = SecureTarFile(
None, # Not used
gzip=False,
@@ -215,6 +207,8 @@ def validate_password_stream(
fileobj=input_tar.extractfile(obj),
)
with istf.decrypt(obj) as decrypted:
if istf.securetar_header.plaintext_size is None:
raise UnsupportedSecureTarVersion
try:
decrypted.read(1) # Read a single byte to trigger the decryption
except SecureTarReadError as err:
@@ -270,10 +264,6 @@ def _decrypt_backup(
if not obj.name.endswith((".tar", ".tgz", ".tar.gz")):
output_tar.addfile(obj, input_tar.extractfile(obj))
continue
if obj.pax_headers.get(VERSION_HEADER) != "2.0":
raise UnsupportedSecureTarVersion
decrypted_obj = copy.deepcopy(obj)
decrypted_obj.size = int(obj.pax_headers[PLAINTEXT_SIZE_HEADER])
istf = SecureTarFile(
None, # Not used
gzip=False,
@@ -282,6 +272,10 @@ def _decrypt_backup(
fileobj=input_tar.extractfile(obj),
)
with istf.decrypt(obj) as decrypted:
if (plaintext_size := istf.securetar_header.plaintext_size) is None:
raise UnsupportedSecureTarVersion
decrypted_obj = copy.deepcopy(obj)
decrypted_obj.size = plaintext_size
output_tar.addfile(decrypted_obj, decrypted)