frida-fusion 0.1.5__tar.gz → 0.1.7__tar.gz

frida_fusion-0.1.7/LICENSE

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2022, Helvio Junior
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.5
+Version: 0.1.7
 Summary: Hook your mobile tests with Frida
 Author-email: "Helvio Junior (M4v3r1ck)" <helvio_junior@hotmail.com>
 Maintainer-email: "Helvio Junior (M4v3r1ck)" <helvio_junior@hotmail.com>
@@ -12,7 +12,6 @@ Keywords: Frida Fusion,Frida,Frida Scripts,development,red team
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -27,6 +26,12 @@ Classifier: Topic :: Security
 Classifier: Topic :: Utilities
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: requests>=2.23.0
+Requires-Dist: frida>=15.1.17
+Requires-Dist: frida-tools>=10.8.0
+Dynamic: license-file
 
 # Frida Fusion 
 

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion/__meta__.py

@@ -1,8 +1,8 @@
-__version__ = '0.1.5'
+__version__ = '0.1.7'
 __title__ = "Frida Fusion"
 __description__ = "📱 frida-fusion - runtime mobile exploration"
 __url__ = "https://github.com/helviojunior/frida-fusion"
-__build__ = 0x63c974a8
+__build__ = 0x4760258
 __author__ = "Helvio Junior (M4v3r1ck)"
 __author_email__ = "helvio_junior@hotmail.com"
 __license__ = "GPL-3.0"

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion/config.py

@@ -168,13 +168,15 @@ class Configuration(object):
 
         if args.show_time:
             Configuration.print_timestamp = True
+        Logger.print_timestamp = Configuration.print_timestamp
 
-        if str(args.debug_level).upper() not in Color.level_map.keys():
+        if str(args.debug_level).upper() not in Logger.level_map.keys():
             Color.pl(
                 '{!} {R}error: invalid debug level{R}{W}\r\n')
             Configuration.mandatory()
 
-        Configuration.debug_level = Color.level_map.get(str(args.debug_level).upper(), 0)
+        Configuration.debug_level = Logger.level_map.get(str(args.debug_level).upper(), 0)
+        Logger.debug_level = Configuration.debug_level
 
         Logger.pl('     {C}min debug level:{O} %s{W}' % str(args.debug_level).upper())
 

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion/fusion.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from .libs.color import Color
+from .libs.scriptlocation import ScriptLocation
 
 try:
     from .config import Configuration
@@ -15,7 +16,6 @@ import frida
 import json
 import base64
 import os
-import threading
 import signal
 import sys
 import re
@@ -29,43 +29,6 @@ from .libs.logger import Logger
 
 
 class Fusion(object):
-    class ScriptLocation(object):
-        def __init__(self, file_name: str = "<unknown>", function_name: str = "<unknown>", line: str = "<unknown>"):
-            self.file_name = file_name if file_name is not None else "<unknown>"
-            self.function_name = function_name if function_name is not None else "<unknown>"
-            self.line = str(line) if line is not None else "<unknown>"
-
-        def get_int_line(self):
-            try:
-                return int(self.line)
-            except:
-                return 0
-
-        def __str__(self):
-            return f"{self.file_name}:{self.line} ({self.function_name})"
-
-        def __repr__(self):
-            return str(self)
-
-        @staticmethod
-        def parse_from_dict(data: dict):
-
-            file_name = Path(data.get("file_name", "unknown")).name
-            function_name = data.get("function_name", "unknown")
-            line = str(data.get("line", -1))
-
-            if 'fileName' in data.keys():
-                file_name = Path(data.get("fileName", file_name)).name
-
-            if 'lineNumber' in data.keys():
-                line = str(data.get("lineNumber", line))
-
-            return Fusion.ScriptLocation(
-                file_name=file_name,
-                function_name=function_name,
-                line=line
-            )
-
     running = True
     debug = True
     print_timestamp = False
@@ -87,7 +50,12 @@ class Fusion(object):
         t.start()
 
     def signal_handler(self, sig, frame):
