Merge branch 'master' of https://github.com/shuffle/python-apps

Author: frikky

shuffle-tools/1.2.0/Dockerfile

@@ -5,7 +5,7 @@ FROM frikky/shuffle:app_sdk as base
 FROM base as builder
 
 # Install all alpine build tools needed for our pip installs
-RUN apk --no-cache add --update alpine-sdk libffi libffi-dev musl-dev openssl-dev git
+RUN apk --no-cache add --update alpine-sdk libffi libffi-dev musl-dev openssl-dev git zlib-dev python3-dev
 
 # Install all of our pip packages in a single directory that we can copy to our base image later
 RUN mkdir /install

shuffle-tools/1.2.0/requirements.txt

@@ -1,12 +1,11 @@
 ioc_finder==7.3.0
 py7zr==0.22.0
 rarfile==4.2
-pyminizip==0.2.6
-requests==2.32.4
+pyzipper==0.3.6
+requests==2.32.3
 xmltodict==0.14.2
 json2xml==5.0.5
 ipaddress==1.0.23
 google.auth==2.37.0
 paramiko==3.5.0
-shuffle-sdk
-
+shuffle-sdk==0.0.31

shuffle-tools/1.2.0/src/app.py

@@ -30,7 +30,7 @@
 from google.auth import jwt
 
 import py7zr
-import pyminizip
+import pyzipper
 import rarfile
 import requests
 import tarfile
@@ -1447,9 +1447,19 @@ def create_archive(self, file_ids, fileformat, name, password=None):
 
                     if fileformat == "zip":
                         archive_name = "archive.zip" if not name else name
-                        pyminizip.compress_multiple(
-                            paths, [], archive.name, password, 5
-                        )
+
+                        pwd = password if isinstance(password, (bytes, bytearray)) else password.encode()
+
+                        with pyzipper.AESZipFile(
+                            archive.name,
+                            "w",
+                            compression=pyzipper.ZIP_DEFLATED
+                            ) as zf:
+                                zf.setpassword(pwd)
+                                zf.setencryption(pyzipper.WZ_AES, nbits=256)
+
+                                for path in paths:
+                                    zf.write(path, arcname=os.path.basename(path))
 
                     elif fileformat == "7zip":
                         archive_name = "archive.7z" if not name else name