frida-fusion 0.1.10__tar.gz → 0.1.12__tar.gz

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.10
+Version: 0.1.12
 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.10 → frida_fusion-0.1.12}/frida_fusion/__meta__.py

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

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion/args.py

@@ -148,4 +148,8 @@ class Arguments(object):
                              dest='enabled_modules',
                              help='Enabled module by name. You can specify multiple values repeating the flag.')
 
+        modules.add_argument('--silence-module-messages',
+                             action='append',
+                             dest='ignore_messages_modules',
+                             help='Silence messages becaming from module by name. You can specify multiple values repeating the flag.')
 

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion/config.py

@@ -22,6 +22,7 @@ class Configuration(object):
     base_path = str(Path(__file__).resolve().parent)
     db_path = os.path.join(str(Path(".").resolve()), "fusion.db")
     enabled_modules = {}
+    ignore_messages_modules = {}
 
     # Device vars
     device_id = None
@@ -180,9 +181,15 @@ class Configuration(object):
 
         Logger.pl('     {C}min debug level:{O} %s{W}' % str(args.debug_level).upper())
 
-        if args.enabled_modules is not None and isinstance(args.enabled_modules, list):
+        if (args.enabled_modules is not None and isinstance(args.enabled_modules, list)) or \
+                (args.ignore_messages_modules is not None and isinstance(args.ignore_messages_modules, list)):
             mods = ModuleManager.list_modules()
