Skip to content

Zip and rar files to follow --temp-dir cli args #5

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

Draft
ryd994 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Zip and rar files to follow --temp-dir cli args #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,31 +205,30 @@ def main():
@contextlib.contextmanager
def prepare_source_path(path: Path):
if _is_zip(path):
import tempfile, zipfile
with tempfile.TemporaryDirectory() as tmpdir:
import zipfile
with managed_temp_dir(args.temp_dir) as tmpdir:
try:
with zipfile.ZipFile(path) as zf:
# Path traversal validation (same logic MkPFS used)
for member in zf.infolist():
dest = Path(tmpdir) / member.filename
dest = tmpdir / member.filename
try:
dest.resolve().relative_to(Path(tmpdir).resolve())
dest.resolve().relative_to(tmpdir.resolve())
except ValueError:
print(f"[ERROR] ZIP path traversal detected: {member.filename}")
sys.exit(1)
zf.extractall(tmpdir, pwd=args.password.encode() if args.password else None)
yield Path(tmpdir)
zf.extractall(str(tmpdir), pwd=args.password.encode() if args.password else None)
yield tmpdir
except (zipfile.BadZipFile, RuntimeError) as exc:
print(f"[ERROR] ZIP extraction failed: {exc}")
sys.exit(1)
elif _is_rar(path):
import tempfile
from unrar import rarfile
with tempfile.TemporaryDirectory() as tmpdir:
with managed_temp_dir(args.temp_dir) as tmpdir:
try:
with rarfile.RarFile(path, pwd=args.password) as rf:
rf.extractall(tmpdir)
yield Path(tmpdir)
rf.extractall(str(tmpdir))
yield tmpdir
except rarfile.RarWrongPassword:
print("[ERROR] RAR extraction failed: wrong or missing password")
sys.exit(1)
Expand Down