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

{frida_fusion-0.1.7 → frida_fusion-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.7
+Version: 0.1.9
 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>
@@ -73,6 +73,43 @@ Modules:
 pip3 install frida-fusion
 ```
 
+## Custom Frida script
+
+You must provide a custom Frida script as usual. To do this you must provide `-s/--script-path` parameter.
+
+```bash
+# Just one file
+frida-fusion -f [app_id] -U --script-path mytest.js
+
+# A entire directory
+frida-fusion -f [app_id] -U --script-path /tmp/scripts
+```
+
+### Exposed JavaScript (frida) functions
+
+The Frida Fusion define/expose several functions to be used at frida scripts. Follows the typedef of these functions.
+
+```java
+# Send message/data to Frida-Fusion
+void    fusion_sendMessage(String level, String message);
+void    fusion_sendMessageWithTrace(String level, String message);
+void    fusion_sendKeyValueData(String module, Object items);
+
+# Print StackTrace
+void    fusion_printStackTrace();
+
+# Print all methods of class 'name'
+void    fusion_printMethods(String name);
+
+# Wait until the class 'name' exists in memory to execute the callback function
+void    fusion_waitForClass(String name, CallbackFunction onReady)
+
+# Conversions
+byte[]  fusion_stringToBase64(String message);
+String  fusion_bytesToBase64(byte[] byteArray);
+String  fusion_encodeHex(byte[] byteArray);
+```
+
 ## Module engine
 
 You can check available modules with `frida-fusion --list-modules` command.
@@ -104,7 +141,7 @@ export FUSION_MODULES=/tmp/modules
 frida-fusion --list-modules
 
 # Using available module
-frida-fusion -f [app_id] -U --script-path . -m [module_name]
+frida-fusion -f [app_id] -U --script-path mytest.js -m [module_name]
 ```
 
 At windows:
@@ -116,7 +153,7 @@ $env:FUSION_MODULES = "C:\extra_mods"
 frida-fusion --list-modules
 
 # Using available module
-frida-fusion -f [app_id] -U --script-path . -m [module_name]
+frida-fusion -f [app_id] -U --script-path mytest.js -m [module_name]
 ```
 
 ### Community modules
@@ -131,3 +168,4 @@ export FUSION_MODULES=/tmp/frida-fusion-community-modules
 # List all modules
 frida-fusion --list-modules
 ```
+

{frida_fusion-0.1.7 → frida_fusion-0.1.9}/README.md

@@ -38,6 +38,43 @@ Modules:
 pip3 install frida-fusion
 ```
 
+## Custom Frida script
+
+You must provide a custom Frida script as usual. To do this you must provide `-s/--script-path` parameter.
+
+```bash
+# Just one file
+frida-fusion -f [app_id] -U --script-path mytest.js
+
+# A entire directory
+frida-fusion -f [app_id] -U --script-path /tmp/scripts
+```
+
+### Exposed JavaScript (frida) functions
+
+The Frida Fusion define/expose several functions to be used at frida scripts. Follows the typedef of these functions.
+
+```java
+# Send message/data to Frida-Fusion
+void    fusion_sendMessage(String level, String message);
+void    fusion_sendMessageWithTrace(String level, String message);
+void    fusion_sendKeyValueData(String module, Object items);
+
+# Print StackTrace
+void    fusion_printStackTrace();
+
+# Print all methods of class 'name'
+void    fusion_printMethods(String name);
+
+# Wait until the class 'name' exists in memory to execute the callback function
+void    fusion_waitForClass(String name, CallbackFunction onReady)
+
+# Conversions
+byte[]  fusion_stringToBase64(String message);
+String  fusion_bytesToBase64(byte[] byteArray);
+String  fusion_encodeHex(byte[] byteArray);
+```
+
 ## Module engine
 
 You can check available modules with `frida-fusion --list-modules` command.
@@ -69,7 +106,7 @@ export FUSION_MODULES=/tmp/modules
 frida-fusion --list-modules
 
 # Using available module
-frida-fusion -f [app_id] -U --script-path . -m [module_name]
+frida-fusion -f [app_id] -U --script-path mytest.js -m [module_name]
 ```
 
 At windows:
@@ -81,7 +118,7 @@ $env:FUSION_MODULES = "C:\extra_mods"
 frida-fusion --list-modules
 
 # Using available module
-frida-fusion -f [app_id] -U --script-path . -m [module_name]
+frida-fusion -f [app_id] -U --script-path mytest.js -m [module_name]
 ```
 
 ### Community modules
@@ -96,3 +133,4 @@ export FUSION_MODULES=/tmp/frida-fusion-community-modules
 # List all modules
 frida-fusion --list-modules
 ```
+

{frida_fusion-0.1.7 → frida_fusion-0.1.9}/frida_fusion/__meta__.py

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

{frida_fusion-0.1.7 → frida_fusion-0.1.9}/frida_fusion/fusion.py

@@ -167,14 +167,14 @@ class Fusion(object):
             else:
                 Logger.pl("{*} Loading script file " + file_name)
                 for r in ["*", "-", "+", "!"]:
-                    file_data = file_data.replace(f"console.log('[{r}] ", f"sendMessage('{r}', '")
-                    file_data = file_data.replace(f'console.log("[{r}] ', f'sendMessage("{r}", "')
-                    file_data = file_data.replace(f"console.log('[{r}]", f"sendMessage('{r}', '")
-                    file_data = file_data.replace(f'console.log("[{r}]', f'sendMessage("{r}", "')
+                    file_data = file_data.replace(f"console.log('[{r}] ", f"fusion_sendMessage('{r}', '")
+                    file_data = file_data.replace(f'console.log("[{r}] ', f'fusion_sendMessage("{r}", "')
+                    file_data = file_data.replace(f"console.log('[{r}]", f"fusion_sendMessage('{r}', '")
+                    file_data = file_data.replace(f'console.log("[{r}]', f'fusion_sendMessage("{r}", "')
 
-                file_data = re.sub(r'(?<!\w)send\(', 'iSend(', file_data)
+                file_data = re.sub(r'(?<!\w)send\(', 'fusion_Send(', file_data)
 
-                file_data = file_data.replace(f'console.log(', f'sendMessage("I", ')
+                file_data = file_data.replace(f'console.log(', f'fusion_sendMessage("I", ')
                 file_data += "\n\n"
 
                 line_cnt = len(file_data.split("\n")) - 1
@@ -371,7 +371,11 @@ class Fusion(object):
                         for m in matches:
                             stack = stack.replace(m[0], f"{m[1].file_name}:{m[1].line}")
 
-                        if script_location.file_name == "class-factory.js" and len(matches) == 1:
+                        if script_location.file_name == "fusion_bundle.js" and len(matches) >= 1:
+                            script_location.file_name = matches[0][1].file_name
+                            script_location.line = matches[0][1].line
+
+                        elif script_location.file_name == "class-factory.js" and len(matches) == 1:
                             script_location.file_name = matches[0][1].file_name
                             script_location.line = matches[0][1].line
 
@@ -423,7 +427,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)}")
+                if Configuration.debug_level >= 2:
+                    self.print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
+                else:
+                    self.print_exception(e)
 
     def _raise_data_event(self,
                           script_location: ScriptLocation = None,
@@ -437,7 +444,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)}")
+                if Configuration.debug_level >= 2:
+                    self.print_message("E", f"Error resizing event to module {m.name}: {str(e)}")
+                else:
+                    self.print_exception(e)
 
     @classmethod
     def insert_history(cls,  source: str, data: str, stack_trace: str = ''):
