AndroidFridaManager 1.7.9__py3-none-any.whl → 1.8.3__py3-none-any.whl

AndroidFridaManager/FridaManager.py

@@ -15,8 +15,6 @@ from shutil import copyfile
 import tempfile
 import argparse
 
-warnings.filterwarnings("error")
-
 # some parts are taken from ttps://github.com/Mind0xP/Frida-Python-Binding/
 
 class FridaManager():
@@ -44,7 +42,7 @@ class FridaManager():
         self.logger = logging.getLogger(__name__)
 
         if self.is_remote:
-            frida.get_device_manager().add_remote_device(self.socket)
+            frida.get_device_manager().add_remote_device(self.device_socket)
 
 
     def _setup_logging(self):
@@ -77,6 +75,12 @@ class FridaManager():
 
     
     def run_frida_server(self, frida_server_path="/data/local/tmp/"):
+        # Check if frida-server is already running
+        if self.is_frida_server_running():
+            if self.verbose:
+                self.logger.info("[*] frida-server is already running, skipping start")
+            return
+            
         if frida_server_path is self.run_frida_server.__defaults__[0]:
             cmd = self.frida_install_dst + "frida-server &"
         else:
@@ -87,22 +91,50 @@ class FridaManager():
         else:
             command = "adb shell su 0 "+ cmd 
 
-        subprocess.Popen(command, shell=True)
+        try:
+            process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            # Give it a moment to start and potentially fail
+            import time
+            time.sleep(1)
+            
+            # Check if process failed immediately
+            if process.poll() is not None:
+                stdout, stderr = process.communicate()
+                if "Address already in use" in stderr.decode():
+                    print("[*] frida-server is already running on the device")
+                    return
+                else:
+                    self.logger.error(f"Failed to start frida-server: {stderr.decode()}")
+                    raise RuntimeError(f"Failed to start frida-server: {stderr.decode()}")
+        except Exception as e:
+            self.logger.error(f"Error starting frida-server: {e}")
+            raise
 
 
     def is_frida_server_running(self):
         """
         Checks if on the connected device a frida server is running. 
-        The test is done by the Android system command pidof and is looking for the string frida-server.
+        The test is done by trying multiple methods to detect the frida-server process.
 
         :return: True if a frida-server is running otherwise False.
         :rtype: bool
         """
-        result = self.run_adb_command_as_root("/system/bin/pidof frida-server")
-        if len(result.stdout) > 1:
+        # Try pidof first (most reliable if available)
+        result = self.run_adb_command_as_root("pidof frida-server")
+        if result.stdout.strip():
             return True
-        else:
-            return False
+            
+        # Fallback to ps grep if pidof doesn't work
+        result = self.run_adb_command_as_root("ps | grep frida-server | grep -v grep")
+        if result.stdout.strip():
+            return True
+            
+        # Try alternative ps command format
+        result = self.run_adb_command_as_root("ps -A | grep frida-server | grep -v grep")
+        if result.stdout.strip():
+            return True
+            
+        return False
 
 
     def stop_frida_server(self):
@@ -225,13 +257,15 @@ class FridaManager():
             try:
                 res = requests.get(url)
             except requests.exceptions.RequestException as e:
-                self.logger.error("[-] error in doing requests: "+e)
-                exit(2)
+                self.logger.error(f"Error making request to {url}: {e}")
+                raise RuntimeError(f"Failed to fetch Frida release information: {e}")
             
-            try:
-                frida_server_path = re.findall(r'\/download\/\d+\.\d+\.\d+\/frida\-server\-\d+\.\d+\.\d+\-android\-'+arch+'\.xz',res.text)
-            except SyntaxWarning:
-                frida_server_path = re.findall(r'/download/\d+\.\d+\.\d+/frida-server-\d+\.\d+\.\d+-android-' + arch + r'\.xz', res.text)
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore", SyntaxWarning)
+                try:
+                    frida_server_path = re.findall(r'\/download\/\d+\.\d+\.\d+\/frida\-server\-\d+\.\d+\.\d+\-android\-'+arch+'\.xz',res.text)
+                except SyntaxWarning:
+                    frida_server_path = re.findall(r'/download/\d+\.\d+\.\d+/frida-server-\d+\.\d+\.\d+-android-' + arch + r'\.xz', res.text)
 
             final_url = frida_download_prefix + frida_server_path[0]
 
@@ -245,7 +279,7 @@ class FridaManager():
         return final_url
 
 
-    def make_frida_server_executable(self, frida_server_path="/data/tmp/local/tmp/"):
+    def make_frida_server_executable(self, frida_server_path="/data/local/tmp/"):
         if frida_server_path is self.make_frida_server_executable.__defaults__[0]:
             cmd = self.frida_install_dst + "frida-server"
         else:
@@ -264,8 +298,8 @@ class FridaManager():
 
     def run_adb_command_as_root(self,command):
         if self.adb_check_root() == False:
-            self.logger.error("[-] none rooted device. Please root it before using FridaAndroidManager and ensure that you are able to run commands with the su-binary....")
-            exit(2)
+            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.")
+            raise RuntimeError("Device not rooted or su binary not accessible")
 
         if self.is_magisk_mode:
             output = subprocess.run(['adb', 'shell','su -c '+command], capture_output=True, text=True)

