AndroidFridaManager 1.9.1__py3-none-any.whl → 1.9.3__py3-none-any.whl

AndroidFridaManager/FridaManager.py

@@ -41,6 +41,7 @@ class FridaManager():
         self.device_socket = socket
         self.verbose = verbose
         self.is_magisk_mode = False
+        self.is_adb_root_mode = False  # LineageOS adb root mode (adbd runs as root)
         self.frida_install_dst = frida_install_dst
         self._setup_logging()
         self.logger = logging.getLogger(__name__)
@@ -73,7 +74,10 @@ class FridaManager():
         """Set the target device serial."""
         self._validate_device(serial)
         self._device_serial = serial
-        self._is_rooted = None  # Reset cached root status
+        # Reset cached root status and mode flags for new device
+        self._is_rooted = None
+        self.is_magisk_mode = False
+        self.is_adb_root_mode = False
 
     def _setup_logging(self):
         """
@@ -270,7 +274,9 @@ class FridaManager():
         :return: Complete command list including device targeting
         """
         cmd = ['adb']
-        if self._device_serial and self._multiple_devices:
+        # Always include device serial if set - important when user explicitly
+        # specifies a device or when multiple devices are connected
+        if self._device_serial:
             cmd.extend(['-s', self._device_serial])
         cmd.extend(args)
         return cmd
@@ -308,15 +314,26 @@ class FridaManager():
                 self.logger.info("[*] frida-server is already running, skipping start")
             return True
 
+        # Ensure root access is available
+        if not self.is_device_rooted():
+            self.logger.error("Cannot start frida-server: device is not rooted")
+            return False
+
         if frida_server_path is self.run_frida_server.__defaults__[0]:
-            cmd = self.frida_install_dst + "frida-server &"
+            frida_bin = self.frida_install_dst + "frida-server"
         else:
-            cmd = frida_server_path + "frida-server &"
-
-        if self.is_magisk_mode:
-            shell_cmd = f"""su -c 'sh -c "{cmd}"'"""
+            frida_bin = frida_server_path + "frida-server"
+
+        # Build the command based on root mode
+        if self.is_adb_root_mode:
+            # ADB root mode (LineageOS): run directly, adbd is already root
+            shell_cmd = f"{frida_bin} &"
+        elif self.is_magisk_mode:
+            # Magisk mode
+            shell_cmd = f"""su -c 'sh -c "{frida_bin} &"'"""
         else:
-            shell_cmd = f"""su 0 sh -c "{cmd}" """
+            # Traditional su mode
+            shell_cmd = f"""su 0 sh -c "{frida_bin} &" """
 
         try:
             adb_cmd = self._build_adb_command(['shell', shell_cmd])
@@ -426,13 +443,24 @@ class FridaManager():
         :type dst_dir: string
         :param version: The version. By default the latest version will be used.
         :type version: string
+        :raises RuntimeError: If device is not rooted
 
         """
+        # Check root access BEFORE downloading - fail fast to save time
+        if not self.is_device_rooted():
+            self.logger.error(
+                "Device is not rooted. Frida server installation requires root access. "
+                "Please root the device or use an emulator."
+            )
+            raise RuntimeError("Cannot install frida-server: device not rooted")
+
         if dst_dir is self.install_frida_server.__defaults__[0]:
             frida_dir = self.frida_install_dst
         else:
             frida_dir = dst_dir
 
+        self.logger.info("Installing frida-server now...")
+
         with tempfile.TemporaryDirectory() as dir:
             if self.verbose:
                 self.logger.info(f"[*] downloading frida-server to {dir}")
@@ -574,17 +602,27 @@ class FridaManager():
         """
         Run an ADB command as root on the target device.
 
+        Supports three root modes:
+        1. ADB root mode (LineageOS): Commands run directly (adbd is root)
+        2. Magisk mode: Uses 'su -c command'
+        3. Traditional su: Uses 'su 0 command'
+
         :param command: Command to run as root
         :return: subprocess.CompletedProcess with stdout/stderr
         :raises RuntimeError: If device is not rooted
         """
         if not self.is_device_rooted():
-            self.logger.error("Device is not rooted. Please root it before using FridaAndroidManager and ensure that you are able to run commands with the su-binary.")
+            self.logger.error("Device is not rooted. Please root it before using FridaAndroidManager and ensure that you are able to run commands with the su-binary or enable ADB root mode.")
             raise RuntimeError("Device not rooted or su binary not accessible")
 
-        if self.is_magisk_mode:
+        if self.is_adb_root_mode:
+            # ADB root mode (LineageOS): adbd runs as root, no su needed
+            adb_cmd = self._build_adb_command(['shell', command])
+        elif self.is_magisk_mode:
+            # Magisk mode: use su -c
             adb_cmd = self._build_adb_command(['shell', f'su -c {command}'])
         else:
+            # Traditional su mode
             adb_cmd = self._build_adb_command(['shell', f'su 0 {command}'])
 
         return subprocess.run(adb_cmd, capture_output=True, text=True)
@@ -653,11 +691,32 @@ class FridaManager():
 
     def adb_check_root(self) -> bool:
         """