-            for mod in args.enabled_modules:
+            for mod in [
+                m.strip()
+                for md in args.enabled_modules
+                for m in md.split(",")
+                if m.strip() != ""
+            ]:
                 fm = next(iter([
                     m
                     for _, m in mods.items()
@@ -197,12 +204,38 @@ class Configuration(object):
                 if name not in Configuration.enabled_modules.keys():
                     Configuration.enabled_modules[name] = fm
 
+            for mod in [
+                m.strip()
+                for md in args.ignore_messages_modules
+                for m in md.split(",")
+                if m.strip() != ""
+            ]:
+                fm = next(iter([
+                    m
+                    for _, m in mods.items()
+                    if m.safe_name() == mod.lower()
+                ]), None)
+                if fm is None:
+                    Color.pl(
+                        '{!} {R}error: module {O}%s{R} not found{W}\r\n' % mod)
+                    sys.exit(1)
+
+                name = fm.safe_name()
+                if name not in Configuration.ignore_messages_modules.keys():
+                    Configuration.ignore_messages_modules[name] = fm
+
         if len(Configuration.enabled_modules) > 0:
             Logger.pl('     {C}modules:{O} %s{W}' % ', '.join([
                 m.name
                 for _, m in Configuration.enabled_modules.items()
             ]))
 
+        if len(Configuration.ignore_messages_modules) > 0:
+            Logger.pl('     {C}ignored messages from modules:{O} %s{W}' % ', '.join([
+                m.name
+                for _, m in Configuration.ignore_messages_modules.items()
+            ]))
+
         Logger.pl("")
 
     @staticmethod

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion/fusion.py

@@ -44,6 +44,7 @@ class Fusion(object):
         self.pid = 0
         self.script_trace = {}
         self._modules = []
+        self._ignore_messages = []
         signal.signal(signal.SIGINT, self.signal_handler)
 
         t = threading.Thread(target=Fusion._db_worker, daemon=True)
@@ -194,9 +195,29 @@ class Fusion(object):
             s.on("message", self.make_handler("fusion_bundle.js"))  # register the message handler
             s.load()
         except Exception as e:
-            Logger.pl('{!} {R}Error:{O} %s{W}' % str(e))
-            print("")
-            sys.exit(1)
+
+            try:
+                err = str(e)
+                pattern = re.compile(r'script\(line (\d+)\):')
+                matches = [
+                    (
+                        m.group(0),
+                        self.translate_location(dict(
+                            file_name="fusion_bundle.js",
+                            line=m.group(1),
+                        ))
+                    )
+                    for m in pattern.finditer(err)
+                ]
+                for m in matches:
+                    err = err.replace(m[0], f"{m[1].file_name}(line {m[1].line})")
+                Logger.pl('{!} {R}Error:{O} %s{W}' % err)
+                print("")
+                sys.exit(1)
+            except Exception:
+                Logger.pl('{!} {R}Error:{O} %s{W}' % str(e))
+                print("")
+                sys.exit(1)
 
     def attach(self, pid: int):
         self.running = True
@@ -273,6 +294,10 @@ class Fusion(object):
                     mType = jData.get('type', '').lower()
                     mLevel = jData.get('level', None)
                     if mType == "message":
+
+                        if script_location.file_name in self._ignore_messages:
+                            return
+
                         msg = jData.get('message', '')
                         try:
                             msg = base64.b64decode(msg).decode("UTF-8")
@@ -601,7 +626,23 @@ class Fusion(object):
             if len(self._modules) > 0:
                 Logger.pl("{+} Starting selected modules")
                 for m in self._modules:
-                    m.start_module(db_path=Configuration.db_path)
+                    m.start_module(
+                        package=Configuration.package,
+                        db_path=Configuration.db_path
+                    )
+                    if m.safe_name() in Configuration.ignore_messages_modules.keys():
+                        m.suppress_messages()
+
+                self._ignore_messages = [
+                    Path(f).name
+                    for _, md in Configuration.ignore_messages_modules.items()
+                    if (m := next(iter([
+                        mi
+                        for mi in self._modules
+                        if mi.name == md.name
+                    ]), None)) is not None
+                    for f in m.js_files()
+                ]
 
             self.get_device()
             if self.device is not None:

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion/module.py

@@ -8,13 +8,9 @@ import requests
 import importlib.util
 from pathlib import Path
 
-from typing import TYPE_CHECKING
-
 from .__meta__ import __version__
 from .libs.logger import Logger
-
-if TYPE_CHECKING:
-    from .fusion import Fusion  # só no type checker
+from .libs.scriptlocation import ScriptLocation
 
 
 class ModuleLoaderError(Exception):
@@ -42,8 +38,11 @@ class ModuleBase(object):
     def js_files(self) -> list:
         return []
 
+    def suppress_messages(self):
+        pass
+
     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
@@ -51,7 +50,7 @@ class ModuleBase(object):
         raise Exception('Method "key_value_event" is not yet implemented.')
 
     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.12/frida_fusion/modules/android_setings/settings.js

@@ -0,0 +1,172 @@
+/*
+Documentation
+https://developer.android.com/reference/android/provider/Settings
+
+*/
+
+const SET_MODULES = {
+    Global: true,
+    Secure: true,
+    System: true,
+};
+
+setTimeout(function() {
+    Java.perform(function() {
+
+        // Bypass Settings
+        var androidSettings = [
+            ['adb_enabled', 0],
+            ['development_settings_enabled', 0],
+            ['play_protect_enabled', 1],
+            ['adb_enabled', 0]
+        ];
+
+        function settings_bypassValue(name, originalValue) {
+            androidSettings.forEach(function(item) {
+                let name = item[0];
+                let value = item[1];
+
+                if (name === name) {
+                    fusion_sendMessage('D', `Bypassing android settings checking: ${name}`)
+                    return value;
+                }
+            });
+            return originalValue;
+        }
+
+        if (SET_MODULES.System) {
+
+            fusion_sendMessage('D', "Module attached: android.provider.Settings.System");
+            const settingsSystem = Java.use("android.provider.Settings$System");
+
+            settingsSystem.getString.overload('android.content.ContentResolver', 'java.lang.String').implementation = function (cr, name) {
+                var data = this.getString.overload('android.content.ContentResolver', 'java.lang.String').call(this, cr, name);
+                fusion_sendKeyValueData("Settings$System.getString", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return data
+            };
+
+            settingsSystem.putString.overload('android.content.ContentResolver', 'java.lang.String', 'java.lang.String').implementation = function (cr, name, value) {
+                fusion_sendKeyValueData("Settings$System.putString", [
+                    {key: "Name", value: name},
+                    {key: "Value", value: value}
+                ]);
+                return this.putString.overload('android.content.ContentResolver', 'java.lang.String', 'java.lang.String').call(this, cr, name, value);
+            };
+
+            settingsSystem.getUriFor.overload('java.lang.String').implementation = function (name) {
+                var data = this.getUriFor.overload('java.lang.String').call(this, name);
+                fusion_sendKeyValueData("Settings$System.getUriFor", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return data
+            };
+
+            settingsSystem.getInt.overload('android.content.ContentResolver', 'java.lang.String', 'int').implementation = function(cr, name, flag) {
+                var data = this.getInt.overload('android.content.ContentResolver', 'java.lang.String', 'int').call(this, cr, name, flag);
+                fusion_sendKeyValueData("Settings$System.getInt", [
+                    {key: "Name", value: name},
+                    {key: "Flag", value: flag},
+                    {key: "Result", value: data}
+                ]);
+
+                return settings_bypassValue(name, data);
+            }
+
+            settingsSystem.getInt.overload('android.content.ContentResolver', 'java.lang.String').implementation = function(cr, name) {
+                var data = this.getInt.overload('android.content.ContentResolver', 'java.lang.String').call(this, cr, name);
+                fusion_sendKeyValueData("Settings$System.getInt", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return settings_bypassValue(name, data);
+            }
+
+        }
+
+        if (SET_MODULES.Secure) {
+
+            fusion_sendMessage('D', "Module attached: android.provider.Settings.Secure");
+            const settingsSecure = Java.use("android.provider.Settings$Secure");
+
+            settingsSecure.getString.overload('android.content.ContentResolver', 'java.lang.String').implementation = function (cr, name) {
+                var data = this.getString.overload('android.content.ContentResolver', 'java.lang.String').call(this, cr, name);
+                fusion_sendKeyValueData("Settings$Secure.getString", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return data
+            };
+
+            settingsSecure.putString.overload('android.content.ContentResolver', 'java.lang.String', 'java.lang.String').implementation = function (cr, name, value) {
+                fusion_sendKeyValueData("Settings$Secure.putString", [
+                    {key: "Name", value: name},
+                    {key: "Value", value: value}
+                ]);
+                return this.putString.overload('android.content.ContentResolver', 'java.lang.String', 'java.lang.String').call(this, cr, name, value);
+            };
+
+            settingsSecure.getUriFor.overload('java.lang.String').implementation = function (name) {
+                var data = this.getUriFor.overload('java.lang.String').call(this, name);
+                fusion_sendKeyValueData("Settings$Secure.getUriFor", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return data
+            };
+
+            settingsSecure.getInt.overload('android.content.ContentResolver', 'java.lang.String', 'int').implementation = function(cr, name, flag) {
+                var data = this.getInt.overload('android.content.ContentResolver', 'java.lang.String', 'int').call(this, cr, name, flag);
+                fusion_sendKeyValueData("Settings$Secure.getInt", [
+                    {key: "Name", value: name},
+                    {key: "Flag", value: flag},
+                    {key: "Result", value: data}
+                ]);
+
+                return settings_bypassValue(name, data);
+            }
+
+            settingsSecure.getInt.overload('android.content.ContentResolver', 'java.lang.String').implementation = function(cr, name) {
+                var data = this.getInt.overload('android.content.ContentResolver', 'java.lang.String').call(this, cr, name);
+                fusion_sendKeyValueData("Settings$Secure.getInt", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return settings_bypassValue(name, data);
+            }
+
+        }
+
+        if (SET_MODULES.Global) {
+
+            fusion_sendMessage('D', "Module attached: android.provider.Settings.Global");
+            const settingGlobal = Java.use('android.provider.Settings$Global');
+
+            settingGlobal.getInt.overload('android.content.ContentResolver', 'java.lang.String', 'int').implementation = function(cr, name, flag) {
+                var data = this.getInt.overload('android.content.ContentResolver', 'java.lang.String', 'int').call(this, cr, name, flag);
+                fusion_sendKeyValueData("Settings$Global.getInt", [
+                    {key: "Name", value: name},
+                    {key: "Flag", value: flag},
+                    {key: "Result", value: data}
+                ]);
+                return settings_bypassValue(name, data);
+            }
+
+            settingGlobal.getInt.overload('android.content.ContentResolver', 'java.lang.String').implementation = function(cr, name) {
+                var data = this.getInt.overload('android.content.ContentResolver', 'java.lang.String').call(this, cr, name);
+                fusion_sendKeyValueData("Settings$Global.getInt", [
+                    {key: "Name", value: name},
+                    {key: "Result", value: data}
+                ]);
+                return settings_bypassValue(name, data);
+            }
+
+        }
+
+        fusion_sendMessage("W", "Android Settings hook module have been successfully initialized.")
+    });
+    
+}, 0);

frida_fusion-0.1.12/frida_fusion/modules/android_setings/settings.py

@@ -0,0 +1,110 @@
+import json
+import os.path
+from pathlib import Path
+import base64
+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
+
+
+class Settings(ModuleBase):
+    class SettingsDB(Database):
+        dbName = ""
+
+        def __init__(self, db_name: str):
+            super().__init__(
+                auto_create=True,
+                db_name=db_name
+            )
+            self.create_db()
+
+        def create_db(self):
+            super().create_db()
+            conn = self.connect_to_db(check=False)
+
+            # definindo um cursor
+            cursor = conn.cursor()
+
+            # criando a tabela (schema)
+            cursor.execute("""
+                CREATE TABLE IF NOT EXISTS [android_settings] (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    package TEXT NOT NULL,
+                    module TEXT NULL,
+                    name TEXT NULL,
+                    flag INTEGER NULL DEFAULT (0),
+                    data TEXT NULL,
+                    created_date datetime not null DEFAULT (datetime('now','localtime')),
+                    UNIQUE (module, name, flag, data)
+                );
+            """)
+
+            conn.commit()
+
+            # Must get the constraints
+            self.get_constraints(conn)
+
+    def __init__(self):
+        super().__init__('Settings', 'Hook Android Settings functions')
+        self._settings_db = None
+        self._package = None
+        self.mod_path = str(Path(__file__).resolve().parent)
+
+    def start_module(self, **kwargs) -> bool:
+        if 'db_path' not in kwargs:
+            raise Exception("parameter db_path not found")
+
+        self._package = kwargs['package']
+        self._settings_db = Settings.SettingsDB(db_name=kwargs['db_path'])
+        return True
+
+    def js_files(self) -> list:
+        return [
+            os.path.join(self.mod_path, "settings.js")
+        ]
+
+    def key_value_event(self,
+                        script_location: ScriptLocation = None,
+                        stack_trace: str = None,
+                        module: str = None,
+                        received_data: dict = None
+                        ) -> bool:
+
+        if module in ["Settings$Secure.getString",
+                      "Settings$Secure.putString",
+                      "Settings$Secure.getUriFor",
+                      "Settings$Secure.getInt",
+                      "Settings$System.getString",
+                      "Settings$System.putString",
+                      "Settings$System.getUriFor",
+                      "Settings$System.getInt",
+                      "Settings$Global.getInt"
+                      ]:
+            name = received_data.get('name', None)
+            flag = received_data.get('flag', 0)
+            value = received_data.get('value', None)
+            result = received_data.get('result', value)
+
+            self._settings_db.insert_ignore_one(
+                table_name='android_settings',
+                package=self._package,
+                module=module,
+                name=name,
+                flag=flag,
+                data=result
+            )
+
+        return True
+
+    def data_event(self,
+                   script_location: ScriptLocation = None,
+                   stack_trace: str = None,
+                   received_data: str = None
+                   ) -> bool:
+        #Nothing by now
+        return True
+
+

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion/modules/crypto/crypto.js

@@ -1,5 +1,5 @@
 
-const MODULES = {
+const CRYPTO_MODULES = {
     KeyGenerator: true,
     KeyPairGenerator: true,
     SecretKeySpec: true,
@@ -20,7 +20,7 @@ setTimeout(function() {
 
         const System = Java.use("java.lang.System");
 
-        if (MODULES.KeyGenerator) {
+        if (CRYPTO_MODULES.KeyGenerator) {
             fusion_sendMessage('*', "Module attached: javax.crypto.KeyGenerator");
             const keyGenerator = Java.use("javax.crypto.KeyGenerator");
 
@@ -54,7 +54,7 @@ setTimeout(function() {
 
         }
 
-        if (MODULES.KeyPairGenerator) {
+        if (CRYPTO_MODULES.KeyPairGenerator) {
             fusion_sendMessage('*', "Module attached: java.security.KeyPairGenerator");
             const keyPairGenerator = Java.use("java.security.KeyPairGenerator");
             keyPairGenerator.getInstance.overload("java.lang.String").implementation = function (arg0) {
@@ -81,7 +81,7 @@ setTimeout(function() {
             };
         }
 
-        if (MODULES.SecretKeySpec) {
+        if (CRYPTO_MODULES.SecretKeySpec) {
             fusion_sendMessage('*', "Module attached: javax.crypto.spec.SecretKeySpec");
             const secretKeySpec = Java.use("javax.crypto.spec.SecretKeySpec");
             secretKeySpec.$init.overload("[B", "java.lang.String").implementation = function (key, cipher) {
@@ -95,7 +95,7 @@ setTimeout(function() {
             }
         }
 
-        if (MODULES.MessageDigest) {
+        if (CRYPTO_MODULES.MessageDigest) {
             fusion_sendMessage('*', "Module attached: java.security.MessageDigest");
             const messageDigest = Java.use("java.security.MessageDigest");
             messageDigest.getInstance.overload("java.lang.String").implementation = function (arg0) {
@@ -144,7 +144,7 @@ setTimeout(function() {
 
         }
 
-        if (MODULES.SecretKeyFactory) {
+        if (CRYPTO_MODULES.SecretKeyFactory) {
             fusion_sendMessage('*', "Module attached: javax.crypto.SecretKeyFactory");
             const secretKeyFactory = Java.use("javax.crypto.SecretKeyFactory");
             secretKeyFactory.getInstance.overload("java.lang.String").implementation = function (arg0) {
@@ -171,7 +171,7 @@ setTimeout(function() {
             };
         }
 
-        if (MODULES.Signature) {
+        if (CRYPTO_MODULES.Signature) {
             fusion_sendMessage('*', "Module attached: java.security.Signature");
             const signature = Java.use("java.security.Signature");
             signature.getInstance.overload("java.lang.String").implementation = function (arg0) {
@@ -198,7 +198,7 @@ setTimeout(function() {
             };
         }
 
-        if (MODULES.Cipher) {
+        if (CRYPTO_MODULES.Cipher) {
             fusion_sendMessage('*', "Module attached: javax.crypto.Cipher");
             var iv_parameter_spec = Java.use("javax.crypto.spec.IvParameterSpec");
             var pbe_parameter_spec = Java.use("javax.crypto.spec.PBEParameterSpec");
@@ -365,7 +365,7 @@ setTimeout(function() {
         }
 
 
-        if (MODULES.Mac) {
+        if (CRYPTO_MODULES.Mac) {
             fusion_sendMessage('*', "Module attached: javax.crypto.Mac");
             const mac = Java.use("javax.crypto.Mac");
             mac.getInstance.overload("java.lang.String").implementation = function (arg0) {
@@ -392,7 +392,7 @@ setTimeout(function() {
             };
         }
 
-        if (MODULES.KeyGenParameterSpec) {
+        if (CRYPTO_MODULES.KeyGenParameterSpec) {
             fusion_sendMessage('*', "Module attached: android.security.keystore.KeyGenParameterSpec$Builder");
             const useKeyGen = Java.use("android.security.keystore.KeyGenParameterSpec$Builder");
             useKeyGen.$init.overload("java.lang.String", "int").implementation = function (keyStoreAlias, purpose) {
@@ -466,7 +466,7 @@ setTimeout(function() {
             }
         }
 
-        if (MODULES.IvParameterSpec) {
+        if (CRYPTO_MODULES.IvParameterSpec) {
             fusion_sendMessage('*', "Module attached: javax.crypto.spec.IvParameterSpec");
             const ivParameter = Java.use("javax.crypto.spec.IvParameterSpec");
             ivParameter.$init.overload("[B").implementation = function (ivKey) {
@@ -488,7 +488,7 @@ setTimeout(function() {
             }
         }
 
-        if (MODULES.GCMParameterSpec) {
+        if (CRYPTO_MODULES.GCMParameterSpec) {
             fusion_sendMessage('*', "Module attached: javax.crypto.spec.GCMParameterSpec");
             const gcmParameter = Java.use("javax.crypto.spec.GCMParameterSpec");
             gcmParameter.$init.overload("int", "[B").implementation = function (tLen, ivKey) {
@@ -512,7 +512,7 @@ setTimeout(function() {
             }
         }
 
-        if (MODULES.PBEParameterSpec) {
+        if (CRYPTO_MODULES.PBEParameterSpec) {
             fusion_sendMessage('*', "Module attached: javax.crypto.spec.PBEParameterSpec");
             const pbeParameter = Java.use("javax.crypto.spec.PBEParameterSpec");
             pbeParameter.$init.overload("[B", "int").implementation = function (salt, iterationCount) {
@@ -547,7 +547,7 @@ setTimeout(function() {
             }
         }
 
-        if (MODULES.X509EncodedKeySpec) {
+        if (CRYPTO_MODULES.X509EncodedKeySpec) {
             fusion_sendMessage('*', "Module attached: java.security.spec.X509EncodedKeySpec");
             const x509EncodedKeySpec = Java.use("java.security.spec.X509EncodedKeySpec");
             x509EncodedKeySpec.$init.overload("[B").implementation = function (encodedKey) {

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion/modules/crypto/crypto.py

@@ -32,6 +32,7 @@ class Crypto(ModuleBase):
             cursor.execute("""
                 CREATE TABLE IF NOT EXISTS [crypto] (
                     id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    package TEXT NOT NULL,
                     hashcode TEXT NOT NULL,
                     algorithm TEXT NULL,
                     init_key TEXT NULL,
@@ -52,6 +53,7 @@ class Crypto(ModuleBase):
             cursor.execute("""
                 CREATE TABLE IF NOT EXISTS [crypto_key] (
                     id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    package TEXT NOT NULL,
                     key TEXT NULL,
                     printable_key TEXT NULL,
                     salt TEXT NULL,
@@ -59,7 +61,7 @@ class Crypto(ModuleBase):
                     key_class TEXT NULL DEFAULT ('<unknown>'),
                     additional_data TEXT NULL,
                     created_date datetime not null DEFAULT (datetime('now','localtime')),
-                    UNIQUE (key, key_class)
+                    UNIQUE (package, key, key_class)
                 );
             """)
 
@@ -68,6 +70,7 @@ class Crypto(ModuleBase):
             cursor.execute("""
                 CREATE TABLE IF NOT EXISTS [digest] (
                     id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    package TEXT NOT NULL,
                     algorithm TEXT NOT NULL,
                     hashcode TEXT NULL,
                     clear_text TEXT NULL,
@@ -98,7 +101,7 @@ class Crypto(ModuleBase):
 
         def update_crypto(self, iv=None, hashcode=None, flow=None, key=None, before_final=None,
                           after_final=None, stack_trace=None, id=None, algorithm=None,
-                          status=None):
+                          status=None, package=None):
 
             conn = self.connect_to_db(check=False)
             cursor = conn.cursor()
@@ -124,6 +127,12 @@ class Crypto(ModuleBase):
 
                 data = []
                 update = "update [crypto] set "
+
+                if package is not None:
+                    integrity = True
+                    update += " package = ?,"
+                    data.append(package)
+
                 if iv is not None:
                     integrity = True
                     update += " iv = ?,"
@@ -213,7 +222,7 @@ class Crypto(ModuleBase):
 
             conn.close()
 
-        def insert_digest(self, hashcode, algorithm, data_input, data_output, stack_trace):
+        def insert_digest(self, package, hashcode, algorithm, data_input, data_output, stack_trace):
 
             conn = self.connect_to_db(check=False)
 
@@ -243,9 +252,9 @@ class Crypto(ModuleBase):
 
             cursor = conn.cursor()
             cursor.execute("""
-            insert into [digest] ([hashcode], [algorithm], [clear_text], [clear_text_b64], [hash_b64], [hash_hex], [stack_trace])
-            VALUES (?,?,?,?,?,?,?);
-            """, (hashcode, algorithm, clear_text, clear_text_b64, hash_b64, hash_hex, stack_trace,))
+            insert into [digest] ([package], [hashcode], [algorithm], [clear_text], [clear_text_b64], [hash_b64], [hash_hex], [stack_trace])
+            VALUES (?,?,?,?,?,?,?,?);
+            """, (package, hashcode, algorithm, clear_text, clear_text_b64, hash_b64, hash_hex, stack_trace,))
 
             conn.commit()
 
@@ -253,13 +262,14 @@ class Crypto(ModuleBase):
 
             # Color.pl('{+} {W}Inserindo crypto. {C}Algorithm: {O}%s{W}' % algorithm)
 
-        def insert_crypto(self, hashcode, algorithm, init_key):
+        def insert_crypto(self, package, hashcode, algorithm, init_key):
 
             if hashcode is None:
                 return
 
             rows = self.select(
                 table_name='crypto',
+                package=package,
                 hashcode=hashcode,
                 status='open'
             )
@@ -280,6 +290,7 @@ class Crypto(ModuleBase):
                 if init_key is not None and init_key != '' and init_key != 'IA==':
                     self.insert_one(
                         table_name='crypto',
+                        package=package,
                         hashcode=hashcode,
                         algorithm=algorithm,
                         init_key=init_key,
@@ -287,15 +298,17 @@ class Crypto(ModuleBase):
                 else:
                     self.insert_one(
                         table_name='crypto',
+                        package=package,
                         hashcode=hashcode,
                         algorithm=algorithm,
                         status='open')
 
-        def insert_crypto_key(self, key, key_class, salt=None,
+        def insert_crypto_key(self, package, key, key_class, salt=None,
                               iteration_count=0, module="<unknown>", additional_data=dict):
             if key is not None and key != '' and key != 'IA==':
                 self.insert_ignore_one(
                     table_name='crypto_key',
+                    package=package,
                     key=key,
                     printable_key=self.get_printable(key),
                     key_class=key_class,
@@ -309,13 +322,16 @@ class Crypto(ModuleBase):
 
     def __init__(self):
         super().__init__('Crypto', 'Hook cryptography/hashing functions')
+        self._package = None
         self._crypto_db = None
+        self._suppress_messages = False
         self.mod_path = str(Path(__file__).resolve().parent)
 
     def start_module(self, **kwargs) -> bool:
         if 'db_path' not in kwargs:
             raise Exception("parameter db_path not found")
 
+        self._package = kwargs['package']
         self._crypto_db = Crypto.CryptoDB(db_name=kwargs['db_path'])
         return True
 
@@ -324,6 +340,9 @@ class Crypto(ModuleBase):
             os.path.join(self.mod_path, "crypto.js")
         ]
 
+    def suppress_messages(self):
+        self._suppress_messages = True
+
     def key_value_event(self,
                         script_location: ScriptLocation = None,
                         stack_trace: str = None,
@@ -347,6 +366,7 @@ class Crypto(ModuleBase):
                 iteration_count = received_data.get('iteration_count', None)
 
             self._crypto_db.insert_crypto_key(
+                package=self._package,
                 key=key,
                 key_class=key_class,
                 salt=salt,
@@ -361,11 +381,13 @@ class Crypto(ModuleBase):
             hashcode = received_data.get('hashcode', None)
             key_class = received_data.get('classtype', "SecretKeySpec")
             self._crypto_db.insert_crypto(
+                package=self._package,
                 hashcode=hashcode,
                 algorithm=algorithm,
                 init_key=key)
 
             self._crypto_db.insert_crypto_key(
+                package=self._package,
                 key=key,
                 key_class=key_class,
                 module=module,
@@ -375,10 +397,24 @@ class Crypto(ModuleBase):
         elif module == "IvParameterSpec.init":
             bData = received_data.get('iv_key', None)
             key_class = received_data.get('classtype', "IvParameterSpec")
-            # print("IV: %s" % bData)
+
+            offset = received_data.get('offset', None)
+            length = received_data.get('length', None)
+            if offset is not None and length is not None:
+                try:
+                    offset = int(offset)
+                    length = int(length)
+                    if isinstance(bData, str):
+                        bData = base64.b64decode(bData)
+                        if offset + length <= len(bData):
+                            bData = base64.b64encode(bData[offset:offset+length]).decode("UTF-8")
+                except:
+                    pass
+
             self._crypto_db.update_crypto(iv=bData)
 
             self._crypto_db.insert_crypto_key(
+                package=self._package,
                 key=bData,
                 key_class=key_class,
                 module=module,
@@ -393,12 +429,14 @@ class Crypto(ModuleBase):
             algorithm = received_data.get('algorithm', None)
 
             self._crypto_db.insert_crypto(
+                package=self._package,
                 hashcode=hashcode,
                 algorithm=algorithm,
                 init_key=key
             )
 
             self._crypto_db.update_crypto(
+                package=self._package,
                 hashcode=hashcode,
                 flow='enc' if 'encrypt' in opmode else ('dec' if 'decrypt' in opmode else str(opmode)),
                 key=key,
@@ -406,28 +444,32 @@ class Crypto(ModuleBase):
             )
 
             self._crypto_db.insert_crypto_key(
+                package=self._package,
                 key=key,
                 key_class=key_class,
                 module=module,
                 additional_data=received_data
             )
 
-            Logger.print_message(
-                level="W",
-                message=f"Cipher init received\nHashcode: {hashcode}\nOpmode: {opmode}\nKeytype: {key_class}",
-                script_location=script_location
-            )
+            if not self._suppress_messages:
+                Logger.print_message(
+                    level="W",
+                    message=f"Cipher init received\nHashcode: {hashcode}\nOpmode: {opmode}\nKeytype: {key_class}",
+                    script_location=script_location
+                )
 
         elif module == "cipher.doFinal":
             hashcode = received_data.get('hashcode', None)
 
             self._crypto_db.insert_crypto(
+                package=self._package,
                 hashcode=hashcode,
                 algorithm=None,
                 init_key=None
             )
 
             self._crypto_db.update_crypto(
+                package=self._package,
                 hashcode=hashcode,
                 before_final=received_data.get('input', ''),
                 after_final=received_data.get('output', ''),
@@ -435,24 +477,25 @@ class Crypto(ModuleBase):
                 status="complete"
             )
 
-            Logger.print_message(
-                level="D",
-                message=f"Cipher doFinal received\n{stack_trace}",
-                script_location=script_location
-            )
+            if not self._suppress_messages:
+                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)
             bInput = received_data.get('input', None)
-            self._crypto_db.insert_digest(hashcode, algorithm, bInput, None, stack_trace=stack_trace)
+            self._crypto_db.insert_digest(self._package, hashcode, algorithm, bInput, None, stack_trace=stack_trace)
 
         elif module == "messageDigest.digest":
             hashcode = received_data.get('hashcode', None)
             algorithm = received_data.get('algorithm', None)
             bInput = received_data.get('input', None)  # Se não existir teve um messageDigest.update antes
             bOutput = received_data.get('output', None)
-            self._crypto_db.insert_digest(hashcode, algorithm, bInput, bOutput, stack_trace=stack_trace)
+            self._crypto_db.insert_digest(self._package, hashcode, algorithm, bInput, bOutput, stack_trace=stack_trace)
 
             hash_hex = ""
             if bOutput is not None:
@@ -465,12 +508,13 @@ class Crypto(ModuleBase):
                     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
-                )
+            if not self._suppress_messages:
+                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
 

{frida_fusion-0.1.10 → frida_fusion-0.1.12}/frida_fusion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frida-fusion
-Version: 0.1.10
+Version: 0.1.12
 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.10 → frida_fusion-0.1.12}/frida_fusion.egg-info/SOURCES.txt

@@ -22,6 +22,9 @@ frida_fusion/libs/helpers.js
 frida_fusion/libs/logger.py
 frida_fusion/libs/scriptlocation.py
 frida_fusion/modules/__init__.py
+frida_fusion/modules/android_setings/__init__.py
+frida_fusion/modules/android_setings/settings.js
+frida_fusion/modules/android_setings/settings.py
 frida_fusion/modules/crypto/__init__.py
 frida_fusion/modules/crypto/crypto.js
 frida_fusion/modules/crypto/crypto.py