+        if Logger.debug_level <= 2:
+            Logger.debug_level = 2
+
+        Fusion.running = False
         Logger.pl('\n{!} {O}interrupted, shutting down...{W}\n')
+        time.sleep(0.5)
         self.done.set()
 
     def wait(self):
@@ -117,17 +85,17 @@ class Fusion(object):
 
         return self.device
 
-    def translate_location(self, location: dict) -> Fusion.ScriptLocation:
+    def translate_location(self, location: dict) -> ScriptLocation:
         if location is None or not isinstance(location, dict):
-            return Fusion.ScriptLocation()
+            return ScriptLocation()
 
-        loc = Fusion.ScriptLocation.parse_from_dict(location)
+        loc = ScriptLocation.parse_from_dict(location)
 
         if loc.file_name != "fusion_bundle.js":
             return loc
 
         return next(iter([
-            Fusion.ScriptLocation(
+            ScriptLocation(
                 file_name=k,
                 function_name=loc.function_name,
                 line=str(1 + loc.get_int_line() - v[0])
@@ -136,6 +104,25 @@ class Fusion(object):
             if v[0] <= loc.get_int_line() <= v[1]
         ]), loc)
 
+    @classmethod
+    def print_message(cls, level: str = "*", message: str = "",
+                      script_location: ScriptLocation = None):
+
+        if Fusion.running is False and Logger.debug_level >= 2:
+            return
+
+        if script_location is None:
+            script_location = ScriptLocation(
+                file_name=Fusion._script_name
+            )
+
+        Logger.print_message(
+            level=level,
+            message=message,
+            script_location=script_location,
+            filename_col_len=Fusion.max_filename
+        )
+
     def load_all_scripts(self):
         self.script_trace = {}
         offset = 1
@@ -200,6 +187,8 @@ class Fusion(object):
                 if len(file_name) > Fusion.max_filename:
                     Fusion.max_filename = len(file_name)
 
+            Logger.filename_col_len = Fusion.max_filename
+
         try:
             s = self.session.create_script(src, name="fusion_bundle")
             s.on("message", self.make_handler("fusion_bundle.js"))  # register the message handler
@@ -247,9 +236,13 @@ class Fusion(object):
 
     def make_handler(self, script_name):
         def handler(message, payload):
+
+            if not Fusion.running:
+                return
+
             if message["type"] == "send":
                 try:
-                    script_location = Fusion.ScriptLocation()
+                    script_location = ScriptLocation()
                     jData = message.get("payload", {})
                     if isinstance(jData, str):
                         jData = json.loads(message["payload"])
@@ -261,6 +254,19 @@ class Fusion(object):
                         jData = jData.get("payload", {})
                         script_location = self.translate_location(location)
 
+                    if isinstance(jData, str):
+                        msg = jData
+                        try:
+                            msg = base64.b64encode(jData.encode("UTF-8"))
+                        except Exception:
+                            pass
+
+                        jData = {
+                            "type": "message",
+                            "level": "I",
+                            "message": msg
+                        }
+
                     if script_location.file_name == "<unknown>":
                         script_location.file_name = script_name
 
@@ -272,10 +278,10 @@ class Fusion(object):
                             msg = base64.b64decode(msg).decode("UTF-8")
                         except:
                             pass
-                        self._print_message(mLevel, msg, script_location=script_location)
+                        self.print_message(mLevel, msg, script_location=script_location)
 
                     elif mType == "key_value_data":
-                        self._print_message("V", "RAW JSON:\n    %s" % (
+                        self.print_message("V", "RAW JSON:\n    %s" % (
                             json.dumps(jData, indent=4).replace("\n", "\n    ")
                         ), script_location=script_location)
 
@@ -305,7 +311,7 @@ class Fusion(object):
 
                     # Legacy
                     elif mType == "data":
-                        self._print_message("V", "RAW JSON:\n    %s" % (
+                        self.print_message("V", "RAW JSON:\n    %s" % (
                             json.dumps(jData, indent=4).replace("\n", "\n    ")
                         ), script_location=script_location)
 
@@ -329,19 +335,19 @@ class Fusion(object):
 
                     elif mType == "java-uncaught":
                         self.insert_history('frida', json.dumps(jData))
-                        self._print_message("E", jData.get('stack', ''), script_location=script_location)
+                        self.print_message("E", jData.get('stack', ''), script_location=script_location)
 
                     else:
-                        self._print_message(mLevel, message, script_location=script_location)
+                        self.print_message(mLevel, message, script_location=script_location)
 
                 except Exception as err:
-                    script_location = Fusion.ScriptLocation(file_name=Fusion._script_name)
-                    self._print_message("E", message, script_location=script_location)
-                    self._print_message("E", payload, script_location=script_location)
+                    script_location = ScriptLocation(file_name=Fusion._script_name)
+                    self.print_message("E", message, script_location=script_location)
+                    self.print_message("E", payload, script_location=script_location)
                     self.print_exception(err)
 
             else:
-                script_location = Fusion.ScriptLocation.parse_from_dict(message)
+                script_location = ScriptLocation.parse_from_dict(message)
                 try:
                     if message["type"] == "error":
                         description = message.get('description', '')
@@ -375,18 +381,18 @@ class Fusion(object):
                             "stack": stack
                         }))
 
-                        self._print_message("F", description + stack,
-                                            script_location=script_location)
+                        self.print_message("F", description + stack,
+                                           script_location=script_location)
                         Fusion.running = False
                         time.sleep(0.2)
                         Logger.pl('\n{+} {O}Exiting...{O}{W}')
                         self.done.set()
                     else:
-                        self._print_message("I", message, script_location=script_location)
-                        self._print_message("I", payload, script_location=script_location)
+                        self.print_message("I", message, script_location=script_location)
+                        self.print_message("I", payload, script_location=script_location)
                 except:
-                    self._print_message("I", message, script_location=script_location)
-                    self._print_message("I", payload, script_location=script_location)
+                    self.print_message("I", message, script_location=script_location)
+                    self.print_message("I", payload, script_location=script_location)
 
         return handler
 
@@ -404,7 +410,7 @@ class Fusion(object):
         self.done.set()
 
     def _raise_key_value_event(self,
-                               script_location: Fusion.ScriptLocation = None,
+                               script_location: ScriptLocation = None,
                                stack_trace: str = None,
                                module: str = None,
                                received_data: dict = None):
@@ -417,10 +423,10 @@ class Fusion(object):
                     received_data=received_data
                 )
             except Exception as e:
-                self._print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
+                self.print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
 
     def _raise_data_event(self,
-                          script_location: Fusion.ScriptLocation = None,
+                          script_location: ScriptLocation = None,
                           stack_trace: str = None,
                           received_data: str = None):
         for m in self._modules:
@@ -431,7 +437,7 @@ class Fusion(object):
                     received_data=received_data
                 )
             except Exception as e:
-                self._print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
+                self.print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
 
     @classmethod
     def insert_history(cls,  source: str, data: str, stack_trace: str = ''):
@@ -449,81 +455,20 @@ class Fusion(object):
             kwargs = Fusion._db_jobs.get()
             db.insert_history(**kwargs)
 
-    @classmethod
-    def _print_message(cls, level: str = "*", message: str = "",
-                       script_location: Fusion.ScriptLocation = None):
-
-        if not Fusion.running and not Configuration.debug_level >= 2:
-            return
-
-        if level is None:
-            level = "*"
-
-        dbg_tag = next(iter([
-            k
-            for k in Color.level_map.keys()
-            if level.upper() == k
-        ]), Color.level_tag.get(level, "I"))
-
-        dbg_idx = Color.level_map.get(dbg_tag, 0)
-
-        if Configuration.debug_level > dbg_idx:
-            return
-
-        prefix = ""
-        if Configuration.print_timestamp:
-            ts = datetime.now()
-            stamp = f"{ts:%H:%M:%S}.{int(ts.microsecond / 1000):03d}"
-            prefix += f"\033[2m{stamp.ljust(13)}{Color.color_reset}"
-
-        fg_color = Color.color_level[dbg_idx]
-        tag_color = Color.color_tags[dbg_idx]
-
-        if script_location is None:
-            script_location = Fusion.ScriptLocation(
-                file_name=Fusion._script_name
-            )
-
-        if script_location.file_name == "frida/node_modules/frida-java-bridge/lib/class-factory.js":
-            file_name = "frida/.../class-factory.js"
-        else:
-            file_name = str(Path(script_location.file_name).name)
-
-        prefix += (f"{fg_color}{file_name.rjust(Fusion.max_filename)}"
-                   f"{Color.color_reset}\033[2m:{str(script_location.line).ljust(10)}"
-                   f"{Color.color_reset} ")
-        prefix_len = len(Color.escape_ansi(prefix))
-
-        f_message = ""
-        if message is None:
-            message = ""
-
-        if isinstance(message, dict):
-            try:
-                message = json.dumps(message, ident=4)
-            except:
-                message = str(message)
-
-        for line in message.split("\n"):
-            if f_message == "":
-                f_message += (f"{prefix}{tag_color} {dbg_tag} {Color.color_reset} "
-                              f"{fg_color}{line}{Color.color_reset}")
-            else:
-                f_message += (f"\n{''.rjust(prefix_len)}{tag_color} {dbg_tag} "
-                              f"{Color.color_reset} {fg_color}{line}{Color.color_reset}")
-
-        Logger.pl(f_message)
-
     @classmethod
     def print_exception(cls, err):
-        Logger.pl('\n{!} {R}Error:{O} %s{W}' % str(err))
-        Logger.pl('\n{!} {O}Full stack trace below')
         from traceback import format_exc
-        err_txt = format_exc().strip()
+        err_txt = '{R}Error:{O} %s{W}' % str(err)
+        err_txt += '{O}Full stack trace below'
+        err_txt += format_exc().strip()
+
         err_txt = err_txt.replace('\n', '\n{W}{!} {W}   ')
         err_txt = err_txt.replace('  File', '{W}{D}File')
         err_txt = err_txt.replace('  Exception: ', '{R}Exception: {O}')
-        Logger.pl('{!}    ' + err_txt)
+        cls.print_message(
+            level="E",
+            message=Color.s('{!}    ' + err_txt)
+        )
 
     @classmethod
     def check_frida_native_exception(cls, evt: dict) -> bool:

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion/libs/color.py

@@ -52,21 +52,6 @@ class Color(object):
         "\033[31m\033[48;2;60;60;60m",  # Fatal
     ]
 