AndroidFridaManager/about.py

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

AndroidFridaManager/job.py

@@ -45,7 +45,7 @@ class Job:
         self.script.on("message", self.wrap_custom_hooking_handler_with_job_id(self.custom_hooking_handler))
         self.script.load()
         self.state = "running"
-        print("[+] hooks succesfully loaded")
+        print("[+] hooks successfully loaded")
 
         #if self.is_running_as_thread:
         # Keep the thread alive to handle messages until stop_event is set

AndroidFridaManager/job_manager.py

@@ -256,7 +256,7 @@ class JobManager(object):
         if job_id in self.jobs:
             return self.jobs[job_id]
         else:
-            raise ValueError(f"Job mit ID {job_id} nicht gefunden.")
+            raise ValueError(f"Job with ID {job_id} not found.")
 
 
     def detach_from_app(self):
@@ -299,13 +299,15 @@ class JobManager(object):
             # to handle forks
             def on_child_added(child):
                 print(f"Attached to child process with pid {child.pid}")
-                self.first_instrumenation_script(device.attach(child.pid))
+                if callable(self.first_instrumenation_script):
+                    self.first_instrumenation_script(device.attach(child.pid))
                 device.resume(child.pid)
 
             # if the target process is starting another process 
             def on_spawn_added(spawn):
                 print(f"Process spawned with pid {spawn.pid}. Name: {spawn.identifier}")
-                self.first_instrumenation_script(device.attach(spawn.pid))
+                if callable(self.first_instrumenation_script):
+                    self.first_instrumenation_script(device.attach(spawn.pid))
                 device.resume(spawn.pid)
 
             device.on("child_added", on_child_added)

{AndroidFridaManager-1.7.9.dist-info → androidfridamanager-1.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: AndroidFridaManager
-Version: 1.7.9
+Version: 1.8.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
@@ -17,11 +17,23 @@ Classifier: Topic :: Software Development :: Debuggers
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: frida >=15.0.0
+Requires-Dist: frida>=15.0.0
 Requires-Dist: colorlog
 Requires-Dist: requests
-
-[![PyPI version](https://badge.fury.io/py/AndroidFridaManager.svg)](https://badge.fury.io/py/AndroidFridaManager)
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+![version](https://img.shields.io/badge/version-1.8.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.8.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+AndroidFridaManager/FridaManager.py,sha256=kaOua90QoYCZYjE-PLv2jKNbjGsR049iSdguzpS7IOo,15108
+AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
+AndroidFridaManager/about.py,sha256=9PIAKC-I68GSVhurcOpqSExKNmRXqkqGHjeJ0eQtdIg,98
+AndroidFridaManager/job.py,sha256=QTSNjdV7XqawSTV19HQt53aiwoT3UaQeQw2K4AWPxY8,3265
+AndroidFridaManager/job_manager.py,sha256=icdNlfqorEM3XVw4h_83IcoupEFDlkzb29VhEZ6dxrQ,12294
+androidfridamanager-1.8.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+androidfridamanager-1.8.3.dist-info/METADATA,sha256=Juumzl4unTLH2Ee6M0ByzYEDGq7kWCES3YijRSt2htM,5141
+androidfridamanager-1.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+androidfridamanager-1.8.3.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
+androidfridamanager-1.8.3.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
+androidfridamanager-1.8.3.dist-info/RECORD,,

{AndroidFridaManager-1.7.9.dist-info → androidfridamanager-1.8.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

AndroidFridaManager-1.7.9.dist-info/RECORD

@@ -1,11 +0,0 @@
-AndroidFridaManager/FridaManager.py,sha256=jxoqFGUwkBTYee7DEYAxo_-qk06DCQa8U9i9OZxAc5M,13381
-AndroidFridaManager/__init__.py,sha256=T6AKtrGSLQ9M5bJoWDQcsRTJbSEbksdgrx3AAAdozRI,171
-AndroidFridaManager/about.py,sha256=_5RG2s3Y8tV5jnC9LpY8sCOQuLsL8NxR2vl90rx4c3s,97
-AndroidFridaManager/job.py,sha256=NWgU7RzheNfEazL8CcmAIoVwylTdEDNbTPqmiAY7ZhY,3264
-AndroidFridaManager/job_manager.py,sha256=f4ByEiAU8I6JUz7eNrdk8hnaD9VUJW3D-dtX79eEu68,12164
-AndroidFridaManager-1.7.9.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-AndroidFridaManager-1.7.9.dist-info/METADATA,sha256=AEvdZVQXypMKZfhsBEmBPVHFS-44BEEJp5BJMqUHWRM,4633
-AndroidFridaManager-1.7.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-AndroidFridaManager-1.7.9.dist-info/entry_points.txt,sha256=GmNngu2fDNCxUcquFRegBa7GWknPKG1jsM4lvWeyKnY,64
-AndroidFridaManager-1.7.9.dist-info/top_level.txt,sha256=oH2lVMSRlghmt-_tVrOEUqvY462P9hd5Ktgp5-1qF3o,20
-AndroidFridaManager-1.7.9.dist-info/RECORD,,