subprojects: Prepare for release

Expose Device.override_option() for overriding backend-specific
options on a device.

Overrides apply when establishing a host session. If one already
exists, changes take effect on the next connection.

examples/child_gating.py

@@ -42,18 +42,16 @@ class Application:
         print("✔ enable_child_gating()")
         session.enable_child_gating()
         print("✔ create_script()")
-        script = session.create_script(
-            """\
-Interceptor.attach(Module.getExportByName(null, 'open'), {
-  onEnter: function (args) {
+        script = session.create_script("""\
+Interceptor.attach(Module.getGlobalExportByName('open'), {
+  onEnter(args) {
     send({
       type: 'open',
-      path: Memory.readUtf8String(args[0])
+      path: args[0].readUtf8String()
     });
   }
 });
-"""
-        )
+""")
         script.on("message", lambda message, data: self._reactor.schedule(lambda: self._on_message(pid, message)))
         print("✔ load()")
         script.load()

examples/inject_library/inject_blob.py

@@ -15,7 +15,7 @@ def on_uninjected(id):
     print("on_uninjected id=%u" % id)
 
 
-(target, library_path) = sys.argv[1:]
+target, library_path = sys.argv[1:]
 
 device = frida.get_local_device()
 device.on("uninjected", on_uninjected)

examples/inject_library/inject_file.py

@@ -15,7 +15,7 @@ def on_uninjected(id):
     print("on_uninjected id=%u" % id)
 
 
-(target, library_path) = sys.argv[1:]
+target, library_path = sys.argv[1:]
 
 device = frida.get_local_device()
 device.on("uninjected", on_uninjected)

examples/rpc.py

@@ -1,8 +1,7 @@
 import frida
 
 session = frida.attach("Twitter")