-    level_map = {
-        "V": 0,
-        "D": 1,
-        "I": 2,
-        "W": 3,
-        "E": 4,
-        "F": 5,
-    }
-
-    level_tag = {
-        "*": "D",
-        "+": "I",
-        "-": "W",
-    }
-
     last_sameline_length = 0
 
     @staticmethod

frida_fusion-0.1.7/frida_fusion/libs/logger.py

@@ -0,0 +1,169 @@
+#!/usr/bin/python3
+# -*- coding: UTF-8 -*-
+import base64
+import inspect
+import json
+import datetime
+from pathlib import Path
+
+from .scriptlocation import ScriptLocation
+from ..libs.color import Color
+
+
+class Logger(object):
+    ''' Helper object for easily printing colored text to the terminal. '''
+
+    out_file = ''
+    debug_level = 0
+    print_timestamp = True
+    filename_col_len = 0
+
+    level_map = {
+        "V": 0,
+        "D": 1,
+        "I": 2,
+        "W": 3,
+        "E": 4,
+        "F": 5,
+    }
+
+    level_tag = {
+        "*": "D",
+        "+": "I",
+        "-": "W",
+    }
+
+    @staticmethod
+    def pl(text):
+        '''Prints text using colored format with trailing new line.'''
+        Color.pl(text)
+
+        if Logger.out_file != '':
+            try:
+                with open(Logger.out_file, "a") as text_file:
+                    text_file.write(Color.sc(text) + '\n')
+            except:
+                pass
+
+    @staticmethod
+    def pl_file(text):
+        '''Prints text using colored format with trailing new line.'''
+
+        if Logger.out_file != '':
+            try:
+                with open(Logger.out_file, "a") as text_file:
+                    text_file.write(Color.escape_ansi(Color.sc(text)) + '\n')
+            except:
+                Color.pl(text)
+        else:
+            Color.pl(text)
+
+    @classmethod
+    def _get_caller_info(cls, stack_index: int = 1) -> ScriptLocation:
+        """Retrieves information about the calling script, function, and line number."""
+        # inspect.stack() returns a list of frame records.
+        # Each frame record is a tuple containing:
+        # (frame object, filename, line number, function name, list of lines of context, index of current line in context)
+
+        # The first element (index 0) is the current function (get_caller_info).
+        # The second element (index 1) is the caller of get_caller_info.
+        caller_frame = inspect.stack()[stack_index]
+
+        # Extract information from the caller's frame
+        filename = caller_frame.filename
+        line_number = caller_frame.lineno
+        function_name = caller_frame.function
+
+        # Optionally, get the base name of the script for cleaner output
+        script_name = Path(filename).name
+
+        return ScriptLocation(
+            file_name=script_name,
+            function_name=function_name,
+            line=str(line_number)
+        )
+
+    @staticmethod
+    def json_serial(obj):
+        """JSON serializer for objects not serializable by default json code"""
+
+        if isinstance(obj, (datetime.datetime, datetime.date)):
+            # obj = obj.astimezone(datetime.timezone(datetime.timedelta(hours=0), 'Z'))
+            return obj.strftime("%Y-%m-%dT%H:%M:%S.000Z")
+
+        if isinstance(obj, bytes):
+            return base64.b64encode(obj).decode("UTF-8")
+
+        try:
+            return str(obj)
+        except:
+            return f"[ERROR] Type %s not serializable{type(obj)}"
+
+    @classmethod
+    def print_message(cls, level: str = "*", message: str = "",
+                      script_location: ScriptLocation = None, filename_col_len: int = 26):
+
+        if level is None:
+            level = "*"
+
+        dbg_tag = next(iter([
+            k
+            for k in Logger.level_map.keys()
+            if level.upper() == k
+        ]), Logger.level_tag.get(level, "I"))
+
+        dbg_idx = Logger.level_map.get(dbg_tag, 0)
+
+        if Logger.debug_level > dbg_idx:
+            return
+
+        if filename_col_len < 26:
+            filename_col_len = 26
+
+        if Logger.filename_col_len > filename_col_len:
+            filename_col_len = Logger.filename_col_len
+
+        prefix = ""
+        if Logger.print_timestamp:
+            ts = datetime.datetime.now()
+            stamp = f"{ts:%H:%M:%S}.{int(ts.microsecond / 1000):03d}"
+            prefix += f"\033[2m{stamp.ljust(13)}{Color.color_reset}"
+
+        fg_color = Color.color_level[dbg_idx]
+        tag_color = Color.color_tags[dbg_idx]
+
+        if script_location is None:
+            script_location = cls._get_caller_info(stack_index=2)
+
+        if script_location.file_name == "frida/node_modules/frida-java-bridge/lib/class-factory.js":
+            file_name = "frida/.../class-factory.js"
+        else:
+            file_name = str(Path(script_location.file_name).name)
+
+        if len(file_name) > filename_col_len:
+            file_name = f"{file_name[0:filename_col_len-3]}..."
+
+        prefix += (f"{fg_color}{file_name.rjust(filename_col_len)}"
+                   f"{Color.color_reset}\033[2m:{str(script_location.line).ljust(10)}"
+                   f"{Color.color_reset} ")
+        prefix_len = len(Color.escape_ansi(prefix))
+
+        f_message = ""
+        if message is None:
+            message = ""
+
+        if isinstance(message, dict):
+            try:
+                message = json.dumps(message, ident=4, default=Logger.json_serial)
+            except:
+                message = str(message)
+
+        for line in message.split("\n"):
+            if f_message == "":
+                f_message += (f"{prefix}{tag_color} {dbg_tag} {Color.color_reset} "
+                              f"{fg_color}{line}{Color.color_reset}")
+            else:
+                f_message += (f"\n{''.rjust(prefix_len)}{tag_color} {dbg_tag} "
+                              f"{Color.color_reset} {fg_color}{line}{Color.color_reset}")
+
+        Logger.pl(f_message)

