frida-fusion 0.1.13__tar.gz → 0.1.14__tar.gz

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.13
+Version: 0.1.14
 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>

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion/__meta__.py

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

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion/args.py

@@ -6,6 +6,8 @@ import sys
 
 from .libs.color import Color
 from .__meta__ import __description__
+from .module import ModuleManager
+
 
 class Arguments(object):
     ''' Holds arguments used by the Frida Fusion '''
@@ -43,8 +45,37 @@ class Arguments(object):
         modules_group = parser.add_argument_group('Modules')
         self._add_modules_args(modules_group)
 
+        # Add module args
+        for mod in self._get_requested_module_list():
+            flags = parser.add_argument_group(f'{mod.name} Flags')
+            mod.create_instance().add_params(flags)
+
         return parser.parse_args()
 
+    def _get_requested_module_list(self):
+        mods = ModuleManager.list_modules()
+        parser = argparse.ArgumentParser()
+        parser.add_argument('-m',
+                            '--module',
+                            action='append',
+                            dest='enabled_modules')
+
+        t_args, _ = parser.parse_known_args([
+            word
+            for word in sys.argv
+            if word != "-h" and word != "--list-modules"
+        ])
+        if t_args is None or t_args.enabled_modules is None:
+            return []
+        return [
+            m
+            for md in t_args.enabled_modules
+            for mn in md.split(",")
+            if mn.strip() != ""
+            for _, m in mods.items()
+            if m.safe_name() == mn.lower()
+        ]
+
     def _add_app_args(self, app):
         app.add_argument('-f',
                          '--package',

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion/config.py

@@ -4,6 +4,7 @@ import os
 import errno
 import sys
 import signal
+from argparse import Namespace
 from pathlib import Path
 
 from .module import Module, ModuleManager, InternalModule, ExternalModule
@@ -17,6 +18,7 @@ class Configuration(object):
     version = '0.0.0'
 
     initialized = False  # Flag indicating config has been initialized
+    args: Namespace = {}
     debug_level = 0
     cmd_line = ''
     base_path = str(Path(__file__).resolve().parent)
@@ -98,6 +100,7 @@ class Configuration(object):
             sys.exit(0)
 
         args = Arguments().args
+        Configuration.args = args
 
         Color.pl('{+} {W}Startup parameters')
 

frida_fusion-0.1.14/frida_fusion/exceptions.py

@@ -0,0 +1,19 @@
+
+class SilentKillError(Exception):
+    def __init__(self, *args, **kwargs):
+        # args -> vão para a Exception (ex.: a mensagem)
+        # kwargs -> metadados opcionais seus
+        self.meta = kwargs
+        self._msg = kwargs.get("message") or ""
+        if args is not None and len(args) > 0 and self._msg == "":
+            self._msg = args[0]
+        super().__init__(*args)
+
+    def __str__(self):
+        if self._msg != "":
+            return self._msg
+        else:
+            return str(super(SilentKillError, self).__str__())
+
+    def __repr__(self):
+        return str(self)

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion/fusion.py

@@ -2,6 +2,7 @@
 # -*- coding: UTF-8 -*-
 from __future__ import annotations
 
+from .exceptions import SilentKillError
 from .libs.color import Color
 from .libs.scriptlocation import ScriptLocation
 
@@ -64,10 +65,12 @@ class Fusion(object):
         try:
             self.session.detach()
         except:
-            try:
-                self.device.kill(self.pid)
-            except:
-                pass
+            pass
+
+        try:
+            self.device.kill(self.pid)
+        except:
+            pass
 
     def get_device(self):
         try:
@@ -150,6 +153,13 @@ class Fusion(object):
 
         for m in self._modules:
             files_js += m.js_files()
+            dyn = m.dynamic_script()
+            if dyn is not None and dyn.strip(" \r\n") != "":
+                dyn += "\n\n"
+                line_cnt = len(dyn.split("\n")) - 1
+                self.script_trace[f"dyn_{m.safe_name()}.js"] = (offset, offset + line_cnt)
+                offset += line_cnt
+                src += dyn
 
         if os.path.isfile(Configuration.frida_scripts):
             files_js += [Configuration.frida_scripts]
@@ -220,9 +230,16 @@ class Fusion(object):
                 sys.exit(1)
 
     def attach(self, pid: int):
-        self.running = True
+        Fusion.running = True
         self.pid = pid
 
+        if self.session is not None:
+            try:
+                self.session.off("detached", self.on_detached)
+            except:
+                pass
+            self.session = None
+
         self.session = self.device.attach(self.pid)
         self.session.on("detached", self.on_detached)
 
@@ -231,7 +248,14 @@ class Fusion(object):
         self.device.resume(self.pid)
 
     def std_spawn(self):
-        self.running = True
+        Fusion.running = True
+
+        if self.session is not None:
+            try:
+                self.session.off("detached", self.on_detached)
+            except:
+                pass
+            self.session = None
 
         self.pid = self.device.spawn([Configuration.package])
         self.session = self.device.attach(self.pid)
@@ -242,7 +266,14 @@ class Fusion(object):
         self.device.resume(self.pid)
 
     def wait_spawn(self):
-        self.running = True
+        Fusion.running = True
+
+        if self.session is not None:
+            try:
+                self.session.off("detached", self.on_detached)
+            except:
+                pass
+            self.session = None
 
         self.pid = self.device.spawn([Configuration.package])
         self.device.resume(self.pid)
@@ -365,6 +396,18 @@ class Fusion(object):
                     else:
                         self.print_message(mLevel, message, script_location=script_location)
 
+                except SilentKillError as sk:
+                    skm = str(sk)
+
+                    self.print_message("D", "Silent kill requested",
+                                       script_location=Logger.get_caller_info(stack_index=1))
+                    Fusion.running = False
+                    time.sleep(0.2)
+                    if skm != "":
+                        Logger.pl(f'\n{skm}')
+                    Logger.pl('\n{+} {O}Exiting...{O}{W}')
+                    self.done.set()
+
                 except Exception as err:
                     script_location = ScriptLocation(file_name=Fusion._script_name)
                     self.print_message("E", message, script_location=script_location)
@@ -436,6 +479,7 @@ class Fusion(object):
         elif crash is not None:
             Logger.pl("[CRASH] details: " + str(crash))
 
+        Logger.pl("")
         self.done.set()
 
     def _raise_key_value_event(self,
@@ -451,6 +495,8 @@ class Fusion(object):
                     module=module,
                     received_data=received_data
                 )
+            except SilentKillError as ske:
+                raise ske
             except Exception as e:
                 if Configuration.debug_level >= 2:
                     self.print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
@@ -468,6 +514,8 @@ class Fusion(object):
                     stack_trace=stack_trace,
                     received_data=received_data
                 )
