Merge pull request #231 from BC-SECURITY/sponsors-dev

4.1.2

VERSION

@@ -1 +1 @@
-4.1.1
+4.1.2

changelog

@@ -1,3 +1,8 @@
+9/21/2021
+------------
+- Version 4.1.2 Master Release
+        - Removed pyminifier as a dependency to prevent install errors (@Cx01N)
+
 9/20/2021
 ------------
 - Version 4.1.1 Master Release

empire/server/common/empire.py

@@ -44,7 +44,7 @@
 from empire.server.database import models
 from sqlalchemy import or_, func, and_
 
-VERSION = "4.1.1 BC Security Fork"
+VERSION = "4.1.2 BC Security Fork"
 
 
 class MainMenu(cmd.Cmd):

empire/server/common/modules.py

@@ -17,7 +17,6 @@
 
 from empire.server.common.hooks import hooks
 from empire.server.utils import data_util
-from empire.server.common import obfuscation
 from empire.server.common.config import empire_config
 from empire.server.common.converter.load_covenant import _convert_covenant_to_empire
 from empire.server.common.module_models import PydanticModule, LanguageEnum
@@ -74,9 +73,7 @@ def execute_module(self, module: PydanticModule, params: Dict, user_id: int) \
         if not module_data.isascii():
             return None, 'module source contains non-ascii characters'
 
-        if module.language == LanguageEnum.python:
-            module_data = obfuscation.py_minify(module_data)
-        elif module.language == LanguageEnum.powershell:
+        if module.language == LanguageEnum.powershell:
             module_data = helpers.strip_powershell_comments(module_data)
 
         # check if module is external

empire/server/listeners/dbx.py

@@ -14,7 +14,6 @@
 
 from empire.server.common import encryption
 from empire.server.common import helpers
-from empire.server.common import obfuscation
 from empire.server.common import templating
 from empire.server.utils import data_util
 from empire.server.database.base import Session
@@ -418,7 +417,6 @@ def generate_stager(self, listenerOptions, encode=False, encrypt=True, language=
                     }
 
             stager = template.render(template_options)
-            stager = obfuscation.py_minify(stager)
 
             if encode:
                 return base64.b64encode(stager)

empire/server/listeners/http.py

@@ -20,7 +20,6 @@
 
 from empire.server.common import encryption
 from empire.server.common import helpers
-from empire.server.common import obfuscation
 from empire.server.common import packets
 from empire.server.common import templating
 from empire.server.utils import data_util
@@ -701,7 +700,6 @@ def generate_stager(self, listenerOptions, encode=False, encrypt=True, obfuscate
             }
 
             stager = template.render(template_options)
-            stager = obfuscation.py_minify(stager)
 
             # base64 encode the stager and return it
             if encode:

empire/server/listeners/http_malleable.py

@@ -21,7 +21,6 @@
 from empire.server.common import encryption
 from empire.server.common import helpers
 from empire.server.common import malleable
-from empire.server.common import obfuscation
 from empire.server.common import packets
 from empire.server.common import templating
 from empire.server.database import models
@@ -678,7 +677,6 @@ def generate_stager(self, listenerOptions, encode=False, encrypt=True, obfuscate
             }
 
             stager = template.render(template_options)
-            stager = obfuscation.py_minify(stager)
 
             if encode:
                 return base64.b64encode(stager)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "empire-bc-security-fork"
-version = "4.1.1"
+version = "4.1.2"
 description = ""
 authors = ["BC Security <[email protected]>"]
 readme = "README.md"
@@ -27,7 +27,6 @@ pyinstaller = "*"
 zlib_wrapper = "*"
 netifaces = "*"
 jinja2 = "*"
-pyminifier = "*"
 xlutils = "*"
 pefile = "*"
 bcrypt = "*"