Skip to content

Replace the shell zip cmd with Rustyzipper #128

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
3rdit wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Replace the shell zip cmd with Rustyzipper #128

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
9cb1e96
Replace the shell zip cmd with rustyzipper
3rdit Jan 13, 2026
4589460
Update requirements.txt
3rdit Jan 15, 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
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ bleach==6.1.0
requests==2.31.0
Werkzeug==3.0.1
resend==2.0.0
rustyzipper==1.0.6

# Testing
pytest==7.4.3
Expand Down
45 changes: 8 additions & 37 deletions review/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import bcrypt
import requests
from subprocess import call
from rustyzipper import compress_file, EncryptionMethod
from bson.objectid import ObjectId

from review.logger import log_reviewer_operation
Expand Down Expand Up @@ -498,56 +498,27 @@ def create_password_protected_zip(source_path, dest_path_without_ext, filename_i
Returns:
Tuple of (success: bool, error_message: str or None)
"""
# Move to temp location with desired filename
dest_path = dest_path_without_ext + '.zip'
temp_path = os.path.join(CRACKMESONE_DIR, filename_in_archive)
shutil.move(source_path, temp_path)

try:
# Find zip command (use full path to avoid PATH issues in web server)
zip_cmd = shutil.which("zip") or "/usr/bin/zip"

# Create password-protected zip
ret = call([
zip_cmd, "-j", "--password", ARCHIVE_PASSWORD,
dest_path_without_ext, "--", temp_path
])

if ret != 0:
# Move file back on failure
if os.path.exists(temp_path):
try:
shutil.move(temp_path, source_path)
except Exception:
pass
return False, "Failed to create zip archive"

shutil.move(source_path, temp_path)
compress_file(temp_path, dest_path, password=ARCHIVE_PASSWORD, encryption=EncryptionMethod.ZIPCRYPTO, suppress_warning=True)
os.remove(temp_path)
return True, None

except FileNotFoundError:
# zip command not found - move file back
if os.path.exists(temp_path):
try:
shutil.move(temp_path, source_path)
except Exception:
pass
return False, "zip command not found"

except Exception as e:
# Other errors - move file back
if os.path.exists(temp_path):
try:
shutil.move(temp_path, source_path)
except Exception:
pass
return False, f"Error creating zip: {str(e)}"

finally:
# Clean up temp file (only if zip succeeded, file was moved to archive)
if os.path.exists(temp_path):
if os.path.exists(dest_path):
try:
os.remove(temp_path)
os.remove(dest_path)
except Exception:
pass
return False, f"Error creating zip: {str(e)}"


# =============================================================================
Expand Down