Skip to content

Bugfix/malformed entry #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
doronz88 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/malformed entry #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27cb1a6
ci: Update tested python versions
doronz88 Feb 2, 2026
bf4f7f2
entry: Make `read_bytes()` only log warning on pad errors
doronz88 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
python-version: [ 3.7, 3.8, 3.9, "3.10", 3.11, 3.12, 3.13 ]
python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]

steps:
- uses: actions/checkout@v2
Expand Down
26 changes: 20 additions & 6 deletions pyiosbackup/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
from dataclasses import dataclass
from datetime import datetime
import logging
import pathlib
import posixpath
from dataclasses import dataclass
from datetime import datetime

from packaging.version import Version
from cryptography.hazmat.primitives import padding
from packaging.version import Version

FILE_DATA_PAD_BITS = 128 # Files data is 128 bits (16 bytes) padded.
MODE_TYPE_MASK = 0xE000
MODE_TYPE_SYMLINK = 0xA000
MODE_TYPE_FILE = 0x8000
MODE_TYPE_DIR = 0x4000

logger = logging.getLogger(__name__)


@dataclass
class Entry:
Expand Down Expand Up @@ -114,10 +117,21 @@ def read_bytes(self) -> bytes:
encrypted = self.read_raw()
if not self.backup.is_encrypted:
return encrypted
if not self.encryption_key:
# Some entries are stored without an encryption key even in encrypted backups.
return encrypted
decrypted = self.backup.keybag.decrypt(encrypted, self.encryption_key)
unpadder = padding.PKCS7(FILE_DATA_PAD_BITS).unpadder()
decrypted = unpadder.update(decrypted) + unpadder.finalize()
return decrypted
try:
unpadder = padding.PKCS7(FILE_DATA_PAD_BITS).unpadder()
return unpadder.update(decrypted) + unpadder.finalize()
except ValueError:
# Fall back to manifest size when padding is absent or corrupt.
if self.size is not None and self.size <= len(decrypted):
logger.warning(
f"Padding failed for {self.relative_path}; returning decrypted data trimmed to manifest size.")
return decrypted[:self.size]
logger.warning(f"Padding failed for {self.relative_path}; returning raw decrypted data.")
return decrypted

def is_dir(self) -> bool:
"""
Expand Down