Skip to content

Commit

Permalink
Removed broken package pyminifier (#230)
Browse files Browse the repository at this point in the history
* removed broken package pyminifier

* updated change log
  • Loading branch information
Cx01N authored Sep 21, 2021
1 parent 907e232 commit dc8eb1a
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 81 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.1
4.1.2
5 changes: 5 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion empire/server/common/empire.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 1 addition & 4 deletions empire/server/common/modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
54 changes: 0 additions & 54 deletions empire/server/common/obfuscation.py

This file was deleted.

2 changes: 0 additions & 2 deletions empire/server/listeners/dbx.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions empire/server/listeners/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions empire/server/listeners/http_malleable.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
36 changes: 23 additions & 13 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -27,7 +27,6 @@ pyinstaller = "*"
zlib_wrapper = "*"
netifaces = "*"
jinja2 = "*"
pyminifier = "*"
xlutils = "*"
pefile = "*"
bcrypt = "*"
Expand Down

0 comments on commit dc8eb1a

Please sign in to comment.