-        Check if the device has root access via su binary.
+        Check if the device has root access.
+
+        Supports three root modes:
+        1. ADB root mode (LineageOS): adbd runs as root, no su needed
+        2. Magisk mode: su -c command
+        3. Traditional su: su 0 command
 
         :return: True if root is available, False otherwise
         """
         try:
+            # First, check for ADB root mode (LineageOS with "adb root" enabled)
+            # In this mode, adbd runs as root and all shell commands are root
+            result = subprocess.run(
+                self._build_adb_command(['shell', 'id', '-u']),
+                capture_output=True,
+                text=True,
+                timeout=5
+            )
+            if result.stdout.strip() == "0":
+                # Shell is already running as root (adb root mode)
+                self.is_adb_root_mode = True
+                self.is_magisk_mode = False
+                if self.verbose:
+                    self.logger.info("[*] Detected ADB root mode (adbd running as root)")
+                return True
+
             # Try Magisk-style su
             result = subprocess.run(
                 self._build_adb_command(['shell', 'su -v']),
@@ -667,6 +726,9 @@ class FridaManager():
             )
             if result.stdout.strip():
                 self.is_magisk_mode = True
+                self.is_adb_root_mode = False
+                if self.verbose:
+                    self.logger.info("[*] Detected Magisk root mode")
                 return True
 
             # Try traditional su
@@ -677,6 +739,10 @@ class FridaManager():
                 timeout=5
             )
             if result.stdout.strip() == "0":
+                self.is_magisk_mode = False
+                self.is_adb_root_mode = False
+                if self.verbose:
+                    self.logger.info("[*] Detected traditional su root mode")
                 return True
 
             return False

AndroidFridaManager/about.py

@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Daniel Baier"
-__version__ = "1.9.1"
+__version__ = "1.9.3"

{androidfridamanager-1.9.1.dist-info → androidfridamanager-1.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AndroidFridaManager
-Version: 1.9.1
+Version: 1.9.3
 Summary: A python API in order to install and run the frida-server on an Android device.
 Home-page: https://github.com/fkie-cad/AndroidFridaManager
 Author: Daniel Baier
@@ -33,7 +33,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-![version](https://img.shields.io/badge/version-1.9.1-blue) [![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager) [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/AndroidFridaManager/actions/workflows/publish-to-pypi.yml)
+![version](https://img.shields.io/badge/version-1.9.3-blue) [![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager) [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/AndroidFridaManager/actions/workflows/publish-to-pypi.yml)
 
 # AndroidFridaManager
 

androidfridamanager-1.9.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+AndroidFridaManager/FridaManager.py,sha256=pTcis4oLPBN5U7CdBqdUufwuG6QQDWTPBleTC7rtTbI,32145
+AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
+AndroidFridaManager/about.py,sha256=T8Pv1VrgHp0Mn_kJwh5M0yzCUK5pILMP4LdeITJzGtM,98
+AndroidFridaManager/job.py,sha256=1NNcfCjkyUtwUkMXSgT4uswA8UStHo3jxbeJwJoWhc8,3352
+AndroidFridaManager/job_manager.py,sha256=S3biHhYrk-DUUfrHA-g8vbOqwgl4FnWELrUjMxsFyG8,15983
+androidfridamanager-1.9.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+androidfridamanager-1.9.3.dist-info/METADATA,sha256=sScuKDxdfBmE7Ag4i-Nd9pu9Ps1Cif29Is4gDOunTvU,5141
+androidfridamanager-1.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+androidfridamanager-1.9.3.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
+androidfridamanager-1.9.3.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
+androidfridamanager-1.9.3.dist-info/RECORD,,

androidfridamanager-1.9.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-AndroidFridaManager/FridaManager.py,sha256=kdA79LW0idbJnch6HzXt_J115HysG9zVZS_WZQnIutk,29143
-AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
-AndroidFridaManager/about.py,sha256=DNJPRvDT-qbeIc-pXeyCemp2PRRwpIdaG2Du3iDNigk,98
-AndroidFridaManager/job.py,sha256=1NNcfCjkyUtwUkMXSgT4uswA8UStHo3jxbeJwJoWhc8,3352
-AndroidFridaManager/job_manager.py,sha256=S3biHhYrk-DUUfrHA-g8vbOqwgl4FnWELrUjMxsFyG8,15983
-androidfridamanager-1.9.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-androidfridamanager-1.9.1.dist-info/METADATA,sha256=rvJB9NrUBVxqx7_j6cQyfE1jHtyx4wyqvA3PEgglOfE,5141
-androidfridamanager-1.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-androidfridamanager-1.9.1.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
-androidfridamanager-1.9.1.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
-androidfridamanager-1.9.1.dist-info/RECORD,,