-script = session.create_script(
-    """\
+script = session.create_script("""\
 rpc.exports = {
   hello: function () {
     return 'Hello';
@@ -11,8 +10,7 @@ rpc.exports = {
     oops;
   }
 };
-"""
-)
+""")
 script.load()
 api = script.exports_sync
 print("api.hello() =>", api.hello())

examples/session_persist_timeout.py

@@ -22,8 +22,7 @@ class Application:
         self._session = session
         session.on("detached", lambda *args: self._reactor.schedule(lambda: self._on_detached(*args)))
 
-        script = session.create_script(
-            """
+        script = session.create_script("""
 let _puts = null;
 
 Interceptor.attach(DebugSymbol.getFunctionByName('f'), {
@@ -48,8 +47,7 @@ function puts(s) {
   }
   _puts(Memory.allocUtf8String(s));
 }
-"""
-        )
+""")
         self._script = script
         script.on("message", lambda *args: self._reactor.schedule(lambda: self._on_message(*args)))
         script.load()

examples/spawn_gating.py

@@ -0,0 +1,78 @@
+import threading
+
+from frida_tools.application import Reactor
+
+import frida
+
+
+class Application:
+    def __init__(self):
+        self._stop_requested = threading.Event()
+        self._reactor = Reactor(run_until_return=lambda reactor: self._stop_requested.wait())
+
+        self._device = frida.get_usb_device()
+        self._sessions = set()
+        self._sessions_lock = threading.Lock()
+
+        self._device.on("spawn-added", lambda spawn: self._reactor.schedule(lambda: self._on_spawn_added(spawn)))
+        self._device.on("spawn-removed", lambda spawn: self._reactor.schedule(lambda: self._on_spawn_removed(spawn)))
+
+    def run(self):
+        self._reactor.schedule(lambda: self._start())
+        self._reactor.run()
+
+    def _start(self):
+        self._device.enable_spawn_gating()
+
+    def _instrument(self, pid):
+        print(f"✔ attach(pid={pid})")
+        session = self._device.attach(pid)
+        session.on("detached", lambda reason: self._reactor.schedule(lambda: self._on_detached(pid, session, reason)))
+        print("✔ create_script()")
+        script = session.create_script("""\
+const puts = new NativeFunction(Module.getGlobalExportByName('puts'), 'int', ['pointer']);
+puts(Memory.allocUtf8String('Hello from Frida agent'));
+Interceptor.attach(Module.getGlobalExportByName('open'), {
+  onEnter(args) {
+    send({
+      type: 'open',
+      path: args[0].readUtf8String()
+    });
+  }
+});
+""")
+        script.on("message", lambda message, data: self._reactor.schedule(lambda: self._on_message(pid, message)))
+        print("✔ load()")
+        script.load()
+        print(f"✔ resume(pid={pid})")
+        self._device.resume(pid)
+        with self._sessions_lock:
+            self._sessions.add(session)
+
+    def _on_spawn_added(self, spawn):
+        print(f"⚡ spawn_added: {spawn}")
+        t = threading.Thread(target=self._handle_spawn, args=(spawn,))
+        t.start()
+
+    def _handle_spawn(self, spawn):
+        if "/bin/ls" in spawn.identifier:
+            self._instrument(spawn.pid)
+        else:
+            pid = spawn.pid
+            print(f"✔ resume(pid={pid})")
+            self._device.resume(pid)
+
+    def _on_spawn_removed(self, spawn):
+        print(f"⚡ spawn_removed: {spawn}")
+
+    def _on_detached(self, pid, session, reason):
+        print(f"⚡ detached: pid={pid}, reason='{reason}'")
+        with self._sessions_lock:
+            self._sessions.remove(session)
+
+    def _on_message(self, pid, message):
+        print(f"⚡ message: pid={pid}, payload={message['payload']}")
+
+
+app = Application()
+app.run()

frida/__init__.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
 
 try:
     from . import _frida
@@ -86,14 +86,30 @@ def kill(target: core.ProcessTarget) -> None:
 
 
 def attach(
-    target: core.ProcessTarget, realm: Optional[str] = None, persist_timeout: Optional[int] = None
+    target: core.ProcessTarget,
+    realm: Optional[str] = None,
+    persist_timeout: Optional[int] = None,
+    exceptor: Optional[str] = None,
+    unwind_broker: Optional[bool] = None,
+    exit_monitor: Optional[bool] = None,
+    thread_suspend_monitor: Optional[bool] = None,
+    linker_notifier_offsets: Optional[Sequence[int]] = None,
 ) -> core.Session:
     """
     Attach to a process
     :param target: the PID or name of the process
     """
 
-    return get_local_device().attach(target, realm=realm, persist_timeout=persist_timeout)
+    return get_local_device().attach(
+        target,
+        realm=realm,
+        persist_timeout=persist_timeout,
+        exceptor=exceptor,
+        unwind_broker=unwind_broker,
+        exit_monitor=exit_monitor,
+        thread_suspend_monitor=thread_suspend_monitor,
+        linker_notifier_offsets=linker_notifier_offsets,
+    )
 
 
 def inject_library_file(target: core.ProcessTarget, path: str, entrypoint: str, data: str) -> int:

frida/_frida/__init__.pyi

@@ -256,7 +256,17 @@ class Device(Object):
         """
         ...
 
-    def attach(self, pid: int, realm: Optional[str] = None, persist_timeout: Optional[int] = None) -> "Session":
+    def attach(
+        self,
+        pid: int,
+        realm: Optional[str] = None,
+        persist_timeout: Optional[int] = None,
+        exceptor: Optional[str] = None,
+        unwind_broker: Optional[bool] = None,
+        exit_monitor: Optional[bool] = None,
+        thread_suspend_monitor: Optional[bool] = None,
+        linker_notifier_offsets: Optional[Sequence[int]] = None,
+    ) -> "Session":
         """
         Attach to a PID.
         """

frida/_frida/extension.c

@@ -404,6 +404,7 @@ static void PyDevice_init_from_handle (PyDevice * self, FridaDevice * handle);
 static void PyDevice_dealloc (PyDevice * self);
 static PyObject * PyDevice_repr (PyDevice * self);
 static PyObject * PyDevice_is_lost (PyDevice * self);
+static PyObject * PyDevice_override_option (PyDevice * self, PyObject * args, PyObject * kw);
 static PyObject * PyDevice_query_system_parameters (PyDevice * self);
 static PyObject * PyDevice_get_frontmost_application (PyDevice * self, PyObject * args, PyObject * kw);
 static PyObject * PyDevice_enumerate_applications (PyDevice * self, PyObject * args, PyObject * kw);
@@ -419,7 +420,7 @@ static PyObject * PyDevice_input (PyDevice * self, PyObject * args);
 static PyObject * PyDevice_resume (PyDevice * self, PyObject * args);
 static PyObject * PyDevice_kill (PyDevice * self, PyObject * args);
 static PyObject * PyDevice_attach (PyDevice * self, PyObject * args, PyObject * kw);
-static FridaSessionOptions * PyDevice_parse_session_options (const gchar * realm_value, guint persist_timeout);
+static FridaSessionOptions * PyDevice_parse_session_options (const gchar * realm_value, guint persist_timeout, const gchar * exceptor_value, gint unwind_broker, gint exit_monitor, gint thread_suspend_monitor, PyObject * linker_notifier_offsets_value);
 static PyObject * PyDevice_inject_library_file (PyDevice * self, PyObject * args);
 static PyObject * PyDevice_inject_library_blob (PyDevice * self, PyObject * args);
 static PyObject * PyDevice_open_channel (PyDevice * self, PyObject * args);
@@ -620,6 +621,7 @@ static PyMethodDef PyDeviceManager_methods[] =
 static PyMethodDef PyDevice_methods[] =
 {
   { "is_lost", (PyCFunction) PyDevice_is_lost, METH_NOARGS, "Query whether the device has been lost." },
+  { "override_option", (PyCFunction) PyDevice_override_option, METH_VARARGS | METH_KEYWORDS, "Override a backend-specific option." },
   { "query_system_parameters", (PyCFunction) PyDevice_query_system_parameters, METH_NOARGS, "Returns a dictionary of information about the host system." },
   { "get_frontmost_application", (PyCFunction) PyDevice_get_frontmost_application, METH_VARARGS | METH_KEYWORDS, "Get details about the frontmost application." },
   { "enumerate_applications", (PyCFunction) PyDevice_enumerate_applications, METH_VARARGS | METH_KEYWORDS, "Enumerate applications." },
@@ -2002,6 +2004,31 @@ PyGObject_unmarshal_variant_from_sequence (PyObject * sequence, GVariant ** vari
 
   is_tuple = PyTuple_Check (sequence);
 
+  if (is_tuple && PyTuple_Size (sequence) == 2)
+  {
+    gchar * type;
+    gboolean is_uint64_cast;
+
+    if (!PyGObject_unmarshal_string (PyTuple_GetItem (sequence, 0), &type))
+      return FALSE;
+
+    is_uint64_cast = strcmp (type, "uint64") == 0;
+
+    g_free (type);
+
+    if (is_uint64_cast)
+    {
+      unsigned PY_LONG_LONG l;
+
+      l = PyLong_AsUnsignedLongLong (PyTuple_GetItem (sequence, 1));
+      if (l == (unsigned PY_LONG_LONG) -1 && PyErr_Occurred ())
+        return FALSE;
+
+      *variant = g_variant_ref_sink (g_variant_new_uint64 (l));
+      return TRUE;
+    }
+  }
+
   g_variant_builder_init (&builder, is_tuple ? G_VARIANT_TYPE_TUPLE : G_VARIANT_TYPE ("av"));
 
   n = PySequence_Length (sequence);
@@ -2496,6 +2523,33 @@ PyDevice_is_lost (PyDevice * self)
   return PyBool_FromLong (is_lost);
 }
 
+static PyObject *
+PyDevice_override_option (PyDevice * self, PyObject * args, PyObject * kw)
+{
+  static char * keywords[] = { "name", "value", NULL };
+  const char * name;
+  PyObject * value;
+  GVariant * raw_value;
+  GError * error = NULL;
+
+  if (!PyArg_ParseTupleAndKeywords (args, kw, "sO", keywords, &name, &value))
+    return NULL;
+
+  if (!PyGObject_unmarshal_variant (value, &raw_value))
+    return NULL;
+
+  Py_BEGIN_ALLOW_THREADS
+  frida_device_override_option (PY_GOBJECT_HANDLE (self), name, raw_value, &error);
+  Py_END_ALLOW_THREADS
+
+  g_variant_unref (raw_value);
+
+  if (error != NULL)
+    return PyFrida_raise (error);
+
+  PyFrida_RETURN_NONE;
+}
+
 static PyObject *
 PyDevice_query_system_parameters (PyDevice * self)
 {
@@ -3027,21 +3081,43 @@ static PyObject *
 PyDevice_attach (PyDevice * self, PyObject * args, PyObject * kw)
 {
   PyObject * result = NULL;
-  static char * keywords[] = { "pid", "realm", "persist_timeout", NULL };
+  static char * keywords[] = {
+    "pid",
+    "realm",
+    "persist_timeout",
+    "exceptor",
+    "unwind_broker",
+    "exit_monitor",
+    "thread_suspend_monitor",
+    "linker_notifier_offsets",
+    NULL
+  };
   long pid;
   char * realm_value = NULL;
   unsigned int persist_timeout = 0;
+  char * exceptor_value = NULL;
+  int unwind_broker = -1;
+  int exit_monitor = -1;
+  int thread_suspend_monitor = -1;
+  PyObject * linker_notifier_offsets_value = NULL;
   FridaSessionOptions * options = NULL;
   GError * error = NULL;
   FridaSession * handle;
 
-  if (!PyArg_ParseTupleAndKeywords (args, kw, "l|esI", keywords,
+  if (!PyArg_ParseTupleAndKeywords (args, kw, "l|esIespppO", keywords,
         &pid,
         "utf-8", &realm_value,
-        &persist_timeout))
+        &persist_timeout,
+        "utf-8", &exceptor_value,
+        &unwind_broker,
+        &exit_monitor,
+        &thread_suspend_monitor,
+        &linker_notifier_offsets_value))
     return NULL;
 
-  options = PyDevice_parse_session_options (realm_value, persist_timeout);
+  options = PyDevice_parse_session_options (realm_value, persist_timeout,
+      exceptor_value, unwind_broker, exit_monitor, thread_suspend_monitor,
+      linker_notifier_offsets_value);
   if (options == NULL)
     goto beach;
 
@@ -3056,6 +3132,7 @@ PyDevice_attach (PyDevice * self, PyObject * args, PyObject * kw)
 beach:
   g_clear_object (&options);
 
+  PyMem_Free (exceptor_value);
   PyMem_Free (realm_value);
 
   return result;
@@ -3063,7 +3140,12 @@ beach:
 
 static FridaSessionOptions *
 PyDevice_parse_session_options (const gchar * realm_value,
-                                guint persist_timeout)
+                                guint persist_timeout,
+                                const gchar * exceptor_value,
+                                gint unwind_broker,
+                                gint exit_monitor,
+                                gint thread_suspend_monitor,
+                                PyObject * linker_notifier_offsets_value)
 {
   FridaSessionOptions * options;
 
@@ -3081,6 +3163,50 @@ PyDevice_parse_session_options (const gchar * realm_value,
 
   frida_session_options_set_persist_timeout (options, persist_timeout);
 
+  if (exceptor_value != NULL)
+  {
+    FridaExceptor exceptor;
+
+    if (!PyGObject_unmarshal_enum (exceptor_value, FRIDA_TYPE_EXCEPTOR, &exceptor))
+      goto propagate_error;
+
+    frida_session_options_set_exceptor (options, exceptor);
+  }
+
+  if (unwind_broker != -1)
+    frida_session_options_set_unwind_broker (options, unwind_broker);
+
+  if (exit_monitor != -1)
+    frida_session_options_set_exit_monitor (options, exit_monitor);
+
+  if (thread_suspend_monitor != -1)
+    frida_session_options_set_thread_suspend_monitor (options, thread_suspend_monitor);
+
+  if (linker_notifier_offsets_value != NULL)
+  {
+    gint n, i;
+
+    n = PySequence_Size (linker_notifier_offsets_value);
+    if (n == -1)
+      goto propagate_error;
+
+    for (i = 0; i != n; i++)
+    {
+      PyObject * element;
+      unsigned long offset;
+
+      element = PySequence_GetItem (linker_notifier_offsets_value, i);
+      if (element == NULL)
+        goto propagate_error;
+      offset = PyLong_AsUnsignedLong (element);
+      Py_DecRef (element);
+      if (offset == (unsigned long) -1 && PyErr_Occurred () != NULL)
+        goto propagate_error;
+
+      frida_session_options_add_linker_notifier_offset (options, offset);
+    }
+  }
+
   return options;
 
 propagate_error:

frida/core.py

@@ -883,6 +883,14 @@ class Device:
 
         return self._impl.is_lost()
 
+    @cancellable
+    def override_option(self, name: str, value: Any) -> None:
+        """
+        Override a backend-specific option
+        """
+
+        self._impl.override_option(name, value)
+
     @cancellable
     def query_system_parameters(self) -> Dict[str, Any]:
         """
@@ -1038,13 +1046,26 @@ class Device:
         target: ProcessTarget,
         realm: Optional[str] = None,
         persist_timeout: Optional[int] = None,
+        exceptor: Optional[str] = None,
+        unwind_broker: Optional[bool] = None,
+        exit_monitor: Optional[bool] = None,
+        thread_suspend_monitor: Optional[bool] = None,
+        linker_notifier_offsets: Optional[Sequence[int]] = None,
     ) -> Session:
         """
         Attach to a process
         :param target: the PID or name of the process
         """
 
-        kwargs = {"realm": realm, "persist_timeout": persist_timeout}
+        kwargs = {
+            "realm": realm,
+            "persist_timeout": persist_timeout,
+            "exceptor": exceptor,
+            "unwind_broker": unwind_broker,
+            "exit_monitor": exit_monitor,
+            "thread_suspend_monitor": thread_suspend_monitor,
+            "linker_notifier_offsets": linker_notifier_offsets,
+        }
         _filter_missing_kwargs(kwargs)
         return Session(self._impl.attach(self._pid_of(target), **kwargs))  # type: ignore
 
@@ -1310,7 +1331,7 @@ class EndpointParameters:
         _filter_missing_kwargs(kwargs)
 
         if authentication is not None:
-            (auth_scheme, auth_data) = authentication
+            auth_scheme, auth_data = authentication
             if auth_scheme == "token":
                 kwargs["auth_token"] = auth_data
             elif auth_scheme == "callback":

subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 17.7.0
+revision = 17.10.0
 depth = 1
 
 [provide]