python-obfuscation-framework 1.11.1__tar.gz → 1.12.0__tar.gz

{python_obfuscation_framework-1.11.1/python_obfuscation_framework.egg-info → python_obfuscation_framework-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-obfuscation-framework
-Version: 1.11.1
+Version: 1.12.0
 Summary: Python Obfuscation Framework
 Author-email: deoktr <35725720+deoktr@users.noreply.github.com>
 Maintainer-email: deoktr <35725720+deoktr@users.noreply.github.com>
@@ -24,7 +24,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Security
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rope>=1.0.0
@@ -367,6 +367,7 @@ Other very basic obfuscation functions are done by specific obfuscators like:
   `LoggingRemoveObfuscator`.
 - Remove empty lines with `NewlineObfuscator`.
 - Remove print statements with `PrintObfuscator`.
+- Remove type hints with `TypeHintsObfuscator`.
 
 #### StringsObfuscator
 
@@ -584,16 +585,16 @@ exec("".join([chr(ord(i)-3)for i in'sulqw+*Khoor/#zruog*,\r']))
 
 #### DocstringObfuscator
 
+Store original code inside functions and classes comments as base64.
+
 ```python
 from base64 import b64decode
-class Foo:
-    """
-    cHJpbnQoJ0hlbGxvLCB3b3JsZCcpCg==
-    """
-    pass
 
+class L8EU:
+    """cHJpbnQoIkhlbGxvLCB3b3JsZCEiKQo="""
+    pass
 
-exec(b64decode(Foo.__doc__.replace('\n','').replace(' ','')))
+exec(b64decode("".join([L8EU.__doc__]).replace('\\n','').replace(' ','')))
 ```
 
 #### SpacenTabObfuscator
@@ -898,8 +899,6 @@ def greet(name):
 
 Insert dead (unreachable/unused) code blocks into the source.
 
-Source: `print('Hello, world')`
-
 ```python
 while False:
     Etb4inx6B1=[21,7,46,2]
@@ -909,6 +908,26 @@ while False:
 print('Hello, world')
 ```
 
+#### AddTypeHintsObfuscator
+
+Insert random type hints.
+
+Source:
+
+```python
+def foo(x):
+    z = x + 2
+    print(z)
+```
+
+Obfuscated:
+
+```python
+def foo(x: dict[dict[bytearray, None], frozenset[complex]])-> str | type:
+    z: complex | dict[memoryview, complex]=x+2
+    print(z)
+```
+
 ### Stager
 
 #### DownloadStager

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/README.md

@@ -322,6 +322,7 @@ Other very basic obfuscation functions are done by specific obfuscators like:
   `LoggingRemoveObfuscator`.
 - Remove empty lines with `NewlineObfuscator`.
 - Remove print statements with `PrintObfuscator`.
+- Remove type hints with `TypeHintsObfuscator`.
 
 #### StringsObfuscator
 
@@ -539,16 +540,16 @@ exec("".join([chr(ord(i)-3)for i in'sulqw+*Khoor/#zruog*,\r']))
 
 #### DocstringObfuscator
 
+Store original code inside functions and classes comments as base64.
+
 ```python
 from base64 import b64decode
-class Foo:
-    """
-    cHJpbnQoJ0hlbGxvLCB3b3JsZCcpCg==
-    """
-    pass
 
+class L8EU:
+    """cHJpbnQoIkhlbGxvLCB3b3JsZCEiKQo="""
+    pass
 
-exec(b64decode(Foo.__doc__.replace('\n','').replace(' ','')))
+exec(b64decode("".join([L8EU.__doc__]).replace('\\n','').replace(' ','')))
 ```
 
 #### SpacenTabObfuscator
@@ -853,8 +854,6 @@ def greet(name):
 
 Insert dead (unreachable/unused) code blocks into the source.
 
-Source: `print('Hello, world')`
-
 ```python
 while False:
     Etb4inx6B1=[21,7,46,2]
@@ -864,6 +863,26 @@ while False:
 print('Hello, world')
 ```
 
+#### AddTypeHintsObfuscator
+
+Insert random type hints.
+
+Source:
+
+```python
+def foo(x):
+    z = x + 2
+    print(z)
+```
+
+Obfuscated:
+
+```python
+def foo(x: dict[dict[bytearray, None], frozenset[complex]])-> str | type:
+    z: complex | dict[memoryview, complex]=x+2
+    print(z)
+```
+
 ### Stager
 
 #### DownloadStager

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/__init__.py

@@ -41,6 +41,7 @@ from .esoteric.globals import GlobalsObfuscator
 from .esoteric.imports import ImportsObfuscator
 from .extract_variables import ExtractVariablesObfuscator
 from .junk.add_comments import AddCommentsObfuscator
+from .junk.add_type_hints import AddTypeHintsObfuscator
 from .junk.add_newlines import AddNewlinesObfuscator
 from .junk.dead_code import DeadCodeObfuscator
 from .names import NamesObfuscator
@@ -52,6 +53,7 @@ from .remove.indents import IndentsObfuscator
 from .remove.loggings import LoggingObfuscator, LoggingRemoveObfuscator
 from .remove.newline import NewlineObfuscator
 from .remove.print import PrintObfuscator
+from .remove.type_hints import TypeHintsObfuscator
 from .stegano.docstrings import DocstringObfuscator
 from .stegano.ipv6encoding import IPv6Obfuscator
 from .stegano.macencoding import MACObfuscator
@@ -62,6 +64,7 @@ __all__ = [
     "ASCII85Obfuscator",
     "AddCommentsObfuscator",
     "AddNewlinesObfuscator",
+    "AddTypeHintsObfuscator",
     "Base16Obfuscator",
     "Base32HexObfuscator",
     "Base32Obfuscator",
@@ -99,6 +102,7 @@ __all__ = [
     "SpacenTabObfuscator",
     "StringsObfuscator",
     "TokensObfuscator",
+    "TypeHintsObfuscator",
     "UUIDObfuscator",
     "WhitespaceObfuscator",
     "XORObfuscator",

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/builtins.py

@@ -18,7 +18,18 @@
 # TODO (deoktr): add `__name__.__class__.__class__.__base__.__subclasses__()` variant
 
 import random
-from tokenize import LPAR, LSQB, NAME, NUMBER, OP, RPAR, RSQB, STRING
+from tokenize import (
+    FSTRING_END,
+    FSTRING_START,
+    LPAR,
+    LSQB,
+    NAME,
+    NUMBER,
+    OP,
+    RPAR,
+    RSQB,
+    STRING,
+)
 from typing import ClassVar
 
 from pof.logger import logger
@@ -470,6 +481,7 @@ class BuiltinsObfuscator:
     def obfuscate_tokens(self, tokens):
         result = []
         parenthesis_depth = 0  # parenthesis depth
+        fstring_depth = 0
         prev_tokval = None
         for index, (toknum, tokval, *_) in enumerate(tokens):
             new_tokens = [(toknum, tokval)]
@@ -482,14 +494,20 @@ class BuiltinsObfuscator:
             elif toknum == OP and tokval == ")":
                 parenthesis_depth -= 1
 
+            if toknum == FSTRING_START:
+                fstring_depth += 1
+            elif toknum == FSTRING_END:
+                fstring_depth -= 1
+
             if (
                 toknum == NAME
                 and tokval in self.BUILTINS
-                and prev_tokval != "."  # avoid changing class/imports functions
+                and prev_tokval not in (".", "def", "class")
                 and (
                     parenthesis_depth == 0
                     or (parenthesis_depth > 0 and next_tokval != "=")
                 )
+                and fstring_depth == 0
             ):
                 new_tokens = self.obfuscate_builtins(tokval)
 

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/constants.py

@@ -38,7 +38,18 @@ Can extract:
 #
 
 import random
-from tokenize import DEDENT, ENCODING, INDENT, NAME, NEWLINE, NUMBER, OP, STRING
+from tokenize import (
+    DEDENT,
+    ENCODING,
+    FSTRING_END,
+    FSTRING_START,
+    INDENT,
+    NAME,
+    NEWLINE,
+    NUMBER,
+    OP,
+    STRING,
+)
 
 from pof.utils.generator import BasicGenerator
 from pof.utils.tokens import merge_implicit_strings
@@ -238,6 +249,7 @@ class ConstantsObfuscator:
         variables = {}
         result = []
         parenthesis_depth = 0  # parenthesis depth
+        fstring_depth = 0
         prev_tokval = None
         prev_toknum = None
         for index, (toknum, tokval, *_) in enumerate(tokens):
@@ -252,12 +264,17 @@ class ConstantsObfuscator:
             elif toknum == OP and tokval == ")":
                 parenthesis_depth -= 1
 
+            if toknum == FSTRING_START:
+                fstring_depth += 1
+            elif toknum == FSTRING_END:
+                fstring_depth -= 1
+
             # obfuscation
-            if (
+            if fstring_depth == 0 and (
                 (
                     toknum == NAME
                     and tokval in self.BUILTINS
-                    and prev_tokval != "."  # avoid changing class/imports functions
+                    and prev_tokval not in (".", "def", "class")
                     and (
                         parenthesis_depth == 0
                         or (parenthesis_depth > 0 and next_tokval != "=")

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/controlflow/control_flow_flatten.py

@@ -40,6 +40,8 @@ class ControlFlowFlattenObfuscator:
                     ast.AsyncFor,
                     ast.AsyncWith,
                     ast.Await,
+                    ast.Nonlocal,
+                    ast.Global,
                 ),
             ):
                 return True

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/esoteric/call.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import keyword
-from tokenize import NAME, OP
+from tokenize import FSTRING_END, FSTRING_START, NAME, OP
 
 
 # TODO (deoktr): add frequency
@@ -39,18 +39,25 @@ class CallObfuscator:
     def obfuscate_tokens(cls, tokens):
         result = []  # obfuscated tokens
         prev_tokval = None
+        fstring_depth = 0
         for index, (toknum, tokval, *_) in enumerate(tokens):
             new_tokens = [(toknum, tokval)]
             next_tokval = None
             if len(tokens) > index + 1:
                 _, next_tokval, *__ = tokens[index + 1]
 
+            if toknum == FSTRING_START:
+                fstring_depth += 1
+            elif toknum == FSTRING_END:
+                fstring_depth -= 1
+
             if (
                 # ensure it's not a definition
                 (prev_tokval is None or prev_tokval not in ["def", "class"])
                 and toknum == NAME
                 and tokval not in cls.RESERVED
                 and next_tokval == "("
+                and fstring_depth == 0
             ):
                 new_tokens.extend(
                     [

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/extract_variables.py

@@ -15,7 +15,19 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import keyword
-from tokenize import DEDENT, ENCODING, INDENT, NAME, NEWLINE, NL, NUMBER, OP, STRING
+from tokenize import (
+    DEDENT,
+    ENCODING,
+    FSTRING_END,
+    FSTRING_START,
+    INDENT,
+    NAME,
+    NEWLINE,
+    NL,
+    NUMBER,
+    OP,
+    STRING,
+)
 
 from pof.utils.generator import BasicGenerator
 from pof.utils.tokens import merge_implicit_strings
@@ -207,12 +219,13 @@ class ExtractVariablesObfuscator:
     def generate_new_name(self):
         return next(self.generator)
 
-    def obfuscate_tokens(self, tokens):  # noqa: C901
+    def obfuscate_tokens(self, tokens):  # noqa: C901, PLR0912
         tokens = merge_implicit_strings(tokens)
         result = []
         new_line_buffer = []
         line_buffer = []
         parenthesis_depth = 0
+        fstring_depth = 0
         prev_toknum = None
         in_decorator = False
 
@@ -224,6 +237,11 @@ class ExtractVariablesObfuscator:
             elif toknum == OP and tokval == ")":
                 parenthesis_depth -= 1
 
+            if toknum == FSTRING_START:
+                fstring_depth += 1
+            elif toknum == FSTRING_END:
+                fstring_depth -= 1
+
             # track decorator context, suppress flushing between @ and def/class
             if toknum == OP and tokval == "@":
                 in_decorator = True
@@ -244,8 +262,10 @@ class ExtractVariablesObfuscator:
             on_continuation_line = first_name_in_line in self.CONTINUATION_KEYWORDS
 
             if (
-                (toknum == STRING and not is_docstring) or toknum == NUMBER
-            ) and not on_continuation_line:
+                ((toknum == STRING and not is_docstring) or toknum == NUMBER)
+                and not on_continuation_line
+                and fstring_depth == 0
+            ):
                 random_name = self.generate_new_name()
                 new_line_buffer.extend(
                     [

{python_obfuscation_framework-1.11.1 → python_obfuscation_framework-1.12.0}/pof/obfuscator/junk/add_newlines.py

@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# TODO (deoktr): add parameter to disable spacing imports
 import random
 from tokenize import DEDENT, INDENT, NEWLINE
 
@@ -35,7 +34,6 @@ class AddNewlinesObfuscator:
                     new_tokens.extend([(NEWLINE, "\n")])
 
                 else:
-                    # FIXME (deoktr): add newlines BEFORE class/function decorators
                     next_non_indent_tokval = None
                     for i in range(index, len(tokens)):
                         tn, tv, *__ = tokens[i]