+            except SilentKillError as ske:
+                raise ske
             except Exception as e:
                 if Configuration.debug_level >= 2:
                     self.print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
@@ -626,6 +674,7 @@ class Fusion(object):
             if len(self._modules) > 0:
                 Logger.pl("{+} Starting selected modules")
                 for m in self._modules:
+                    m.load_from_arguments(Configuration.args)
                     m.start_module(
                         package=Configuration.package,
                         db_path=Configuration.db_path

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion/libs/helpers.js

@@ -2,12 +2,24 @@
     Author: Helvio Junior - M4v3r1ck
 */
 
+function fusion_rawSend(payload1){
+    send(payload1);
+}
+
 function fusion_Send(payload1, payload2){
     const info = fusion_getCallerInfo();
-    send({
-      payload: payload1,
-      location: info
-    }, payload2);
+
+    const message = {
+        payload: payload1,
+        location: info
+    };
+
+    // if payload1 is objet and has "type"
+    if (payload1 && typeof payload1 === 'object' && 'type' in payload1) {
+        message.type = payload1.type;
+    }
+
+    send(message, payload2);
 }
 
 function fusion_waitForClass(name, onReady) {
@@ -80,6 +92,12 @@ function fusion_bytesToBase64(byteArray){
     }
 }
 
+function fusion_normalizePtr(addr) {
+  let p = ptr(addr);
+  if (Process.arch === 'arm64') p = p.and('0x00FFFFFFFFFFFFFF'); // limpa TBI
+  return p;
+}
+
 function fusion_getCallerInfo() {
   try{
     const stack = new Error().stack.split("\n");
@@ -244,6 +262,38 @@ function fusion_getClassName(obj)
 
 }
 
+function fusion_getReadableRange(p) {
+  try { p = ptr(p); } catch (_) { return null; }
+  const range = Process.findRangeByAddress(p); // não lança exceção
+  if (!range) return null;
+  // range.protection exemplo: 'r-x', 'rw-'
+  return range.protection.indexOf('r') !== -1 ? range : null;
+}
+
+function fusion_isAddressReadable(p) {
+  const r = fusion_getReadableRange(p);
+  if (!r) return false;
+  // tenta ler 1 byte para confirmar acessibilidade
+  try { Memory.readU8(ptr(p)); return true; }
+  catch (_) { return false; }
+}
+
+function fusion_describeAddress(p) {
+  try { p = ptr(p); } catch (_) { return { ok:false, reason:'not a pointer' }; }
+  if (Process.arch === 'arm64') p = p.and('0x00FFFFFFFFFFFFFF'); // remove top byte
+  if (!fusion_isAddressReadable(p)) return { ok:false, reason:'invalid pointer' };
+  const range = Process.findRangeByAddress(p);
+  if (!range) return { ok:false, reason:'unmapped' };
+  return {
+    ok: true,
+    base: range.base,
+    size: range.size,
+    protection: range.protection,
+    file: range.file ? range.file.path : null
+  };
+}
+
+
 Java.perform(function () {
   const Thread = Java.use('java.lang.Thread');
   const UEH = Java.registerClass({

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion/module.py

@@ -1,6 +1,8 @@
 import os
 import sys
 import re
+from argparse import _ArgumentGroup, Namespace
+
 import frida
 import pkgutil
 import importlib
@@ -35,12 +37,21 @@ class ModuleBase(object):
     def start_module(self, **kwargs) -> bool:
         raise Exception('Method "start_module" is not yet implemented.')
 
+    def load_from_arguments(self, args: Namespace) -> bool:
+        return True
+
     def js_files(self) -> list:
         return []
 
+    def dynamic_script(self) -> str:
+        return ""
+
     def suppress_messages(self):
         pass
 
+    def add_params(self, flags: _ArgumentGroup):
+        pass
+
     def key_value_event(self,
                         script_location: ScriptLocation = None,
                         stack_trace: str = None,
@@ -125,6 +136,9 @@ class ExternalModule(Module):
 
 
 class ModuleManager:
+    initialized = False  # Flag indicating modules has been initialized
+    modules: dict[str, Module] = {}
+
     @classmethod
     def _safe_import_from_path(cls, path: Path, loaded_files: set):
         """
@@ -188,9 +202,12 @@ class ModuleManager:
 
     @classmethod
     def list_modules(cls) -> dict:
+        if ModuleManager.initialized:
+            return ModuleManager.modules
+
         try:
             base_module = Module.get_base_module()
-            modules: dict[str, Module] = {}
+            ModuleManager.modules = {}
 
             # --- 1) Varredura padrão do seu pacote interno: <este_arquivo>/modules ---
             base_path = Path(__file__).resolve().parent / "modules"
@@ -242,13 +259,13 @@ class ModuleManager:
             for i_class in ModuleBase.__subclasses__():
                 t = i_class()
                 key = t.safe_name()
-                if key in modules:
+                if key in ModuleManager.modules:
                     raise ModuleLoaderError(
                         f"Duplicated Module name: {i_class.__module__}.{i_class.__qualname__}"
                     )
 
                 if str(i_class.__module__) in internal_mods:
-                    modules[key] = InternalModule(
+                    ModuleManager.modules[key] = InternalModule(
                         name=t.name,
                         description=t.description,
                         module=str(i_class.__module__),
@@ -256,7 +273,7 @@ class ModuleManager:
                         class_name=i_class,
                     )
                 else:
-                    modules[key] = ExternalModule(
+                    ModuleManager.modules[key] = ExternalModule(
                         name=t.name,
                         description=t.description,
                         module=str(i_class.__module__),
@@ -264,7 +281,8 @@ class ModuleManager:
                         class_name=i_class,
                     )
 
-            return modules
+            ModuleManager.initialized = True
+            return ModuleManager.modules
 
         except Exception as e:
             # Envolve a exceção original para manter contexto

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.13
+Version: 0.1.14
 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>

{frida_fusion-0.1.13 → frida_fusion-0.1.14}/frida_fusion.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ frida_fusion/__main__.py
 frida_fusion/__meta__.py
 frida_fusion/args.py
 frida_fusion/config.py
+frida_fusion/exceptions.py
 frida_fusion/fusion.py
 frida_fusion/module.py
 frida_fusion.egg-info/PKG-INFO