frida_fusion-0.1.7/frida_fusion/libs/scriptlocation.py

@@ -0,0 +1,39 @@
+from pathlib import Path
+
+
+class ScriptLocation(object):
+    def __init__(self, file_name: str = "<unknown>", function_name: str = "<unknown>", line: str = "<unknown>"):
+        self.file_name = file_name if file_name is not None else "<unknown>"
+        self.function_name = function_name if function_name is not None else "<unknown>"
+        self.line = str(line) if line is not None else "<unknown>"
+
+    def get_int_line(self):
+        try:
+            return int(self.line)
+        except Exception:
+            return 0
+
+    def __str__(self):
+        return f"{self.file_name}:{self.line} ({self.function_name})"
+
+    def __repr__(self):
+        return str(self)
+
+    @staticmethod
+    def parse_from_dict(data: dict):
+
+        file_name = Path(data.get("file_name", "unknown")).name
+        function_name = data.get("function_name", "unknown")
+        line = str(data.get("line", -1))
+
+        if 'fileName' in data.keys():
+            file_name = Path(data.get("fileName", file_name)).name
+
+        if 'lineNumber' in data.keys():
+            line = str(data.get("lineNumber", line))
+
+        return ScriptLocation(
+            file_name=file_name,
+            function_name=function_name,
+            line=line
+        )

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion/modules/crypto/crypto.py

@@ -5,12 +5,9 @@ import string
 
 from frida_fusion.libs.logger import Logger
 from frida_fusion.libs.database import Database
+from frida_fusion.libs.scriptlocation import ScriptLocation
 from frida_fusion.module import ModuleBase
 
-from typing import TYPE_CHECKING
-if TYPE_CHECKING:
-    from frida_fusion.fusion import Fusion  # só no type checker
-
 
 class Crypto(ModuleBase):
     class CryptoDB(Database):
@@ -287,7 +284,7 @@ class Crypto(ModuleBase):
         ]
 
     def key_value_event(self,
-                        script_location: "Fusion.ScriptLocation" = None,
+                        script_location: ScriptLocation = None,
                         stack_trace: str = None,
                         module: str = None,
                         received_data: dict = None
@@ -319,6 +316,12 @@ class Crypto(ModuleBase):
                                           received_data.get('output', ''),
                                           stack_trace=stack_trace)
 
+            Logger.print_message(
+                level="D",
+                message=f"Cipher doFinal received\n{stack_trace}",
+                script_location=script_location
+            )
+
         elif module == "messageDigest.update":
             hashcode = received_data.get('hashcode', None)
             algorithm = received_data.get('algorithm', None)
@@ -332,10 +335,28 @@ class Crypto(ModuleBase):
             bOutput = received_data.get('output', None)
             self._crypto_db.insert_digest(hashcode, algorithm, bInput, bOutput, stack_trace=stack_trace)
 
+            hash_hex = ""
+            if bOutput is not None:
+                try:
+                    if isinstance(bOutput, bytes):
+                        hash_hex = ''.join('{:02x}'.format(b) for b in bOutput)
+                    else:
+                        hash_hex = ''.join('{:02x}'.format(b) for b in base64.b64decode(bOutput))
+                except:
+                    pass
+
+            # Do not print TLS certificate verification hash
+            if 'com.android.org.conscrypt.ConscryptEngine.verifyCertificateChain' not in stack_trace:
+                Logger.print_message(
+                    level="D",
+                    message=f"Message digest\nAlgorithm: {algorithm}\nHash: {hash_hex}\n{stack_trace}",
+                    script_location=script_location
+                )
+
         return True
 
     def data_event(self,
-                   script_location: "Fusion.ScriptLocation" = None,
+                   script_location: ScriptLocation = None,
                    stack_trace: str = None,
                    received_data: str = None
                    ) -> bool:

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion/modules/tls_unpinning/frida_multiple_unpinning.py

@@ -1,15 +1,10 @@
 import errno
 import os.path
-import tempfile
 from pathlib import Path
 from frida_fusion.libs.logger import Logger
+from frida_fusion.libs.scriptlocation import ScriptLocation
 from frida_fusion.module import ModuleBase
 
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from frida_fusion.fusion import Fusion  # só no type checker
-
 
 class TlsUnpinning(ModuleBase):
 
@@ -49,7 +44,7 @@ class TlsUnpinning(ModuleBase):
         ]
 
     def key_value_event(self,
-                        script_location: "Fusion.ScriptLocation" = None,
+                        script_location: ScriptLocation = None,
                         stack_trace: str = None,
                         module: str = None,
                         received_data: dict = None
@@ -57,7 +52,7 @@ class TlsUnpinning(ModuleBase):
         return True
 
     def data_event(self,
-                   script_location: "Fusion.ScriptLocation" = None,
+                   script_location: ScriptLocation = None,
                    stack_trace: str = None,
                    received_data: str = None
                    ) -> bool:

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.5
+Version: 0.1.7
 Summary: Hook your mobile tests with Frida
 Author-email: "Helvio Junior (M4v3r1ck)" <helvio_junior@hotmail.com>
 Maintainer-email: "Helvio Junior (M4v3r1ck)" <helvio_junior@hotmail.com>
@@ -12,7 +12,6 @@ Keywords: Frida Fusion,Frida,Frida Scripts,development,red team
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -27,6 +26,12 @@ Classifier: Topic :: Security
 Classifier: Topic :: Utilities
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: requests>=2.23.0
+Requires-Dist: frida>=15.1.17
+Requires-Dist: frida-tools>=10.8.0
+Dynamic: license-file
 
 # Frida Fusion 
 

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/frida_fusion.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 pyproject.toml
 setup.py
@@ -19,6 +20,7 @@ frida_fusion/libs/color.py
 frida_fusion/libs/database.py
 frida_fusion/libs/helpers.js
 frida_fusion/libs/logger.py
+frida_fusion/libs/scriptlocation.py
 frida_fusion/modules/__init__.py
 frida_fusion/modules/crypto/__init__.py
 frida_fusion/modules/crypto/crypto.js

{frida-fusion-0.1.5 → frida_fusion-0.1.7}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "setuptools-scm"]
+requires = ["setuptools>=80.0.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -8,13 +8,12 @@ name = "frida-fusion"
 description = "Hook your mobile tests with Frida"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.9,<4"
-license = {file = "LICENSE"}
+license-files = ["LICEN[CS]E*"]
 keywords = ["Frida Fusion", "Frida", "Frida Scripts", "development", "red team"]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Environment :: Console",
   "Intended Audience :: System Administrators",
-  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python",

frida-fusion-0.1.5/frida_fusion/libs/logger.py

@@ -1,36 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: UTF-8 -*-
-
-import sys
-from ..libs.color import Color
-
-
-class Logger(object):
-    ''' Helper object for easily printing colored text to the terminal. '''
-
-    out_file = ''
-
-    @staticmethod
-    def pl(text):
-        '''Prints text using colored format with trailing new line.'''
-        Color.pl(text)
-
-        if Logger.out_file != '':
-            try:
-                with open(Logger.out_file, "a") as text_file:
-                    text_file.write(Color.sc(text) + '\n')
-            except:
-                pass
-
-    @staticmethod
-    def pl_file(text):
-        '''Prints text using colored format with trailing new line.'''
-
-        if Logger.out_file != '':
-            try:
-                with open(Logger.out_file, "a") as text_file:
-                    text_file.write(Color.escape_ansi(Color.sc(text)) + '\n')
-            except:
-                Color.pl(text)
-        else:
-            Color.pl(text)