@@ -458,16 +468,19 @@ class Fusion(object):
     @classmethod
     def print_exception(cls, err):
         from traceback import format_exc
-        err_txt = '{R}Error:{O} %s{W}' % str(err)
-        err_txt += '{O}Full stack trace below'
+        err_txt = 'Error:{O} %s{W}' % str(err)
+        err_txt += '\n{O}Full stack trace below\n'
         err_txt += format_exc().strip()
 
-        err_txt = err_txt.replace('\n', '\n{W}{!} {W}   ')
+        err_txt = err_txt.replace('\n', '\n{W}   ')
         err_txt = err_txt.replace('  File', '{W}{D}File')
         err_txt = err_txt.replace('  Exception: ', '{R}Exception: {O}')
-        cls.print_message(
+
+        Logger.print_message(
             level="E",
-            message=Color.s('{!}    ' + err_txt)
+            message=Color.s(err_txt),
+            filename_col_len=Fusion.max_filename,
+            script_location=Logger.get_caller_info(stack_index=2)
         )
 
     @classmethod

{frida_fusion-0.1.7 → frida_fusion-0.1.9}/frida_fusion/libs/helpers.js

@@ -1,9 +1,16 @@
-/*  Android Scripts
-    Author: Hélvio - M4v3r1ck
+/*  Frida Fusion helper functions
+    Author: Helvio Junior - M4v3r1ck
 */
 
+function fusion_Send(payload1, payload2){
+    const info = fusion_getCallerInfo();
+    send({
+      payload: payload1,
+      location: info
+    }, payload2);
+}
 
-function waitForClass(name, onReady) {
+function fusion_waitForClass(name, onReady) {
     var intv = setInterval(function () {
       try {
         var C = Java.use(name);
@@ -13,24 +20,24 @@ function waitForClass(name, onReady) {
     }, 100);
 }
 
-function printStackTrace(){
+function fusion_printStackTrace(){
     var trace = Java.use("android.util.Log").getStackTraceString(Java.use("java.lang.Exception").$new());
     trace = trace.replace("java.lang.Exception\n", "Stack trace:\n");
-    sendMessage("*", trace);
+    fusion_sendMessage("I", trace);
 }
 
-function toBytes(message){
+function fusion_toBytes(message){
     try{
         const StringClass = Java.use('java.lang.String');
         var bTxt = StringClass.$new(message).getBytes('utf-8');
 
         return bTxt;
     } catch (err) {
-        sendMessage("*", err)
+        fusion_sendMessage("W", err)
     }
 }
 
-function toBase64(message){
+function fusion_stringToBase64(message){
     try{
         const StringClass = Java.use('java.lang.String');
         const Base64Class = Java.use('android.util.Base64');
@@ -39,19 +46,19 @@ function toBase64(message){
 
         return b64Msg;
     } catch (err) {
-        sendMessage("*", err)
+        fusion_sendMessage("W", err)
     }
 }
 
-function bytesToBase64(message){
+function fusion_bytesToBase64(byteArray){
 
-    if (message === null || message === undefined) return "IA==";
+    if (byteArray === null || byteArray === undefined) return "IA==";
     try {
         // 1) Confirma tipo byte[], se não tenta converter em string
-        message = Java.array('byte', message);
+        byteArray = Java.array('byte', byteArray);
 
         // 2) Tem 'length' numérico
-        const len = message.length;
+        const len = byteArray.length;
         if (typeof len !== "number") return "IA==";
 
         // 3) (opcional) Exigir conteúdo
@@ -64,16 +71,16 @@ function bytesToBase64(message){
     try{
         
         const Base64Class = Java.use('android.util.Base64');
-        var b64Msg = Base64Class.encodeToString(message, 0x00000002); //Base64Class.NO_WRAP = 0x00000002
+        var b64Msg = Base64Class.encodeToString(byteArray, 0x00000002); //Base64Class.NO_WRAP = 0x00000002
 
         return b64Msg;
     } catch (err) {
-        sendMessage("*", err)
+        fusion_sendMessage("W", err)
         return "IA==";
     }
 }
 
-function getCallerInfo() {
+function fusion_getCallerInfo() {
   try{
     const stack = new Error().stack.split("\n");
 
@@ -89,9 +96,9 @@ function getCallerInfo() {
         const file = m[2];
         const ln   = parseInt(m[3], 10);
 
-        // Ignora funções cujo nome comece com "send" (qualquer case)
+        // Ignore helper functions (with name "send")
         if (/^send/i.test(func)) continue;
-        if (/^isend/i.test(func)) continue;
+        if (/^fusion_Send/i.test(func)) continue;
 
         return { file_name: file, function_name: func, line: ln };
       }
@@ -102,29 +109,8 @@ function getCallerInfo() {
   return null;
 }
 
-function iSend(payload1, payload2){
-    try{
-        const info = getCallerInfo();
-        send({
-          payload: payload1,
-          location: info
-        }, payload2);
-    } catch (err) {
-        //sendMessage("*", err)
-        console.log(`Error: ${err}`)
-    }
-}
-
-function sendData(mType, jData, bData){
-    //iSend('{"type" : "'+ mType +'", "jdata" : "'+ jData +'"}', bData);
-    iSend({
-      type: mType,
-      jdata: jData
-    }, bData)
-}
-
-function sendKeyValueData(module, items) {
-    var st = getB64StackTrace();
+function fusion_sendKeyValueData(module, items) {
+    var st = fusion_getB64StackTrace();
 
     var data = [];
 
@@ -133,67 +119,75 @@ function sendKeyValueData(module, items) {
         data = data.concat([{key: `${items[i].key}`, value:`${items[i].value}`}]);
     }
 
-    iSend({
+    fusion_Send({
       type: "key_value_data",
       module: module,
       data: data,
       stack_trace: st
     }, null);
 
+}
+
+function fusion_sendMessage(level, message){
+    try{
+        const StringClass = Java.use('java.lang.String');
+        const Base64Class = Java.use('android.util.Base64');
+        var bTxt = StringClass.$new(message).getBytes('utf-8');
+        var b64Msg = Base64Class.encodeToString(bTxt, 0x00000002); //Base64Class.NO_WRAP = 0x00000002
 
-    /*
-    var jData = `{"type" : "key_value_data", "module": "${module}", "data": [`;
-    for (let i = 0; i < items.length; i++) {
-        if (i > 0) {
-            jData += `, `
-        }
-        jData += `{"key": "${items[i].key}", "value": "${items[i].value}"}`
+        //send('{"type" : "message", "level" : "'+ level +'", "message" : "'+ b64Msg +'"}');
+        fusion_Send({
+          type: "message",
+          level: level,
+          message: b64Msg
+        }, null)
+    } catch (err) {
+        fusion_sendMessage("W", err)
     }
-    jData += `], "stack_trace": "${st}"}`;
-    iSend(jData, "");
-    */
 }
 
-function sendMessage(level, message){
+function fusion_sendMessageWithTrace(level, message){
     try{
         const StringClass = Java.use('java.lang.String');
         const Base64Class = Java.use('android.util.Base64');
+
+        var trace = Java.use("android.util.Log").getStackTraceString(Java.use("java.lang.Exception").$new());
+        trace = trace.replace("java.lang.Exception\n", "Stack trace:\n");
+        message += "\n"
+        message += trace
+
         var bTxt = StringClass.$new(message).getBytes('utf-8');
         var b64Msg = Base64Class.encodeToString(bTxt, 0x00000002); //Base64Class.NO_WRAP = 0x00000002
 
         //send('{"type" : "message", "level" : "'+ level +'", "message" : "'+ b64Msg +'"}');
-        iSend({
+        fusion_Send({
           type: "message",
           level: level,
           message: b64Msg
         }, null)
     } catch (err) {
-        sendMessage("*", err)
-        //sendMessage('-', 'secret_key_spec.$init.overload error: ' + err + '\n' + err.stack);
+        fusion_sendMessage("W", err)
     }
 }
 
-function sendError(error) {
+function fusion_sendError(error) {
     try{
-        sendMessage("-", error + '\n' + error.stack);
+        fusion_sendMessage("E", error + '\n' + error.stack);
     } catch (err) {
-        sendMessage("*", err)
+        fusion_sendMessage("W", err)
     }
 }
 
-function encodeHex(byteArray) {
+function fusion_encodeHex(byteArray) {
     
     const HexClass = Java.use('org.apache.commons.codec.binary.Hex');
     const StringClass = Java.use('java.lang.String');
     const hexChars = HexClass.encodeHex(byteArray);
-    //sendMessage("*", StringClass.$new(hexChars).toString());
-    //Buffer.from(bufStr, 'utf8');
-    //sendMessage("*", new Uint8Array(byteArray));
     return StringClass.$new(hexChars).toString();
     
 }
 
-function getB64StackTrace(){
+function fusion_getB64StackTrace(){
 
     try{
         const StringClass = Java.use('java.lang.String');
@@ -206,33 +200,18 @@ function getB64StackTrace(){
         return b64Msg
 
     } catch (err) {
-        sendMessage("*", err);
+        fusion_sendMessage("W", err);
         return '';
     }
 }
 
-function enumMethods(targetClass)
+function fusion_printMethods(targetClass)
 {
   var hook = Java.use(targetClass);
   var ownMethods = hook.class.getDeclaredMethods();
-  hook.$dispose;
-
-  return ownMethods;
-}
-
-function printMethods(hook)
-{
-  var ownMethods = hook.class.getDeclaredMethods();
-  ownMethods.forEach(function(s) { 
-    //sendMessage(s);
-    sendMessage('*', s);
+  ownMethods.forEach(function(s) {
+    fusion_sendMessage('I', s);
   });
-
-}
-
-function intToHex(intVal)
-{
-    return intVal.toString(16);
 }
 
 
@@ -263,7 +242,7 @@ Java.perform(function () {
   Thread.setDefaultUncaughtExceptionHandler(UEH.$new());
 });
 
-function formatBacktrace(frames) {
+function fusion_formatBacktrace(frames) {
   return frames.map((addr, i) => {
     const sym = DebugSymbol.fromAddress(addr);
     const mod = Process.findModuleByAddress(addr);
@@ -282,7 +261,7 @@ Process.setExceptionHandler(function (details) {
     frames = Thread.backtrace(details.context, Backtracer.FUZZY);
   }
 
-  const pretty = formatBacktrace(frames);
+  const pretty = fusion_formatBacktrace(frames);
 
   send({
     type: "native-exception",
@@ -302,4 +281,4 @@ Process.setExceptionHandler(function (details) {
   return false;
 });
 
-sendMessage("W", "Helper functions have been successfully initialized.")
+fusion_sendMessage("W", "Helper functions have been successfully initialized.")

{frida_fusion-0.1.7 → frida_fusion-0.1.9}/frida_fusion/libs/logger.py

@@ -59,7 +59,7 @@ class Logger(object):
             Color.pl(text)
 
     @classmethod
-    def _get_caller_info(cls, stack_index: int = 1) -> ScriptLocation:
+    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:
@@ -133,7 +133,7 @@ class Logger(object):
         tag_color = Color.color_tags[dbg_idx]
 
         if script_location is None:
-            script_location = cls._get_caller_info(stack_index=2)
+            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"