fix: StringsObfuscator

Author: deoktr

pof/obfuscator/boolean.py

@@ -44,24 +44,30 @@ def obf_true():
                     (RPAR, ")"),
                 ]
             case 3:
-                # not False
+                # (not False)
                 return [
+                    (LPAR, "("),
                     (NAME, "not"),
                     (NAME, "False"),
+                    (RPAR, ")"),
                 ]
             case 4:
-                # not not True
+                # (not not True)
                 return [
+                    (LPAR, "("),
                     (NAME, "not"),
                     (NAME, "not"),
                     (NAME, "True"),
+                    (RPAR, ")"),
                 ]
             case 5:
-                # "" in ""
+                # ("" in "")
                 return [
+                    (LPAR, "("),
                     (STRING, "''"),
                     (NAME, "in"),
                     (STRING, "''"),
+                    (RPAR, ")"),
                 ]
             case 6:
                 # bool(1)
@@ -97,25 +103,31 @@ def obf_false():
                     (RPAR, ")"),
                 ]
             case 3:
-                # not True
+                # (not True)
                 return [
+                    (LPAR, "("),
                     (NAME, "not"),
                     (NAME, "True"),
+                    (RPAR, ")"),
                 ]
             case 4:
-                # not not False
+                # (not not False)
                 return [
+                    (LPAR, "("),
                     (NAME, "not"),
                     (NAME, "not"),
                     (NAME, "False"),
+                    (RPAR, ")"),
                 ]
             case 5:
-                # "" not in ""
+                # ("" not in "")
                 return [
+                    (LPAR, "("),
                     (STRING, "''"),
                     (NAME, "not"),
                     (NAME, "in"),
                     (STRING, "''"),
+                    (RPAR, ")"),
                 ]
             case 6:
                 # bool(0)

pof/obfuscator/names.py

@@ -192,14 +192,30 @@ def visit_Call(self, node: ast.Call) -> ast.Call:
             node.args[1] = ast.Constant(value=self.mapping[node.args[1].value])
         return node
 
+    def _is_globals_call(self, node: ast.expr) -> bool:
+        """Check if node is a call to globals()."""
+        return (
+            isinstance(node, ast.Call)
+            and isinstance(node.func, ast.Name)
+            and node.func.id == "globals"
+            and not node.args
+        )
+
     def visit_Subscript(self, node: ast.Subscript) -> ast.Subscript:
         self.generic_visit(node)
         if (
-            isinstance(node.value, ast.Attribute)
-            and node.value.attr == "__dict__"
-            and isinstance(node.slice, ast.Constant)
+            isinstance(node.slice, ast.Constant)
             and isinstance(node.slice.value, str)
             and node.slice.value in self.mapping
+            and (
+                # __dict__['name'] pattern
+                (
+                    isinstance(node.value, ast.Attribute)
+                    and node.value.attr == "__dict__"
+                )
+                # globals()['name'] pattern
+                or self._is_globals_call(node.value)
+            )
         ):
             node.slice = ast.Constant(value=self.mapping[node.slice.value])
         return node
@@ -212,6 +228,7 @@ class NamesObfuscator:
         "__file__",
         "__name__",
         "__doc__",
+        "__builtins__",
         "__package__",
         "__loader__",
         "__spec__",

pof/obfuscator/remove/print.py

@@ -53,7 +53,7 @@ def obfuscate_tokens(tokens):
 
             if inside_print:
                 if print_par_depth == parenthesis_depth and (
-                    tokval not in ("(", "print") and prev_tokval != "print"
+                    tokval not in ("(", "print") and prev_tokval not in {"print", "."}
                 ):  # check if still inside print
                     inside_print = False
                 else: