update: module id

Historically "zygisksu" is the ZygiskOnKernelSU (known as Zygisk Next) module id, which due to ReZygisk being a fork of Zygisk Next, was used by it. To avoid conflicts in systems like MMRL, we decided to change it to "rezygisk". This, however, will allow both to be installed in the same system, although causing problems, as a side effect. The old module, with the old module id, must be uninstalled while the new one is installed.

closes #113

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/issue_template.yml

@@ -0,0 +1,65 @@
+name: Issue report
+description: Report an issue
+title: "[BUG]: "
+labels: ["bug", "not confirmed"]
+
+body:
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: The version of the ReZygisk you're using.
+    validations:
+      required: true
+
+  - type: textarea
+    id: modules
+    attributes:
+      label: Modules
+      description: "The modules you're using following the format: moduleName by authorName version x.x.x"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behavior.
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: If applicable, add logs AS A FILE to help solve the issue. Most of the time it will be from logcat on boot.
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Confirmations
+      description: The following confirmations are required to open a bug report.
+      options:
+        - label: My environment meets the minimum requirements.
+          required: true
+        - label: I have verified that this is not a duplicate issue.
+          required: true
+
+  - type: checkboxes
+    id: code_of_conduct
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/PerformanC/voice/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

.github/ISSUE_TEMPLATE/pull_request.yml

@@ -0,0 +1,41 @@
+name: Feature request
+description: Ask for a new feature to be added
+title: "[FR]: "
+labels: ["enhancement", "not confirmed"]
+
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of what the feature is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: reason
+    attributes:
+      label: Reason
+      description: Why should this feature be added?
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Confirmations
+      description: The following confirmations are required to open a feature request.
+      options:
+        - label: This feature is not already implemented.
+          required: true
+        - label: I have verified that this is not a duplicate feature request.
+          required: true
+
+  - type: checkboxes
+    id: code_of_conduct
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/PerformanC/voice/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+## Changes
+
+Write here about the changes you've made
+
+## Why 
+
+Write here why you think this should be merged
+
+## Checkmarks
+
+- [ ] The modified functions have been tested.
+- [ ] Used the same indentation as the rest of the project.
+- [ ] Updated documentation (changelog).
+
+## Additional information
+
+If you have any additional information, write it here

.github/workflows/ci.yml

@@ -0,0 +1,55 @@
+name: Untrusted CI
+
+on:
+  pull_request:
+  merge_group:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4.2.1
+
+      - name: Build with Gradle
+        run: |
+          echo 'org.gradle.parallel=true' >> gradle.properties
+          echo 'org.gradle.vfs.watch=true' >> gradle.properties
+          echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+          sed -i 's/org.gradle.unsafe.configuration-cache=true//g' gradle.properties
+          ./gradlew zipRelease
+          ./gradlew zipDebug
+
+      - name: Prepare artifact
+        if: success()
+        id: prepareArtifact
+        run: |
+          releaseName=`ls module/build/outputs/release/ReZygisk-v*-release.zip | awk -F '(/|.zip)' '{print $5}'` && echo "releaseName=$releaseName" >> $GITHUB_OUTPUT
+          debugName=`ls module/build/outputs/release/ReZygisk-v*-debug.zip | awk -F '(/|.zip)' '{print $5}'` && echo "debugName=$debugName" >> $GITHUB_OUTPUT
+          unzip module/build/outputs/release/ReZygisk-v*-release.zip -d zksu-release
+          unzip module/build/outputs/release/ReZygisk-v*-debug.zip -d zksu-debug
+
+      - name: Upload release
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prepareArtifact.outputs.releaseName }}
+          path: "./zksu-release/*"
+
+      - name: Upload debug
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prepareArtifact.outputs.debugName }}
+          path: "./zksu-debug/*"

.github/workflows/trusted_ci.yml

@@ -0,0 +1,62 @@
+name: Trusted CI
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4.2.1
+
+      - name: Setup keys
+        env:
+          private_key: ${{ secrets.ORG_PRIVATE_KEY }}
+          public_key: ${{ secrets.ORG_PUBLIC_KEY }}
+        run: |
+          echo "$private_key" | base64 -d > module/private_key
+          echo "$public_key" | base64 -d > module/public_key
+
+      - name: Build with Gradle
+        run: |
+          echo 'org.gradle.parallel=true' >> gradle.properties
+          echo 'org.gradle.vfs.watch=true' >> gradle.properties
+          echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+          sed -i 's/org.gradle.unsafe.configuration-cache=true//g' gradle.properties
+          ./gradlew zipRelease
+          ./gradlew zipDebug
+
+      - name: Prepare artifact
+        if: success()
+        id: prepareArtifact
+        run: |
+          releaseName=`ls module/build/outputs/release/ReZygisk-v*-release.zip | awk -F '(/|.zip)' '{print $5}'` && echo "releaseName=$releaseName" >> $GITHUB_OUTPUT
+          debugName=`ls module/build/outputs/release/ReZygisk-v*-debug.zip | awk -F '(/|.zip)' '{print $5}'` && echo "debugName=$debugName" >> $GITHUB_OUTPUT
+          unzip module/build/outputs/release/ReZygisk-v*-release.zip -d zksu-release
+          unzip module/build/outputs/release/ReZygisk-v*-debug.zip -d zksu-debug
+
+      - name: Upload release
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prepareArtifact.outputs.releaseName }}
+          path: "./zksu-release/*"
+
+      - name: Upload debug
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.prepareArtifact.outputs.debugName }}
+          path: "./zksu-debug/*"

.gitignore

@@ -1,6 +1,7 @@
 .gradle
 .idea
 .cxx
+.vscode
 build
 local.properties
 Cargo.lock

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "loader/src/external/liblsplt"]
-	path = loader/src/external/liblsplt
-	url = https://github.com/LSPosed/LSPlt
-[submodule "loader/src/external/parallel-hashmap"]
-	path = loader/src/external/parallel-hashmap
-	url = https://github.com/greg7mdp/parallel-hashmap
+[submodule "loader/src/external/lsplt"]
+	path = loader/src/external/lsplt
+	url = https://github.com/JingMatrix/LSPlt

README.md

@@ -1,29 +1,77 @@
-# Zygisk on KernelSU
+# ReZygisk
 
-Zygisk loader for KernelSU, allowing Zygisk modules to run without Magisk environment.
+[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[French](/READMEs/README_fr-FR.md)|[日本語](/READMEs/README_ja-JP.md)
 
-Also works as standalone loader for Magisk on purpose of getting rid of LD_PRELOAD.
+ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, APatch and Magisk (Official and Kitsune).
 
-## Requirements
+It aims to modernize and re-write the codebase to C entirely, allowing a more efficient and faster implementation of the Zygisk API with a more permissive, and FOSS friendly, license.
 
-### General
+## Why?
 
-+ No multiple root implementation installed
+The latest releases of Zygisk Next are not open-source, reserving entirely the code for its developers. Not only does that limit our ability to contribute to the project, but also impossibilities the audit of the code, which is a major security concern, as Zygisk Next is a module that runs with superuser (root) privileges, having access to the entire system.
 
-### KernelSU
+The Zygisk Next developers are famous and trusted in the Android community, however, this doesn't mean that the code is not malicious or vulnerable. We (PerformanC) understand they have their reasons to keep the code closed-source, but we believe the contrary.
 
-+ Minimal KernelSU version: 10654
-+ Minimal ksud version: 10670
-+ Kernel has full SELinux patch support
-+ For old kernels, you may need to manually add the following code to `sepolicy.rule`:  
-  `allow zygote appdomain_tmpfs file *`  
-  `allow zygote appdomain_tmpfs dir *`
+## Advantages
 
-### Magisk
+- FOSS (Forever)
 
-+ Minimal version: 25208
-+ Original Zygisk turned off
+## Dependencies
 
-## Compatibility
+| Tool            | Description                            |
+|-----------------|----------------------------------------|
+| `Android NDK`   | Native Development Kit for Android     |
 
-Should work with everything except those rely on Magisk internal behaviors.
+### C++ Dependencies
+
+| Dependency | Description                   |
+|------------|-------------------------------|
+| `lsplt`    | Simple PLT Hook for Android   |
+
+## Installation
+
+### 1. Select the right zip
+
+The selection of the build/zip is important, as it will determine how hidden and stable ReZygisk will be. This, however, is not a hard task:
+
+- `release` should be the one chosen for most cases, it removes app-level logging and offers more optimized binaries.
+- `debug`, however, offers the opposite, with heavy logging and no optimizations, For this reason, **you should only use it for debugging purposes** and **when obtaining logs for creating an Issue**.
+
+As for branches, you should always use the `main` branch, unless told otherwise by the developers, or if you want to test upcoming features and are aware of the risks involved.
+
+### 2. Flash the zip
+
+After choosing the right build, you should flash it using your current root manager, like Magisk or KernelSU. You can do this by going to the `Modules` section of your root manager and selecting the zip you downloaded.
+
+After flashing, check the installation logs to ensure there are no errors, and if everything is fine, you can reboot your device.
+
+> [!WARNING]
+> Magisk users should disable built-in Zygisk, as it will conflict with ReZygisk. This can be done by going to the `Settings` section of Magisk and disabling the `Zygisk` option.
+
+### 3. Verify the installation
+
+After rebooting, you can verify if ReZygisk is working properly by checking the module description in the `Modules` section of your root manager. The description should indicate that the necessary daemons are running. For example, if your environment supports both 64-bit and 32-bit, it should look similar to this: `[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+
+## Translation
+
+There are currently two different ways to contribute translations for ReZygisk:
+
+- For translations of the README, you can create a new file in the `READMEs` folder, following the naming convention of `README_<language>.md`, where `<language>` is the language code (e.g., `README_pt-BR.md` for Brazilian Portuguese), and open a pull request to the `main` branch with your changes.
+- For translations of the ReZygisk WebUI, you should first contribute to our [Crowdin](https://crowdin.com/project/rezygisk). Once approved retrieve the `.json` file from there and open a pull request with your changes -- adding the `.json` file to the `webroot/lang` folder and your credits to the `TRANSLATOR.md` file, in alphabetic order.
+
+## Support
+
+For any question related to ReZygisk or other PerformanC projects, feel free to join any of the following channels below:
+
+- Discord Channel: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- ReZygisk Telegram Channel: [@rezygisk](https://t.me/rezygisk)
+- PerformanC Telegram Channel: [@performancorg](https://t.me/performancorg)
+- PerformanC Signal Group: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)
+
+## Contribution
+
+It is mandatory to follow PerformanC's [Contribution Guidelines](https://github.com/PerformanC/contributing) to contribute to ReZygisk. Following its Security Policy, Code of Conduct, and syntax standard.
+
+## License
+
+ReZygisk is licensed majoritaly under GPL, by Dr-TSNG, but also AGPL 3.0, by The PerformanC Organization, for re-written code. You can read more about it on [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).

READMEs/README_fr-FR.md

@@ -0,0 +1,80 @@
+# ReZygisk
+
+[English](../README.md)
+
+ReZygisk est un fork de Zygisk Next, une implémentation autonome de Zygisk. Il vise à fournir un support de l'API Zygisk pour KernelSU, APatch et Magisk (Officiel et Kitsune).
+
+L'objectif est de moderniser et de réécrire la base du code initégralement en C. Cela permettra une meilleure efficacité et une implémentation plus rapide de l'API Zygisk, le tout sous une licence plus permissive et en faveur des logiciels libres (FOSS).
+
+
+## Pourquoi ?
+
+La dernière release de Zygisk Next n'est pas open source, le code est donc accessible uniquement à ses développeurs. Non seulement cela limite notre capacité à contribuer au projet, mais cela rend également impossible la vérification du code, ce qui constitue une préoccupation majeure en matière de sécurité. Zygisk Next est un module fonctionnant avec les permissions administrateur (root) et a donc accès à l'entièreté du système.
+
+Les développeurs de Zygisk Next sont connus et reconnus dans la communauté Android. Toutefois, cela ne signifie pas que du code malveillant ou des vulnérabilités ne se cachent pas dans le code. Nous (PerfomanC) comprenons qu'ils aient des raisons de garder leur code en source fermée, mais nous pensons qu'avoir un code open source est mieux.
+
+## Avantages
+
+- FOSS (Pour toujours !)
+
+## Dépendances
+
+| Outil            | Description                           |
+|-----------------|----------------------------------------|
+| `Android NDK`   | Kit de développement natif d'Android   |
+
+### Dépendances C++ 
+
+| Dépendance | Description                   |
+|------------|-------------------------------|
+| `lsplt`    | Simple PLT Hook pour Android  |
+
+## Installation
+
+### 1. Choisi la bonne archive ZIP
+
+La sélection du build/archive ZIP est important, car cela déterminera à quel point ReZygisk sera caché et stable. Toutefois, ce n'est pas compliqué :
+
+ - `release` doit être choisie dans la majorité des cas, car elle supprime les journaux au niveau application et offre des binaires plus optimisés. 
+ - `debug`, en revanche, cette version offre l'inverse avec des journaux détaillés et aucune optimisation. C'est pour cela que **vous ne devriez n'utiliser cette version uniquement pour le débogage** et **l'obtention de journaux pour ouvrir un rapport d'incident (issue Github)**.
+ 
+En ce qui concerne les branches, vous devriez toujours utiliser la branche `main`, sauf si les développeurs vous indiquent le contraire ou si vous souhaitez tester les fonctionnalités à venir et êtes conscient des risques encourus.
+ 
+### 2. Flashez l'archive zip
+
+Après avoir choisi le bon build, vous devez le flasher à l'aide de votre gestionnaire root, comme Magisk ou KernelSU. Vous pouvez le faire en allant dans la section `Modules` de votre gestionnaire root et en y sélectionnant l'archive zip que vous venez de télécharger.
+ 
+Après le flash, vérifiez les journaux d'installation pour vous assurer qu'il n'y ait pas d'erreurs, et si tout va bien, vous pouvez redémarrer votre appareil.
+
+ 
+> [!WARNING] 
+> Les utilisateurs de Magisk doivent désactiver Zygisk pré intégré, car sinon il entrera en conflit avec ReZygisk. Cela peut être fait en vous rendant dans la section `Paramètres` de Magisk et en désactivant l'option `Zygisk`
+ 
+### 3. Vérifiez l'installation
+
+Après le redémarrage, vous ne pouvez pas vérifier si ReZygisk fonctionne normalement en vérifiant la description du moudles dans la section `Modules` de votre gestionnaire root. La description doit indiquer que les processus en arrière plan nécessaire sont en cours d'exécution. Par exemple, si votre environnement prend en charge à la fois le 64 bits et le 32 bits, cela devrait ressembler à ceci :`[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+
+
+## Traduction
+
+Il existe actuellement deux façons différentes de contribuer aux traductions pour ReZygisk:
+ 
+- Pour les traductions du README, vous pouvez créer un nouveau fichier dans le dossier READMEs, en suivant la convention de dénomination des fichiers `README_<langue>.md`, où `<langue>` est le code de la langue (par exemple, `README_fr-FR.md` pour le franco français), puis ouvrir un pull request vers la branche `main` avec vos modifications.
+- Pour les traductions de l'interface WebUI de ReZygisk, vous devez passer par le projet [Crowdin](https://crowdin.com/project/rezygisk). Une fois approuvé, récupérez le fichier `.json` et ouvrez un pull request avec vos modifications -- en ajoutant le fichier `.json` au dossier `webroot/lang` et vos crédits au fichier `TRANSLATOR.md`, par ordre alphabétique.
+
+## Support
+
+Pour toutes questions relatives a ReZygisk ou d'autres projets de PerformanC, n'hésitez pas à nous rejoindre via les différents moyens disponibles: 
+
+- Notre Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- Le Telegram relatif a ReZygisk: [@rezygisk](https://t.me/rezygisk)
+- Notre Telegram: [@performancorg](https://t.me/performancorg)
+- Notre Signal: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)
+
+## Contribution
+
+Il est obligatoire de lire les instructions de PerformanC dans les [Contribution Guidelines](https://github.com/PerformanC/contributing) afin de contribuer au projet ReZygisk. Suivez la politique de sécurité, le code de conduite et les standards relatif à la syntaxe.
+
+## License
+
+ReZygisk est majoritairement sous la licence GPL pour la partie de Dr-TSNG, mais sous licence AGPL 3.0 pour la partie réécrite du code par PerformanC. Vous pouvez trouver plus d'information sur le lien suivant : [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).

READMEs/README_id-ID.md

@@ -0,0 +1,80 @@
+# ReZygisk
+
+[English](https://github.com/PerformanC/ReZygisk)
+
+ReZygisk adalah turunan dari Zygisk Next, sebuah implementasi mandiri dari Zygisk, menyediakan dukungan API Zygisk untuk KernelSU, APatch, dan Magisk (Versi Resmi dan Kitsune).
+
+Tujuannya adalah untuk memodernisasi dan menulis ulang kode sumber sepenuhnya dalam bahasa C, memungkinkan implementasi API Zygisk yang lebih efisien dan cepat dengan lisensi yang lebih permisif dan ramah terhadap FOSS (Free and Open Source Software).
+
+## Mengapa?
+
+Rilisan terbaru dari Zygisk Next tidak bersifat open-source, dengan kode yang sepenuhnya dikendalikan oleh developernya. Hal ini tidak hanya membatasi kemampuan kami untuk berkontribusi pada proyek ini, tetapi juga membuat kode tidak dapat diaudit, yang menjadi masalah utama keamanan karena Zygisk Next adalah modul yang berjalan dengan hak superuser (root), yang memiliki akses ke seluruh sistem.
+
+Meskipun developer Zygisk Next terkenal dan dipercaya dalam komunitas Android, hal ini tidak menjamin bahwa kode tersebut bebas dari bahaya atau kerentanan. Kami (PerformanC) memahami alasan mereka untuk menjaga kode tetap tertutup, tetapi kami memiliki pandangan yang berbeda.
+
+## Keunggulan
+
+- FOSS (Free and Open Source Software) Selamanya.
+
+## Komponen Pendukung
+
+| Alat             | Deskripsi                                  |
+|------------------|--------------------------------------------|
+| `Android NDK`    | Native Development Kit untuk Android      |
+
+### Komponen Pendukung C++
+
+| Ketergantungan | Deskripsi                      |
+|----------------|---------------------------------|
+| `lsplt`        | Simple PLT Hook untuk Android |
+
+## Instalasi
+
+### 1. Pilih file ZIP yang tepat
+
+Pemilihan build/zip sangat penting, karena ini akan menentukan seberapa tersembunyi dan stabil ReZygisk. Namun, ini bukan tugas yang sulit:
+
+- `release`: Direkomendasikan untuk penggunaan normal. Binary lebih optimal, logging minimal.
+- `debug`: Untuk keperluan debug. Logging lengkap, tanpa optimasi.
+
+Untuk branch, selalu gunakan main branch, kecuali diinstruksikan oleh pengembang, atau jika Anda ingin menguji fitur mendatang dan menyadari risikonya.
+
+### 2. Flash file ZIP
+
+Setelah memilih build yang tepat, Anda harus mem-flash-nya menggunakan pengelola root Anda saat ini, seperti Magisk atau KernelSU. Anda dapat melakukannya dengan masuk ke bagian Modules di pengelola root Anda dan memilih zip yang telah diunduh.
+
+Setelah mem-flash, periksa log instalasi untuk memastikan tidak ada kesalahan, dan jika semuanya selesai, Anda dapat me-reboot perangkat Anda
+
+> [!WARNING]
+> Pengguna Magisk harus menonaktifkan Zygisk bawaan, karena ini akan bentrok dengan ReZygisk. Ini dapat dilakukan dengan masuk ke bagian `Settings` di Magisk dan menonaktifkan opsi `Zygisk`.
+
+### 3. Verifikasi Instalasi
+
+Setelah reboot, Anda dapat memverifikasi apakah ReZygisk bekerja dengan baik dengan memeriksa deskripsi modul di bagian Modules pada pengelola root Anda. Deskripsi tersebut harus menunjukkan bahwa daemon yang diperlukan sedang berjalan. Misalnya, jika lingkungan Anda mendukung 64-bit dan 32-bit, itu akan terlihat seperti ini:
+`[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+
+## Terjemahan
+
+Saat ini ada dua cara untuk berkontribusi dalam terjemahan untuk ReZygisk:
+
+- Untuk terjemahan README, Anda dapat membuat file baru di folder `READMEs`, mengikuti konvensi penamaan `README_<bahasa>.md`, di mana `<bahasa>` adalah kode bahasa (misalnya, `README_id-ID.md` untuk Bahasa Indonesia), dan membuka pull request ke `main` branch.
+- Untuk terjemahan WebUI ReZygisk, Anda harus berkontribusi terlebih dahulu di [Crowdin](https://crowdin.com/project/rezygisk). Setelah disetujui, ambil file `.json` dari sana dan buka pull request dengan perubahan Anda -- tambahkan file `.json` ke folder `webroot/lang` dan kredit Anda ke file TRANSLATOR.md, dalam urutan alfabet.
+
+## Dukungan
+
+Untuk pertanyaan terkait ReZygisk atau proyek PerformanC lainnya, jangan ragu untuk bergabung dengan salah satu saluran berikut:
+
+Untuk pertanyaan terkait ReZygisk atau proyek PerformanC lainnya, silakan bergabung ke salah satu saluran berikut:
+
+- Saluran Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- Saluran Telegram ReZygisk: [@rezygisk](https://t.me/rezygisk)
+- Saluran Telegram PerformanC: [@performancorg](https://t.me/performancorg)
+- Grup Signal PerformanC: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)
+
+## Kontribusi
+
+Wajib mengikuti [Pedoman Kontribusi](https://github.com/PerformanC/contributing) PerformanC's untuk berkontribusi pada ReZygisk. Sesuai dengan Kebijakan Keamanan, Kode Etik, standar struktur dan format yang berlaku.
+
+## Lisensi
+
+ReZygisk sebagian besar berlisensi di bawah GPL, oleh Dr-TSNG, tetapi juga AGPL 3.0, oleh The PerformanC Organization, untuk kode yang ditulis ulang. Anda dapat juga membaca lebih lanjut di [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).

READMEs/README_ja-JP.md

@@ -0,0 +1,77 @@
+# ReZygisk
+
+[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[French](/READMEs/README_fr-FR.md)
+
+ReZygiskはZygiskのスタンドアローン実装であるZygisk Nextのフォークです。ReZygiskは、KernelSU、APatch、Magisk（オフィシャルバージョンとKitsuneバージョン両方）それぞれへのZygisk APIサポートを備えています。
+
+ReZygiskはコードベースをCに移行し、よりモダンなコードで書き換えることを目標にしています。これにより、Zygisk APIのより効率的かつ高速な実装と、FOSSライセンスの両方を備えることができています。
+
+## なぜReZygiskを選ぶべきか
+
+Zygisk Nextの最新リリースはオープンソースではなく、コードをその開発者のみにアクセス可能にしています。これは我々のように一般の開発者の貢献を無下にするだけでなく、Zygisk Nextがroot権限で走るアプリなのにもかかわらずコードにアクセスできないため、セキュリティ上でも深刻な問題が有ります。
+
+Zygisk Nextの開発者達は有名かつコミュニティからも信頼されていますが、これはコードが100%悪意が無いことや脆弱性が無いことを意味しません。我々（PerformanC）は彼らがZygisk Nextをクローズドソースにする理由も理解していますが、我々はその逆を信じます。
+
+## メリット
+
+- FOSS (無制限)
+
+## 依存関係
+
+| ツール           | 説明                                   |
+|-----------------|----------------------------------------|
+| `Android NDK`   | Native Development Kit for Android     |
+
+### C++ 依存関係
+
+| 依存関係    | 説明                           |
+|------------|-------------------------------|
+| `lsplt`    | Simple PLT Hook for Android   |
+
+## インストール
+
+### 1. 必要なZipファイルを選択
+
+ReZygiskの安定性や匿名性のためには、ビルドファイル/Zipファイルの選択は**非常に重要**です。しかしながら、これはそこまで難しくもありません。
+
+- `release` バージョンが基本的にはおすすめです。アプリレベルのログが出力されなかったりなど、より効率化されたバイナリが提供されるためです。
+- `debug` バージョンはreleaseバージョンの反対です。重いログの出力がなされたり、高速化されていないバイナリが提供されます。このため、このバージョンは**デバッグ用に**、もしくは**Issueを作るためにログを入手する**ときのみに使われるべきです。
+
+ブランチに関しては、基本的に`main`ブランチを選択すべきです。しかしながら、PerformanCの開発者に違うブランチを使うように言われたり、あなたがベータ版のコードを使うことのリスクを理解しかつ実装されたばかりの機能を使いたいのならば違うブランチを選択することも選択肢の一つでしょう。
+
+### 2. Zipファイルをフラッシュ
+
+正しいビルドを選択したあとは、ReZygiskのビルドを現在使用しているルートマネージャー（MagiskやKernelSU等）を使用してフラッシュしてください。これは、マネージャーで`Modules`セクションを開きダウンロードしたビルドファイルを選択することでできます。
+
+フラッシュしたあとは、インストールログを確認して、エラーがないか確かめてください。なんのエラーも起きていなければ、デバイスを再起動してください。
+
+> [!WARNING]
+> Magiskを使用しているのならば、ビルトインのZygiskがReZygiskと競合するため無効化してください。Magiskの`設定`セクションを開き、Zygiskオプションを無効化することでできます。
+### 3. インストールを確認
+
+再起動後、ルートマネージャーの`Modules`セクションをチェックすることによりReZygiskが正常に動いているかどうか確認できます。
+説明欄は、必要なデーモンが動作していることを示しているはずです。例えば、あなたの端末が64bitと32bitの両方をサポートしている場合、右記のように見えるはずです: `[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+
+## 翻訳
+
+There are currently two different ways to contribute translations for ReZygisk:
+
+- READMEの翻訳は、`READMEs`フォルダに`README_<language code>.md`というファイルを作り、そこに翻訳を書き込んでください。その後、プルリクエストを送信してくださいlang` folder and your credits to the `TRANSLATOR.md` file, in alphabetic order.
+- ReZygisk WebUIの翻訳のためには、まず[Crowdin](https://crowdin.com/project/rezygisk)で貢献する必要が有ります。一度貢献を許可され、`.json`ファイルを入手したならば、そのファイルを元に新しい言語のファイルを作り、その`.json`ファイルを`webroot/lang`フォルダに入れてください。更に、TRANSLATOR.mdにあなたのクレジットを付与するのも忘れないでください！（なお名前の順番はアルファベット順です）
+
+## サポート
+
+ReZygiskやPerformanCのプロジェクトに関して質問がある場合、以下のいずれかに参加して質問してください。
+
+- Discord チャンネル: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- ReZygisk Telegram チャンネル: [@rezygisk](https://t.me/rezygisk)
+- PerformanC Telegram チャンネル: [@performancorg](https://t.me/performancorg)
+- PerformanC Signal Group: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)
+
+## 貢献
+
+[Contribution Guidelines](https://github.com/PerformanC/contributing)に従ってください。セキュリティポリシー、コードスタイル等、すべて従う必要が有ります。
+
+## ライセンス
+
+ReZygiskはDr-TSNGによるGPLライセンスと、PerformanCが書き直したコードに関してはThe PerformanC OrganizationによるAGPL 3.0ライセンスの元に配布されます。[Open Source Initiative](https://opensource.org/licenses/AGPL-3.0)で、より詳しい情報を得ることができます。

READMEs/README_pt-BR.md

@@ -0,0 +1,75 @@
+# ReZygisk
+
+[English](../README.md)
+
+ReZygisk é uma fork do Zygisk Next, uma implementação do Zygisk independente, fornecendo a API do Zygisk para o KernelSU, APatch e Magisk (além do embutido).
+
+Ele foca em modernizar e re-escrever todo o código fonte para C, permitindo uma implementação da API do Zygisk com uma licença mais permissiva e amigável a FOSS.
+
+## Por quê?
+
+Os últimos lançamentos do Zygisk Next não possuem código aberto, reservando-o para os seus desenvolvedores. Isso não só limita nossa capacidade de contribuir com o projeto, mas também impossibilita a auditoria do código, uma preocupação grave de segurança, já que o Zygisk Next é um módulo que roda como superuser (super usuário/root), tendo acesso a todo o sistema.
+
+Os desenvolvedores do Zygisk Next são famosos e confiados pela comunidade Android, mas isso não significa que o código não seja nem malicioso nem vulnerável. Nós (PerformanC) reconhecemos seus motivos de manterem o código recluso a eles, mas a gente acredita no contrário.
+
+## Vantagens
+
+- FOSS (Pra sempre)
+
+## Dependências
+
+| Ferramenta      | Descrição                                    |
+|-----------------|----------------------------------------------|
+| `Android NDK`   | Kit de Desenvolvimento Nativo para o Android |
+
+### Dependências C++
+
+| Dependência | Descrição                        |
+|-------------|----------------------------------|
+| `lsplt`     | PLT Hook simples para o Android  |
+
+## Instalação
+
+### 1. Selecionando o zip apropriado
+
+A seleção da build/zip é importate, já que vai determinar o quão escondido e estável o ReZygisk vai ser. Isso, no entanto, não é uma tarefa difícil:
+
+- `release` deve ser a escolha para a maioria dos casos, ele remove o log de nível de app e oferece binários mais otimizados.
+- `debug`, no entanto, oferece o oposto, com logs extensos, e sem otimizações. Por isso, **você deve usar apenas para fins de depuração** e **ao obter logs para criar um Issue**.
+
+### 2. "Flash"ando o zip
+
+Depois de escolher a build apropriada, você deve "flashar" ela usando seu gerenciador de root atual, como o Magisk ou o KernelSU. Você pode fazer isso indo na seção `Módulos` do seu gerenciador de root e selecionando o zip que você fez download.
+
+Depois de "flashar", confira os logs de instalação para garantir que não houve erros, e se tudo estiver certo, você pode reiniciar seu dispositivo.
+
+> [!WARNING]
+> Usuários do Magisk devem desabilitar o Zygisk embutido, já que ele vai conflitar com o ReZygisk. Isso pode ser feito indo na seção `Configurações` do Magisk e desabilitando a opção `Zygisk`.
+
+### 3. Verificando a instalação
+
+Depois de reiniciar, você pode verificar se o ReZygisk está funcionando corretamente indo na seção `Módulos` do seu gerenciador de root. A descrição deve indicar que os daemons necessários estão rodando. Por exemplo, se seu ambiente suporta tanto 64-bit quanto 32-bit, deve estar parecido com isso: `[monitor: 😋 tracing, zygote64: 😋 injected, daemon64: 😋 running (...) zygote32: 😋 injected, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+
+## Tradução
+
+Tem duas formas diferentes de contribuir com traduções para o ReZygisk:
+
+- Para traduções do README, você pode criar um novo arquivo na pasta `READMEs`, seguindo a padronização de nome de `README_<idioma>.md`, onde `<idioma>` é o código do idioma (ex: `README_pt-BR.md` para português brasileiro), e abrir um pull request para o branch `main` com suas mudanças.
+- Para traduções da WebUI do ReZygisk, você deve primeiro contribuir no nosso [Crowdin](https://crowdin.com/project/rezygisk). Depois de aprovado, pegue o arquivo `.json` de lá e abra um pull request com suas mudanças -- adicionando o arquivo `.json` na pasta `webroot/lang` e seus créditos no arquivo `TRANSLATOR.md`, em ordem alfabética.
+
+## Suporte
+
+Para quaisquer problemas no ReZygisk ou qualquer projeto da PerformanC, sinta-se livre para entrar em qualquer canal abaixo:
+
+- Server do Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- Canal do Telegram do ReZygisk: [@rezygisk](https://t.me/rezygisk)
+- Canal do Telegram da PerformanC: [@performancorg](https://t.me/performancorg)
+- Grupo do Signal da PerformanC: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)
+
+## Contribuição
+
+É obrigatório seguir as [Regras de Contribuição](https://github.com/PerformanC/contributing) da PerformanC para contribuir ao ReZygisk, seguindo sua Política de Segurança, Código de Conduta, e padronização de sintaxe.
+
+## Licença
+
+ReZygisk é majoritamente licenciado em GPL, por Dr-TSNG, mas também em AGPL 3.0, pela A Organização PerformanC (The PerformanC Organization) para código re-escrito. Você pode ler mais em [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).

READMEs/README_vi-VN.md

@@ -0,0 +1,77 @@
+# ReZygisk
+
+[English](../README.md)
+
+ReZygisk làm một nhánh phát triển lấy từ ZygiskNext, một triển khai độc lập của Zygisk, cung cấp và hỗ trợ Zygisk API cho KernelSU, APatch và Magisk (chính thức và Kitsune).
+
+Mục tiêu của ReZygisk là mô-đun hoá và viết lại toàn bộ codebase sang C, cho phép triển khai API Zygisk hiệu quả hơn và nhanh hơn với giấy phép dễ dàng tái sử dụng hơn.
+
+## Tại sao nhánh phát triển này lại xuất hiện?
+
+Bản ra mắt mới nhất của Zygisk Next không còn là mã nguồn mở, dành toàn bộ quyền phát triển phần mềm cho những nhà phát triển gốc. Không chỉ giới hạn chúng ta đóng gốp cho dự án, mà còn bất khả thi trong việc kiểm trả độ đảm bảo của mã, điều mà có thể coi là mối quan tâm lớn về tính bảo mật và độ an toàn, bởi Zygisk Next là mô-đun chạy dưới quyền quản trị (root), có khả năng truy cập vào toàn bộ hệ thống trong thiết bị của bạn.
+
+Các nhà phát triển Zygisk Next đều là những người nổi tiếng và được tin tưởng bởi cộng đồng sử dụng Android, tuy nhiên, điều đó không có nghĩa là mã nguồn của họ không có lỗ hổng hoặc có nguy cơ bị tấn công. Chúng tôi (PerformanC) thông cảm được lý do mà học đóng mã nguồn của họ vào, tuy nhiễn chúng tôi tin vào điều ngược lại.
+
+## Ưu điểm
+
+- Mã nguồn mở (Vĩnh Viễn)
+
+## Các công cụ/thư viện được sử dụng
+
+| Công cụ / Thư Viện        | Mô tả                                     |
+|---------------------------|-------------------------------------------|
+| `Android NDK`             | Bộ công cụ phát triển cốt lõi cho Android |
+
+### Các công cụ/thư viện của C++ được sử dụng
+
+| Thư Viện   | Mô Tả                                        |
+|------------|----------------------------------------------|
+| `lsplt`    | Công cụ **móc** vào PLT đơn giản cho Android |
+
+## Cài Đặt
+
+### 1. Sử dụng đúng tệp zip
+
+Chọn đúng tệp bản dựng / zip là một điều tất yếu, bởi nó sẽ xác định khả năng ẩn của ReZygisk. Về cơ bản đây không phải là một việc khó:
+
+- `release` bản này sẽ được chọn trong hầy hết các trường hợp sử dụng, bản này loại bỏ nhật ký phát triển cấp độ ứng dụng và cung cấp các tệp nhị phân được tối ưu hóa hơn.
+- `debug`,  bản này tuy nhiên không được tối ưu và đi kèm với nó là ghi lại nhật ký phát triển khá nhiều. Vì lý do này, **chỉ nên sử dụng khi cần gỡ lỗi** và **khi cần ghi lại nhật lý để tạo báo về lỗi hoặc gì đó**.
+
+As for branches, you should always use the `main` branch, unless told otherwise by the developers, or if you want to test upcoming features and are aware of the risks involved.
+
+### 2. Flash the zip
+
+Sau khi chọn một bản dựng phù hợp với bạn, điều cần làm là flash nó bằng trình quản lý root như Magisk hay KernelSU. Bạn có thể làm điều này bằng cách vào mục `Mô-đun / Module` của trình quản lý root của bạn và chọn tệp zip vừa tải xuống.
+
+Sau khi flash, kiểm tra lại nhật ký lỗi để chắc chắn rằng không có lỗi nào xảy ra, nếu mọi thứ xuôn sẻ, khởi động lại thiết bị.
+
+> [!WARNING]
+> Người dùng Magisk cần phải tắt `built-in Zygisk`, bởi nó sẽ xung đột với ReZygisk. Điều này có thể thực hiện bằng cách vào `Cài Đặt` và tắt tùy chọn `ZygiskZygisk`
+
+### 3. Verify the installation
+
+Sau khi khởi động lại, bạn có thể xác minh ReZygisk có hoạt động bình thường không bằng cách kiểm tra mô tả module trong phần `Modules` của trình quản lý gốc. Mô tả sẽ chỉ ra rằng các daemon cần thiết đang chạy. Ví dụ, nếu môi trường của bạn hỗ trợ cả cấu trúctrúc 64-bit và 32-bit, nó sẽ trông giống như thế này: `[monitor: 😋 tracing, zygote64: 😋 inject, daemon64: 😋 running (...) zygote32: 😋 inject, daemon32: 😋 running (...)] Standalone implementation of Zygisk.`
+
+## Dịch WebUI cho mô-đun
+
+Hiện tại có hai cách khác nhau để đóng góp bản dịch cho ReZygisk:
+
+- Đối với bản dịch của README, bạn có thể tạo một tệp mới trong thư mục `READMEs`, theo quy ước đặt tên `README_<language>.md`, trong đó `<language>` là mã ngôn ngữ (ví dụ: `README_pt-BR.md` cho tiếng Bồ Đào Nha Brazil) và mở yêu cầu kéo đến nhánh `main` với các thay đổi của bạn.
+- Đối với bản dịch của ReZygisk WebUI, trước tiên bạn phải đóng góp cho [Crowdin](https://crowdin.com/project/rezygisk) của chúng tôi. Sau khi được chấp thuận, hãy lấy tệp `.json` từ đó và mở yêu cầu kéo với các thay đổi của bạn -- thêm tệp `.json` vào thư mục `webroot/lang` và ghi công của bạn vào tệp `TRANSLATOR.md`, theo thứ tự bảng chữ cái.
+
+## Hỗ trợ
+
+Nếu bạn có những câu hỏi nào dành cho ReZygisk hoặc bất kì một dự án nào của PerformanC, hãy tự nhiên tham gia các kênh trò chuyện dưới đây:
+
+- Kênh Discord: [PerformanC](https://discord.gg/uPveNfTuCJ)
+- Kênh Telegram ReZygisk: [@rezygisk](https://t.me/rezygisk)
+- Kênh Telegram PerformanC: [@performancorg](https://t.me/performancorg)
+- Nhóm Signal PerformanC: [@performanc](https://signal.group/#CjQKID3SS8N5y4lXj3VjjGxVJnzNsTIuaYZjj3i8UhipAS0gEhAedxPjT5WjbOs6FUuXptcT)
+
+## Đóng góp cho dự án này
+
+Tuân theo [hướng dẫn đóng góp](https://github.com/PerformanC/contributing) của PerformanC là một điều tất yếu mà bạn bắt buộc phải làm. Hãy tuân theo chính sách bảo mật, quy tắc ứng xử/đóng góp mã nguồn và tiêu chuẩn cú pháp riêng.
+
+## Bản quyền
+
+Hầu hết các thành phần của ReZygisk để dưới bản quyền GPL (bởi Dr-TSNG) và AGPL 3.0 (bởiThe PerformanC Organization) cho những phần được viết lại. Bạn có thể xem thêm trong trang [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0).

TRANSLATOR.md

@@ -0,0 +1,22 @@
+# 🌎 Translators
+- **ar_EG** by [@ZG089](https://github.com/ZG089)
+- **de_DE** by [@Blazzycrafer](https://github.com/Blazzycrafter)
+- **en_US** by [@PerformanC (The PerformanC Organization)](https://github.com/PerformanC)
+- **es_AR** by [@Flopster101](https://github.com/Flopster101)
+- **es_ES** by [@LuchoModzzz](https://github.com/Lxchoooo)
+- **es_MX** by [@LuchoModzzz](https://github.com/Lxchoooo)
+- **fr_FR** by [@GhostFRR](https://github.com/GhostFRR)
+- **ja_JP** by [@Fyphen1223](https://github.com/Fyphen1223)
+- **id_ID** by [@bpanca05](https://github.com/bpanca05) & [@LuckyKiddos](https://github.com/GuitarHeroStyles)
+- **it_IT** by [@thasave14](https://github.com/thasave14)
+- **pt_BR** by [@ThePedroo](https://github.com/ThePedroo)
+- **ro_RO** by [@ExtremeXT](https://github.com/ExtremeXT)
+- **ru_RU** by [@Emulond](https://github.com/Emulond) & [@AJleKcAHgP68](https://github.com/AJleKcAHgP68)
+- **tr_TR** by [@dyingwillow](https://github.com/dyingwillow)
+- **uk_UA** by [@Kittyskj](https://github.com/Kittyskj)
+- **vi_VN** by [@RainyXeon](https://github.com/RainyXeon)
+- **zh_CN** by [@Meltartica](https://github.com/Meltartica) & [@SheepChef](https://github.com/SheepChef)
+- **zh_TW** by [@Meltartica](https://github.com/Meltartica)
+
+> [!NOTE]
+> Want to add your translation? Go to [Crowdin](https://crowdin.com/project/rezygisk) and translate!

build.gradle.kts

@@ -2,18 +2,7 @@ import com.android.build.gradle.LibraryExtension
 import java.io.ByteArrayOutputStream
 
 plugins {
-    id("com.android.application") apply false
-    id("com.android.library") apply false
-}
-
-buildscript {
-    repositories {
-        maven("https://plugins.gradle.org/m2/")
-    }
-    dependencies {
-        classpath("org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r")
-        classpath("org.mozilla.rust-android-gradle:plugin:0.9.3")
-    }
+    alias(libs.plugins.agp.lib) apply false
 }
 
 fun String.execute(currentWorkingDir: File = file("./")): String {
@@ -29,20 +18,22 @@ fun String.execute(currentWorkingDir: File = file("./")): String {
 val gitCommitCount = "git rev-list HEAD --count".execute().toInt()
 val gitCommitHash = "git rev-parse --verify --short HEAD".execute()
 
-val moduleId by extra("zygisksu")
-val moduleName by extra("Zygisk on KernelSU")
-val verName by extra("v4-0.6.1")
+val moduleId by extra("rezygisk")
+val moduleName by extra("ReZygisk")
+val verName by extra("v1.0.0")
 val verCode by extra(gitCommitCount)
-val minKsuVersion by extra(10654)
-val minKsudVersion by extra(10670)
+val commitHash by extra(gitCommitHash)
+val minAPatchVersion by extra(10655)
+val minKsuVersion by extra(10940)
+val minKsudVersion by extra(11425)
 val maxKsuVersion by extra(20000)
-val minMagiskVersion by extra(25208)
+val minMagiskVersion by extra(26402)
 
-val androidMinSdkVersion by extra(29)
-val androidTargetSdkVersion by extra(33)
-val androidCompileSdkVersion by extra(33)
-val androidBuildToolsVersion by extra("33.0.2")
-val androidCompileNdkVersion by extra("25.2.9519653")
+val androidMinSdkVersion by extra(26)
+val androidTargetSdkVersion by extra(34)
+val androidCompileSdkVersion by extra(34)
+val androidBuildToolsVersion by extra("34.0.0")
+val androidCompileNdkVersion by extra("27.2.12479018")
 val androidSourceCompatibility by extra(JavaVersion.VERSION_11)
 val androidTargetCompatibility by extra(JavaVersion.VERSION_11)
 
@@ -52,7 +43,7 @@ tasks.register("Delete", Delete::class) {
 
 fun Project.configureBaseExtension() {
     extensions.findByType(LibraryExtension::class)?.run {
-        namespace = "icu.nullptr.zygisksu"
+        namespace = "icu.nullptr.zygisk.next"
         compileSdk = androidCompileSdkVersion
         ndkVersion = androidCompileNdkVersion
         buildToolsVersion = androidBuildToolsVersion

gradle.properties

@@ -1,23 +1 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.useAndroidX=false

gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+agp = "8.2.0"
+kotlin = "1.9.22"
+
+[plugins]
+agp-lib = { id = "com.android.library", version.ref = "agp" }
+kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.1" }
+rust-android = { id = "org.mozilla.rust-android-gradle.rust-android", version = "0.9.3" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,69 +15,104 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,89 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

loader/build.gradle.kts

@@ -1,7 +1,47 @@
+import java.nio.file.Paths
+import org.gradle.internal.os.OperatingSystem
+
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.agp.lib)
 }
 
+val verCode: Int by rootProject.extra
+val verName: String by rootProject.extra
+val commitHash: String by rootProject.extra
+
+fun Project.findInPath(executable: String, property: String): String? {
+    val pathEnv = System.getenv("PATH")
+    return pathEnv.split(File.pathSeparator).map { folder ->
+        Paths.get("${folder}${File.separator}${executable}${if (OperatingSystem.current().isWindows) ".exe" else ""}")
+            .toFile()
+    }.firstOrNull { path ->
+        path.exists()
+    }?.absolutePath ?: properties.getOrDefault(property, null) as? String?
+}
+
+val ccachePath by lazy {
+    project.findInPath("ccache", "ccache.path")?.also {
+        println("loader: Use ccache: $it")
+    }
+}
+
+val defaultCFlags = arrayOf(
+    "-D_GNU_SOURCE",
+
+    "-Wall", "-Wextra",
+    "-fno-rtti", "-fno-exceptions",
+    "-fno-stack-protector", "-fomit-frame-pointer",
+    "-Wno-builtin-macro-redefined", "-D__FILE__=__FILE_NAME__"
+)
+
+val releaseFlags = arrayOf(
+    "-Ofast", "-flto=thin",
+    "-Wno-unused", "-Wno-unused-parameter",
+    "-fvisibility=hidden", "-fvisibility-inlines-hidden",
+    "-fno-unwind-tables", "-fno-asynchronous-unwind-tables",
+    "-Wl,--exclude-libs,ALL", "-Wl,--gc-sections", "-Wl,--strip-all"
+)
+
 android {
     buildFeatures {
         androidResources = false
@@ -9,8 +49,37 @@ android {
         prefab = true
     }
 
-    externalNativeBuild.ndkBuild {
-        path("src/Android.mk")
+    externalNativeBuild.cmake {
+        path("src/CMakeLists.txt")
+        buildStagingDirectory = layout.buildDirectory.get().asFile
+    }
+
+    defaultConfig {
+        externalNativeBuild.cmake {
+            arguments += "-DANDROID_STL=none"
+            arguments += "-DLSPLT_STANDALONE=ON"
+            arguments += "-DCMAKE_BUILD_PARALLEL_LEVEL=${Runtime.getRuntime().availableProcessors()}"
+            cFlags("-std=c18", *defaultCFlags)
+            cppFlags("-std=c++20", *defaultCFlags)
+            ccachePath?.let {
+                arguments += "-DNDK_CCACHE=$it"
+            }
+        }
+    }
+
+    buildTypes {
+        debug {
+            externalNativeBuild.cmake {
+                arguments += "-DZKSU_VERSION=$verName-$verCode-$commitHash-debug"
+            }
+        }
+        release {
+            externalNativeBuild.cmake {
+                cFlags += releaseFlags
+                cppFlags += releaseFlags
+                arguments += "-DZKSU_VERSION=$verName-$verCode-$commitHash-release"
+            }
+        }
     }
 }
 

loader/src/Android.mk

@@ -1,35 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-define walk
-  $(wildcard $(1)) $(foreach e, $(wildcard $(1)/*), $(call walk, $(e)))
-endef
-
-include $(CLEAR_VARS)
-LOCAL_MODULE           := common
-LOCAL_C_INCLUDES       := $(LOCAL_PATH)/include
-FILE_LIST              := $(filter %.cpp, $(call walk, $(LOCAL_PATH)/common))
-LOCAL_SRC_FILES        := $(FILE_LIST:COMMON_FILE_LIST:$(LOCAL_PATH)/%=%)
-LOCAL_STATIC_LIBRARIES := cxx
-LOCAL_LDLIBS           := -llog
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE           := zygisk_loader
-LOCAL_C_INCLUDES       := $(LOCAL_PATH)/include
-FILE_LIST              := $(filter %.cpp, $(call walk, $(LOCAL_PATH)/loader))
-LOCAL_SRC_FILES        := $(FILE_LIST:COMMON_FILE_LIST:$(LOCAL_PATH)/%=%)
-LOCAL_STATIC_LIBRARIES := cxx common
-LOCAL_LDLIBS           := -llog
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE           := zygisk_injector
-LOCAL_C_INCLUDES       := $(LOCAL_PATH)/include
-FILE_LIST              := $(filter %.cpp, $(call walk, $(LOCAL_PATH)/injector))
-LOCAL_SRC_FILES        := $(FILE_LIST:COMMON_FILE_LIST:$(LOCAL_PATH)/%=%)
-LOCAL_STATIC_LIBRARIES := cxx common liblsplt libphmap
-LOCAL_LDLIBS           := -llog
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,prefab/cxx)
-
-include src/external/Android.mk

loader/src/Application.mk

@@ -1,14 +0,0 @@
-APP_CFLAGS     := -Wall -Wextra
-APP_CFLAGS     += -fno-stack-protector -fomit-frame-pointer
-APP_CFLAGS     += -Wno-builtin-macro-redefined -D__FILE__=__FILE_NAME__
-APP_CPPFLAGS   := -std=c++20
-APP_CONLYFLAGS := -std=c18
-APP_STL        := none
-
-ifneq ($(NDK_DEBUG),1)
-APP_CFLAGS     += -Oz -flto
-APP_CFLAGS     += -Wno-unused -Wno-unused-parameter
-APP_CFLAGS     += -fvisibility=hidden -fvisibility-inlines-hidden
-APP_CFLAGS     += -fno-unwind-tables -fno-asynchronous-unwind-tables
-APP_LDFLAGS    += -Wl,--exclude-libs,ALL -flto -Wl,--gc-sections -Wl,--strip-all
-endif

loader/src/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.22.1)
+project("loader")
+
+find_package(cxx REQUIRED CONFIG)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+add_definitions(-DZKSU_VERSION=\"${ZKSU_VERSION}\")
+
+aux_source_directory(common COMMON_SRC_LIST)
+add_library(common STATIC ${COMMON_SRC_LIST})
+target_include_directories(common PRIVATE include)
+target_link_libraries(common log)
+
+aux_source_directory(injector INJECTOR_SRC_LIST)
+add_library(zygisk SHARED ${INJECTOR_SRC_LIST})
+target_include_directories(zygisk PRIVATE include)
+target_link_libraries(zygisk cxx::cxx log common lsplt_static phmap)
+
+aux_source_directory(ptracer PTRACER_SRC_LIST)
+add_executable(libzygisk_ptrace.so ${PTRACER_SRC_LIST})
+target_include_directories(libzygisk_ptrace.so PRIVATE include)
+target_link_libraries(libzygisk_ptrace.so log common)
+add_subdirectory(external)

loader/src/common/daemon.c

@@ -0,0 +1,361 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <sys/socket.h>
+
+#include <linux/un.h>
+
+#include "logging.h"
+#include "socket_utils.h"
+
+#include "daemon.h"
+
+int rezygiskd_connect(uint8_t retry) {
+  retry++;
+
+  int fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+  if (fd == -1) {
+    PLOGE("socket create");
+
+    return -1;
+  }
+
+  struct sockaddr_un addr = {
+    .sun_family = AF_UNIX,
+    .sun_path = { 0 }
+  };
+
+  /* 
+    INFO: Application must assume that sun_path can hold _POSIX_PATH_MAX characters.
+
+    Sources:
+     - https://pubs.opengroup.org/onlinepubs/009696699/basedefs/sys/un.h.html
+  */
+  strcpy(addr.sun_path, TMP_PATH "/" SOCKET_FILE_NAME);
+  socklen_t socklen = sizeof(addr);
+
+  while (--retry) {
+    int ret = connect(fd, (struct sockaddr *)&addr, socklen);
+    if (ret == 0) return fd;
+    if (retry) {
+      PLOGE("Retrying to connect to ReZygiskd, sleep 1s");
+
+      sleep(1);
+    }
+  }
+
+  close(fd);
+
+  return -1;
+}
+
+bool rezygiskd_ping() {
+  int fd = rezygiskd_connect(5);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    return false;
+  }
+
+  write_uint8_t(fd, (uint8_t)PingHeartbeat);
+
+  close(fd);
+
+  return true;
+}
+
+uint32_t rezygiskd_get_process_flags(uid_t uid, const char *const process) {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    return 0;
+  }
+
+  write_uint8_t(fd, (uint8_t)GetProcessFlags);
+  write_uint32_t(fd, (uint32_t)uid);
+  write_string(fd, process);
+
+  uint32_t res = 0;
+  read_uint32_t(fd, &res);
+
+  close(fd);
+
+  return res;
+}
+
+void rezygiskd_get_info(struct rezygisk_info *info) {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    info->running = false;
+
+    return;
+  }
+
+  info->running = true;
+
+  write_uint8_t(fd, (uint8_t)GetInfo);
+
+  uint32_t flags = 0;
+  read_uint32_t(fd, &flags);
+
+  if (flags & (1 << 27)) info->root_impl = ROOT_IMPL_APATCH;
+  else if (flags & (1 << 29)) info->root_impl = ROOT_IMPL_KERNELSU;
+  else if (flags & (1 << 30)) info->root_impl = ROOT_IMPL_MAGISK;
+  else info->root_impl = ROOT_IMPL_NONE;
+
+  read_uint32_t(fd, (uint32_t *)&info->pid);
+
+  read_size_t(fd, &info->modules->modules_count);
+  if (info->modules->modules_count == 0) {
+    info->modules->modules = NULL;
+
+    close(fd);
+
+    return;
+  }
+
+  info->modules->modules = (char **)malloc(sizeof(char *) * info->modules->modules_count);
+  if (info->modules->modules == NULL) {
+    PLOGE("allocating modules name memory");
+
+    free(info->modules);
+    info->modules = NULL;
+    info->modules->modules_count = 0;
+
+    close(fd);
+
+    return;
+  }
+
+  for (size_t i = 0; i < info->modules->modules_count; i++) {
+    char *module_name = read_string(fd);
+    if (module_name == NULL) {
+      PLOGE("reading module name");
+
+      info->modules->modules_count = i;
+
+      free_rezygisk_info(info);
+
+      info->modules = NULL;
+      info->modules->modules_count = 0;
+
+      close(fd);
+
+      return;
+    }
+
+    char module_path[PATH_MAX];
+    snprintf(module_path, sizeof(module_path), "/data/adb/modules/%s/module.prop", module_name);
+
+    free(module_name);
+
+    FILE *module_prop = fopen(module_path, "r");
+    if (!module_prop) {
+      PLOGE("failed to open module prop file %s", module_path);
+
+      info->modules->modules_count = i;
+
+      free_rezygisk_info(info);
+
+      info->modules = NULL;
+      info->modules->modules_count = 0;
+
+      close(fd);
+
+      return;
+    }
+
+    char line[1024];
+    while (fgets(line, sizeof(line), module_prop) != NULL) {
+      if (strncmp(line, "name=", strlen("name=")) != 0) continue;
+
+      info->modules->modules[i] = strndup(line + 5, strlen(line) - 6);
+
+      break;
+    }
+
+    fclose(module_prop);
+  }
+
+  close(fd);
+}
+
+void free_rezygisk_info(struct rezygisk_info *info) {
+  if (info->modules->modules) {
+    for (size_t i = 0; i < info->modules->modules_count; i++) {
+      free(info->modules->modules[i]);
+    }
+
+    free(info->modules->modules);
+  }
+
+  free(info->modules);
+}
+
+bool rezygiskd_read_modules(struct zygisk_modules *modules) {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    return false;
+  }
+
+  write_uint8_t(fd, (uint8_t)ReadModules);
+
+  size_t len = 0;
+  read_size_t(fd, &len);
+
+  modules->modules = malloc(len * sizeof(char *));
+  if (!modules->modules) {
+    PLOGE("allocating modules name memory");
+
+    close(fd);
+
+    return false;
+  }
+  modules->modules_count = len;
+
+  for (size_t i = 0; i < len; i++) {
+    char *lib_path = read_string(fd);
+    if (!lib_path) {
+      PLOGE("reading module lib_path");
+
+      close(fd);
+
+      return false;
+    }
+
+    modules->modules[i] = lib_path;
+  }
+
+  close(fd);
+
+  return true;
+}
+
+void free_modules(struct zygisk_modules *modules) {
+  if (modules->modules) {
+    for (size_t i = 0; i < modules->modules_count; i++) {
+      free(modules->modules[i]);
+    }
+
+    free(modules->modules);
+  }
+}
+
+int rezygiskd_connect_companion(size_t index) {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    return -1;
+  }
+
+  write_uint8_t(fd, (uint8_t)RequestCompanionSocket);
+  write_size_t(fd, index);
+
+  uint8_t res = 0;
+  read_uint8_t(fd, &res);
+
+  if (res == 1) return fd;
+  else {
+    close(fd);
+
+    return -1;
+  }
+}
+
+int rezygiskd_get_module_dir(size_t index) {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    return -1;
+  }
+
+  write_uint8_t(fd, (uint8_t)GetModuleDir);
+  write_size_t(fd, index);
+
+  int dirfd = read_fd(fd);
+
+  close(fd);
+
+  return dirfd;
+}
+
+void rezygiskd_zygote_restart() {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    if (errno == ENOENT) LOGD("Could not notify ZygoteRestart (maybe it hasn't been created)");
+    else PLOGE("Could not notify ZygoteRestart");
+
+    return;
+  }
+
+  if (!write_uint8_t(fd, (uint8_t)ZygoteRestart))
+    PLOGE("Failed to request ZygoteRestart");
+
+  close(fd);
+}
+
+void rezygiskd_system_server_started() {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("Failed to report system server started");
+
+    return;
+  }
+
+  if (!write_uint8_t(fd, (uint8_t)SystemServerStarted))
+    PLOGE("Failed to request SystemServerStarted");
+
+  close(fd);
+}
+
+bool rezygiskd_update_mns(enum mount_namespace_state nms_state, char *buf, size_t buf_size) {
+  int fd = rezygiskd_connect(1);
+  if (fd == -1) {
+    PLOGE("connection to ReZygiskd");
+
+    return false;
+  }
+
+  write_uint8_t(fd, (uint8_t)UpdateMountNamespace);
+  write_uint32_t(fd, (uint32_t)getpid());
+  write_uint8_t(fd, (uint8_t)nms_state);
+
+  uint32_t target_pid = 0;
+  if (read_uint32_t(fd, &target_pid) < 0) {
+    PLOGE("Failed to read target pid");
+
+    close(fd);
+
+    return false;
+  }
+
+  uint32_t target_fd = 0;
+  if (read_uint32_t(fd, &target_fd) < 0) {
+    PLOGE("Failed to read target fd");
+
+    close(fd);
+
+    return false;
+  }
+
+  if (target_fd == 0) {
+    LOGE("Failed to get target fd");
+
+    close(fd);
+
+    return false;
+  }
+
+  snprintf(buf, buf_size, "/proc/%u/fd/%u", target_pid, target_fd);
+
+  close(fd);
+
+  return true;
+}

loader/src/common/daemon.cpp

@@ -1,114 +0,0 @@
-#include <linux/un.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include "daemon.h"
-#include "dl.h"
-#include "socket_utils.h"
-
-namespace zygiskd {
-
-    int Connect(uint8_t retry) {
-        int fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-        struct sockaddr_un addr{
-                .sun_family = AF_UNIX,
-                .sun_path={0},
-        };
-        strncpy(addr.sun_path + 1, kZygiskSocket.data(), kZygiskSocket.size());
-        socklen_t socklen = sizeof(sa_family_t) + strlen(addr.sun_path + 1) + 1;
-
-        while (retry--) {
-            int r = connect(fd, reinterpret_cast<struct sockaddr*>(&addr), socklen);
-            if (r == 0) return fd;
-            LOGW("retrying to connect to zygiskd, sleep 1s");
-            sleep(1);
-        }
-
-        close(fd);
-        return -1;
-    }
-
-    bool PingHeartbeat() {
-        UniqueFd fd = Connect(5);
-        if (fd == -1) {
-            PLOGE("Connect to zygiskd");
-            return false;
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::PingHeartBeat);
-        return true;
-    }
-
-    int RequestLogcatFd() {
-        int fd = Connect(1);
-        if (fd == -1) {
-            PLOGE("RequestLogcatFd");
-            return -1;
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::RequestLogcatFd);
-        return fd;
-    }
-
-    std::string ReadNativeBridge() {
-        UniqueFd fd = Connect(1);
-        if (fd == -1) {
-            PLOGE("ReadNativeBridge");
-            return "";
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::ReadNativeBridge);
-        return socket_utils::read_string(fd);
-    }
-
-    uint32_t GetProcessFlags(uid_t uid) {
-        UniqueFd fd = Connect(1);
-        if (fd == -1) {
-            PLOGE("GetProcessFlags");
-            return 0;
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::GetProcessFlags);
-        socket_utils::write_u32(fd, uid);
-        return socket_utils::read_u32(fd);
-    }
-
-    std::vector<Module> ReadModules() {
-        std::vector<Module> modules;
-        UniqueFd fd = Connect(1);
-        if (fd == -1) {
-            PLOGE("ReadModules");
-            return modules;
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::ReadModules);
-        size_t len = socket_utils::read_usize(fd);
-        for (size_t i = 0; i < len; i++) {
-            std::string name = socket_utils::read_string(fd);
-            int module_fd = socket_utils::recv_fd(fd);
-            modules.emplace_back(name, module_fd);
-        }
-        return modules;
-    }
-
-    int ConnectCompanion(size_t index) {
-        int fd = Connect(1);
-        if (fd == -1) {
-            PLOGE("ConnectCompanion");
-            return -1;
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::RequestCompanionSocket);
-        socket_utils::write_usize(fd, index);
-        if (socket_utils::read_u8(fd) == 1) {
-            return fd;
-        } else {
-            return -1;
-        }
-    }
-
-    int GetModuleDir(size_t index) {
-        int fd = Connect(1);
-        if (fd == -1) {
-            PLOGE("GetModuleDir");
-            return -1;
-        }
-        socket_utils::write_u8(fd, (uint8_t) SocketAction::GetModuleDir);
-        socket_utils::write_usize(fd, index);
-        return socket_utils::recv_fd(fd);
-    }
-}

loader/src/common/dl.cpp

@@ -1,51 +0,0 @@
-#include <cstdio>
-#include <dlfcn.h>
-#include <libgen.h>
-#include <climits>
-#include <cstring>
-#include <android/dlext.h>
-
-#include "dl.h"
-#include "logging.h"
-
-extern "C" [[gnu::weak]] struct android_namespace_t*
-//NOLINTNEXTLINE
-__loader_android_create_namespace([[maybe_unused]] const char* name,
-                                  [[maybe_unused]] const char* ld_library_path,
-                                  [[maybe_unused]] const char* default_library_path,
-                                  [[maybe_unused]] uint64_t type,
-                                  [[maybe_unused]] const char* permitted_when_isolated_path,
-                                  [[maybe_unused]] android_namespace_t* parent,
-                                  [[maybe_unused]] const void* caller_addr);
-
-void* DlopenExt(const char* path, int flags) {
-    auto info = android_dlextinfo{};
-    auto* dir = dirname(path);
-    auto* ns = &__loader_android_create_namespace == nullptr ? nullptr :
-               __loader_android_create_namespace(path, dir, nullptr,
-                                                 2, /* ANDROID_NAMESPACE_TYPE_SHARED */
-                                                 nullptr, nullptr,
-                                                 reinterpret_cast<void*>(&DlopenExt));
-    if (ns) {
-        info.flags = ANDROID_DLEXT_USE_NAMESPACE;
-        info.library_namespace = ns;
-
-        LOGD("Open %s with namespace %p", path, ns);
-    } else {
-        LOGD("Cannot create namespace for %s", path);
-    }
-
-    auto* handle = android_dlopen_ext(path, flags, &info);
-    if (handle) {
-        LOGD("dlopen %s: %p", path, handle);
-    } else {
-        LOGE("dlopen %s: %s", path, dlerror());
-    }
-    return handle;
-}
-
-void* DlopenMem(int memfd, int flags) {
-    char path[PATH_MAX];
-    sprintf(path, "/proc/self/fd/%d", memfd);
-    return DlopenExt(path, flags);
-}

loader/src/common/elf_util.c

@@ -0,0 +1,712 @@
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+#include <unistd.h>
+
+#ifdef __LP64__
+  #define LOG_TAG "zygisk-elfutil64"
+#else
+  #define LOG_TAG "zygisk-elfutil32"
+#endif
+
+#include "logging.h"
+
+#include "elf_util.h"
+
+#define SHT_GNU_HASH 0x6ffffff6
+
+uint32_t ElfHash(const char *name) {
+  uint32_t h = 0, g = 0;
+
+  while (*name) {
+    h = (h << 4) + (unsigned char)*name++;
+    g = h & 0xf0000000;
+
+    if (g) {
+      h ^= g >> 24;
+    }
+
+    h &= ~g;
+  }
+
+  return h;
+}
+
+uint32_t GnuHash(const char *name) {
+  uint32_t h = 5381;
+
+  while (*name) {
+    h = (h << 5) + h + (unsigned char)(*name++);
+  }
+
+  return h;
+}
+
+ElfW(Shdr) *offsetOf_Shdr(ElfW(Ehdr) *head, ElfW(Off) off) {
+  return (ElfW(Shdr) *)(((uintptr_t)head) + off);
+}
+
+char *offsetOf_char(ElfW(Ehdr) *head, ElfW(Off) off) {
+  return (char *)(((uintptr_t)head) + off);
+}
+
+ElfW(Sym) *offsetOf_Sym(ElfW(Ehdr) *head, ElfW(Off) off) {
+  return (ElfW(Sym) *)(((uintptr_t)head) + off);
+}
+
+ElfW(Word) *offsetOf_Word(ElfW(Ehdr) *head, ElfW(Off) off) {
+  return (ElfW(Word) *)(((uintptr_t)head) + off);
+}
+
+int dl_cb(struct dl_phdr_info *info, size_t size, void *data) {
+  (void) size;
+
+  if (info->dlpi_name == NULL)
+    return 0;
+
+  ElfImg *img = (ElfImg *)data;
+
+  if (strstr(info->dlpi_name, img->elf)) {
+    img->base = (void *)info->dlpi_addr;
+
+    return 1;
+  }
+
+  return 0;
+}
+
+bool _find_module_base(ElfImg *img) {
+  dl_iterate_phdr(dl_cb, img);
+
+  return img->base != NULL;
+}
+
+size_t calculate_valid_symtabs_amount(ElfImg *img) {
+  size_t count = 0;
+
+  if (img->symtab_start == NULL || img->symstr_offset_for_symtab == 0) {
+    LOGE("Invalid symtab_start or symstr_offset_for_symtab, cannot count valid symbols");
+
+    return 0;
+  }
+
+  char *symtab_strings = offsetOf_char(img->header, img->symstr_offset_for_symtab);
+
+  for (ElfW(Off) i = 0; i < img->symtab_count; i++) {
+    const char *sym_name = symtab_strings + img->symtab_start[i].st_name;
+    if (!sym_name)
+      continue;
+
+    unsigned int st_type = ELF_ST_TYPE(img->symtab_start[i].st_info);
+
+    if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[i].st_size > 0 && img->symtab_start[i].st_name != 0)
+      count++;
+  }
+
+  return count;
+}
+
+
+void ElfImg_destroy(ElfImg *img) {
+  if (!img) return;
+
+  if (img->symtabs_) {
+    size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
+    if (valid_symtabs_amount > 0) {
+      for (size_t i = 0; i < valid_symtabs_amount; i++) {
+        free(img->symtabs_[i].name);
+      }
+    }
+
+    free(img->symtabs_);
+    img->symtabs_ = NULL;
+  }
+
+  if (img->elf) {
+    free(img->elf);
+    img->elf = NULL;
+  }
+
+  if (img->header) {
+    munmap(img->header, img->size);
+    img->header = NULL;
+  }
+
+  free(img);
+}
+
+
+ElfImg *ElfImg_create(const char *elf, void *base) {
+  ElfImg *img = (ElfImg *)calloc(1, sizeof(ElfImg));
+  if (!img) {
+    LOGE("Failed to allocate memory for ElfImg");
+
+    return NULL;
+  }
+
+  img->elf = strdup(elf);
+  if (!img->elf) {
+    LOGE("Failed to duplicate elf path string");
+
+    free(img);
+
+    return NULL;
+  }
+
+  if (base) {
+    /* LOGI: Due to the use in zygisk-ptracer, we need to allow pre-
+              fetched bases to be passed, as the linker (Android 7.1
+              and below) is not loaded from dlopen, which makes it not
+              be visible with dl_iterate_phdr.
+    */
+    img->base = base;
+
+    LOGI("Using provided base address 0x%p for %s", base, elf);
+  } else {
+    if (!_find_module_base(img)) {
+      LOGE("Failed to find module base for %s using dl_iterate_phdr", elf);
+
+      ElfImg_destroy(img);
+
+      return NULL;
+    }
+  }
+
+  int fd = open(elf, O_RDONLY | O_CLOEXEC);
+  if (fd < 0) {
+    LOGE("failed to open %s", elf);
+
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  struct stat st;
+  if (fstat(fd, &st) != 0) {
+    LOGE("fstat() failed for %s", elf);
+
+    close(fd);
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  img->size = st.st_size;
+
+  if (img->size <= sizeof(ElfW(Ehdr))) {
+    LOGE("Invalid file size %zu for %s", img->size, elf);
+
+    close(fd);
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  img->header = (ElfW(Ehdr) *)mmap(NULL, img->size, PROT_READ, MAP_PRIVATE, fd, 0);
+
+  close(fd);
+
+  if (img->header == MAP_FAILED) {
+    LOGE("mmap() failed for %s", elf);
+
+    img->header = NULL;
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  if (memcmp(img->header->e_ident, ELFMAG, SELFMAG) != 0) {
+    LOGE("Invalid ELF header for %s", elf);
+
+    ElfImg_destroy(img);
+
+    return NULL;
+  }
+
+  if (img->header->e_shoff == 0 || img->header->e_shentsize == 0 || img->header->e_shnum == 0) {
+    LOGW("Section header table missing or invalid in %s", elf);
+  } else {
+    img->section_header = offsetOf_Shdr(img->header, img->header->e_shoff);
+  }
+
+  if (img->header->e_phoff == 0 || img->header->e_phentsize == 0 || img->header->e_phnum == 0) {
+    LOGW("Program header table missing or invalid in %s", elf);
+  }
+
+  ElfW(Shdr) *dynsym_shdr = NULL;
+  ElfW(Shdr) *symtab_shdr = NULL;
+
+  char *section_str = NULL;
+  if (img->section_header && img->header->e_shstrndx != SHN_UNDEF) {
+    if (img->header->e_shstrndx < img->header->e_shnum) {
+      ElfW(Shdr) *shstrtab_hdr = img->section_header + img->header->e_shstrndx;
+      section_str = offsetOf_char(img->header, shstrtab_hdr->sh_offset);
+    } else {
+      LOGW("Section header string table index (%u) out of bounds (%u)", img->header->e_shstrndx, img->header->e_shnum);
+    }
+  } else {
+    LOGW("Section header string table index not set or no section headers");
+  }
+
+  if (img->section_header) {
+    uintptr_t shoff = (uintptr_t)img->section_header;
+    for (int i = 0; i < img->header->e_shnum; i++, shoff += img->header->e_shentsize) {
+      ElfW(Shdr) *section_h = (ElfW(Shdr *))shoff;
+      char *sname = section_str ? (section_h->sh_name + section_str) : "<?>";
+      size_t entsize = section_h->sh_entsize;
+
+      switch (section_h->sh_type) {
+        case SHT_DYNSYM: {
+          dynsym_shdr = section_h;
+          img->dynsym_offset = section_h->sh_offset;
+          img->dynsym_start = offsetOf_Sym(img->header, img->dynsym_offset);
+
+          break;
+        }
+        case SHT_SYMTAB: {
+          if (strcmp(sname, ".symtab") == 0) {
+            symtab_shdr = section_h;
+            img->symtab_offset = section_h->sh_offset;
+            img->symtab_size = section_h->sh_size;
+
+            if (entsize > 0) img->symtab_count = img->symtab_size / entsize;
+            else {
+              LOGW("Section %s has zero sh_entsize", sname);
+              img->symtab_count = 0;
+            }
+
+            img->symtab_start = offsetOf_Sym(img->header, img->symtab_offset);
+          }
+
+          break;
+        }
+        case SHT_STRTAB: break;
+        case SHT_PROGBITS: break;
+        case SHT_HASH: {
+          ElfW(Word) *d_un = offsetOf_Word(img->header, section_h->sh_offset);
+
+          if (section_h->sh_size >= 2 * sizeof(ElfW(Word))) {
+            img->nbucket_ = d_un[0];
+
+            if (img->nbucket_ > 0 && section_h->sh_size >= (2 + img->nbucket_ + d_un[1]) * sizeof(ElfW(Word))) {
+              img->bucket_ = d_un + 2;
+              img->chain_ = img->bucket_ + img->nbucket_;
+            } else {
+              LOGW("Invalid SHT_HASH size or nbucket count in section %s", sname);
+              img->nbucket_ = 0;
+            }
+          } else {
+            LOGW("SHT_HASH section %s too small", sname);
+          }
+
+          break;
+        }
+        case SHT_GNU_HASH: {
+          ElfW(Word) *d_buf = offsetOf_Word(img->header, section_h->sh_offset);
+
+          if (section_h->sh_size >= 4 * sizeof(ElfW(Word))) {
+            img->gnu_nbucket_ = d_buf[0];
+            img->gnu_symndx_ = d_buf[1];
+            img->gnu_bloom_size_ = d_buf[2];
+            img->gnu_shift2_ = d_buf[3];
+
+            size_t expected_min_size = 4 * sizeof(ElfW(Word)) +
+                                      img->gnu_bloom_size_ * sizeof(uintptr_t) +
+                                      img->gnu_nbucket_ * sizeof(uint32_t);
+
+            if (img->gnu_nbucket_ > 0 && img->gnu_bloom_size_ > 0 && section_h->sh_size >= expected_min_size) {
+              img->gnu_bloom_filter_ = (uintptr_t *)(d_buf + 4);
+              img->gnu_bucket_ = (uint32_t *)(img->gnu_bloom_filter_ + img->gnu_bloom_size_);
+              img->gnu_chain_ = img->gnu_bucket_ + img->gnu_nbucket_;
+
+              uintptr_t chain_start_offset = (uintptr_t)img->gnu_chain_ - (uintptr_t)img->header;
+              if (chain_start_offset < section_h->sh_offset || chain_start_offset >= section_h->sh_offset + section_h->sh_size) {
+                LOGW("Calculated GNU hash chain seems out of bounds for section %s", sname);
+
+                img->gnu_nbucket_ = 0;
+              }
+            } else {
+              LOGW("Invalid SHT_GNU_HASH size or parameters in section %s", sname);
+
+              img->gnu_nbucket_ = 0;
+            }
+          } else {
+            LOGW("SHT_GNU_HASH section %s too small", sname);
+          }
+
+          break;
+        }
+      }
+    }
+  }
+
+  ElfW(Shdr) *shdr_base = img->section_header;
+
+  if (dynsym_shdr && shdr_base) {
+    img->dynsym = dynsym_shdr;
+
+    if (dynsym_shdr->sh_link < img->header->e_shnum) {
+      ElfW(Shdr) *linked_strtab = shdr_base + dynsym_shdr->sh_link;
+
+      if (linked_strtab->sh_type == SHT_STRTAB) {
+        img->strtab = linked_strtab;
+        img->symstr_offset = linked_strtab->sh_offset;
+        img->strtab_start = (void *)offsetOf_char(img->header, img->symstr_offset);
+      } else {
+        LOGW("Section %u linked by .dynsym is not SHT_STRTAB (type %u)", dynsym_shdr->sh_link, linked_strtab->sh_type);
+      }
+    } else {
+      LOGE(".dynsym sh_link (%u) is out of bounds (%u)", dynsym_shdr->sh_link, img->header->e_shnum);
+    }
+  } else {
+    LOGW("No .dynsym section found or section headers missing");
+  }
+
+  if (symtab_shdr && shdr_base) {
+    img->symtab = symtab_shdr;
+
+    if (symtab_shdr->sh_link < img->header->e_shnum) {
+      ElfW(Shdr) *linked_strtab = shdr_base + symtab_shdr->sh_link;
+
+      if (linked_strtab->sh_type == SHT_STRTAB) {
+        /* INFO: For linear lookup */
+        img->symstr_offset_for_symtab = linked_strtab->sh_offset;
+      } else {
+        LOGW("Section %u linked by .symtab is not SHT_STRTAB (type %u)", symtab_shdr->sh_link, linked_strtab->sh_type);
+
+        img->symstr_offset_for_symtab = 0;
+      }
+    } else {
+      LOGE(".symtab sh_link (%u) is out of bounds (%u)", symtab_shdr->sh_link, img->header->e_shnum);
+
+      img->symstr_offset_for_symtab = 0;
+    }
+  } else {
+    LOGI("No .symtab section found or section headers missing");
+
+    img->symtab_start = NULL;
+    img->symtab_count = 0;
+    img->symstr_offset_for_symtab = 0;
+  }
+
+  bool bias_calculated = false;
+  if (img->header->e_phoff > 0 && img->header->e_phnum > 0) {
+    ElfW(Phdr) *phdr = (ElfW(Phdr) *)((uintptr_t)img->header + img->header->e_phoff);
+
+    for (int i = 0; i < img->header->e_phnum; ++i) {
+      if (phdr[i].p_type == PT_LOAD && phdr[i].p_offset == 0) {
+        img->bias = phdr[i].p_vaddr - phdr[i].p_offset;
+        bias_calculated = true;
+
+        LOGI("Calculated bias %ld from PT_LOAD segment %d (vaddr %lx)", (long)img->bias, i, (unsigned long)phdr[i].p_vaddr);
+
+        break;
+      }
+    }
+
+    if (!bias_calculated) {
+      for (int i = 0; i < img->header->e_phnum; ++i) {
+        if (phdr[i].p_type == PT_LOAD) {
+          img->bias = phdr[i].p_vaddr - phdr[i].p_offset;
+          bias_calculated = true;
+
+          LOGI("Calculated bias %ld from first PT_LOAD segment %d (vaddr %lx, offset %lx)",
+              (long)img->bias, i, (unsigned long)phdr[i].p_vaddr, (unsigned long)phdr[i].p_offset);
+
+          break;
+        }
+      }
+    }
+  }
+
+  if (!bias_calculated && shdr_base) {
+    LOGW("Could not calculate bias from program headers, falling back to section method.");
+    uintptr_t shoff_for_bias = (uintptr_t)shdr_base;
+    for (int i = 0; i < img->header->e_shnum; i++, shoff_for_bias += img->header->e_shentsize) {
+      ElfW(Shdr) *section_h = (ElfW(Shdr *))shoff_for_bias;
+
+      if ((section_h->sh_flags & SHF_ALLOC) && section_h->sh_addr != 0) {
+        img->bias = (off_t)section_h->sh_addr - (off_t)section_h->sh_offset;
+        bias_calculated = true;
+
+        char *sname = section_str ? (section_h->sh_name + section_str) : "<?>";
+        LOGI("Calculated bias %ld from first allocated section %s (addr %lx, offset %lx)",
+              (long)img->bias, sname, (unsigned long)section_h->sh_addr, (unsigned long)section_h->sh_offset);
+
+        break;
+      }
+    }
+  }
+
+  if (!bias_calculated)
+    LOGE("Failed to calculate bias for %s. Assuming bias is 0.", elf);
+
+  if (!img->dynsym_start || !img->strtab_start) {
+    if (img->header->e_type == ET_DYN) LOGE("Failed to find .dynsym or its string table (.dynstr) in %s", elf);
+    else LOGW("No .dynsym or .dynstr found in %s (might be expected for ET_EXEC)", elf);
+  }
+
+  if (!img->gnu_bucket_ && !img->bucket_)
+    LOGW("No hash table (.gnu.hash or .hash) found in %s. Dynamic symbol lookup might be slow or fail.", elf);
+
+  return img;
+}
+
+bool _load_symtabs(ElfImg *img) {
+  if (img->symtabs_) return true;
+
+  if (!img->symtab_start || img->symstr_offset_for_symtab == 0 || img->symtab_count == 0) {
+    LOGE("Cannot load symtabs: .symtab section or its string table not found/valid.");
+
+    return false;
+  }
+
+  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
+  if (valid_symtabs_amount == 0) {
+    LOGW("No valid symbols (FUNC/OBJECT with size > 0) found in .symtab for %s", img->elf);
+
+    return false;
+  }
+
+  img->symtabs_ = (struct symtabs *)calloc(valid_symtabs_amount, sizeof(struct symtabs));
+  if (!img->symtabs_) {
+    LOGE("Failed to allocate memory for symtabs array");
+
+    return false;
+  }
+
+  char *symtab_strings = offsetOf_char(img->header, img->symstr_offset_for_symtab);
+  size_t current_valid_index = 0;
+
+  for (ElfW(Off) pos = 0; pos < img->symtab_count; pos++) {
+    ElfW(Sym) *current_sym = &img->symtab_start[pos];
+    unsigned int st_type = ELF_ST_TYPE(current_sym->st_info);
+
+    if ((st_type == STT_FUNC || st_type == STT_OBJECT) && current_sym->st_size > 0 && current_sym->st_name != 0) {
+      const char *st_name = symtab_strings + current_sym->st_name;
+      if (!st_name)
+        continue;
+
+      ElfW(Shdr) *symtab_str_shdr = img->section_header + img->symtab->sh_link;
+      if (current_sym->st_name >= symtab_str_shdr->sh_size) {
+        LOGE("Symbol name offset out of bounds");
+
+        continue;
+      }
+
+      img->symtabs_[current_valid_index].name = strdup(st_name);
+      if (!img->symtabs_[current_valid_index].name) {
+        LOGE("Failed to duplicate symbol name: %s", st_name);
+
+        for(size_t k = 0; k < current_valid_index; ++k) {
+          free(img->symtabs_[k].name);
+        }
+
+        free(img->symtabs_);
+        img->symtabs_ = NULL;
+
+        return false;
+      }
+
+      img->symtabs_[current_valid_index].sym = current_sym;
+
+      current_valid_index++;
+      if (current_valid_index == valid_symtabs_amount) break;
+    }
+  }
+
+  return true;
+}
+
+ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *name, uint32_t hash) {
+  if (img->gnu_nbucket_ == 0 || img->gnu_bloom_size_ == 0 || !img->gnu_bloom_filter_ || !img->gnu_bucket_ || !img->gnu_chain_ || !img->dynsym_start || !img->strtab_start)
+    return 0;
+
+  static const size_t bloom_mask_bits = sizeof(uintptr_t) * 8;
+
+  size_t bloom_idx = (hash / bloom_mask_bits) % img->gnu_bloom_size_;
+  uintptr_t bloom_word = img->gnu_bloom_filter_[bloom_idx];
+  uintptr_t mask = ((uintptr_t)1 << (hash % bloom_mask_bits)) |
+                   ((uintptr_t)1 << ((hash >> img->gnu_shift2_) % bloom_mask_bits));
+
+  if ((mask & bloom_word) != mask) {
+    LOGE("Symbol '%s' (hash %u) filtered out by GNU Bloom Filter (idx %zu, mask 0x%lx, word 0x%lx)",
+         name, hash, bloom_idx, (unsigned long)mask, (unsigned long)bloom_word);
+
+    return 0;
+  }
+
+  uint32_t sym_index = img->gnu_bucket_[hash % img->gnu_nbucket_];
+  if (sym_index < img->gnu_symndx_) {
+    LOGI("Symbol %s hash %u maps to bucket %u index %u (below gnu_symndx %u), not exported?", name, hash, hash % img->gnu_nbucket_, sym_index, img->gnu_symndx_);
+
+    return 0;
+  }
+
+  char *strings = (char *)img->strtab_start;
+  uint32_t chain_val = img->gnu_chain_[sym_index - img->gnu_symndx_];
+
+  ElfW(Word) dynsym_count = img->dynsym->sh_size / img->dynsym->sh_entsize;
+  if (sym_index >= dynsym_count) {
+    LOGE("Symbol index %u out of bounds", sym_index);
+
+    return 0;
+  }
+
+  ElfW(Sym) *sym = img->dynsym_start + sym_index;
+
+  if (sym->st_name >= img->strtab->sh_size) {
+    LOGE("Symbol name offset %u out of bounds", sym->st_name);
+
+    return 0;
+  }
+
+  if ((((chain_val ^ hash) >> 1) == 0 && strcmp(name, strings + sym->st_name) == 0) && sym->st_shndx != SHN_UNDEF)
+    return sym->st_value;
+
+  while ((chain_val & 1) == 0) {
+    sym_index++;
+
+    if (sym_index >= dynsym_count) {
+      LOGE("Symbol index %u out of bounds during chain walk", sym_index);
+
+      return 0;
+    }
+
+    chain_val = img->gnu_chain_[sym_index - img->gnu_symndx_];
+    sym = img->dynsym_start + sym_index;
+
+    if (sym->st_name >= img->strtab->sh_size) {
+      LOGE("Symbol name offset %u out of bounds", sym->st_name);
+
+      break;
+    }
+
+    if ((((chain_val ^ hash) >> 1) == 0 && strcmp(name, strings + sym->st_name) == 0) && sym->st_shndx != SHN_UNDEF)
+      return sym->st_value;
+  }
+
+  return 0;
+}
+
+ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash) {
+  if (img->nbucket_ == 0 || !img->bucket_ || !img->chain_ || !img->dynsym_start || !img->strtab_start)
+    return 0;
+
+  char *strings = (char *)img->strtab_start;
+
+  for (size_t n = img->bucket_[hash % img->nbucket_]; n != STN_UNDEF; n = img->chain_[n]) {
+    ElfW(Sym) *sym = img->dynsym_start + n;
+
+    if (strcmp(name, strings + sym->st_name) == 0 && sym->st_shndx != SHN_UNDEF)
+      return sym->st_value;
+  }
+
+  return 0;
+}
+
+ElfW(Addr) LinearLookup(ElfImg *img, const char *restrict name) {
+  if (!_load_symtabs(img)) {
+    LOGE("Failed to load symtabs for linear lookup of %s", name);
+
+    return 0;
+  }
+
+  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
+  if (valid_symtabs_amount == 0) {
+    LOGW("No valid symbols (FUNC/OBJECT with size > 0) found in .symtab for %s", img->elf);
+
+    return false;
+  }
+
+  for (size_t i = 0; i < valid_symtabs_amount; i++) {
+    if (!img->symtabs_[i].name || strcmp(name, img->symtabs_[i].name) != 0)
+      continue;
+
+    if (img->symtabs_[i].sym->st_shndx == SHN_UNDEF)
+      continue;
+
+    return img->symtabs_[i].sym->st_value;
+  }
+
+  return 0;
+}
+
+ElfW(Addr) LinearLookupByPrefix(ElfImg *img, const char *prefix) {
+  if (!_load_symtabs(img)) {
+    LOGE("Failed to load symtabs for linear lookup by prefix of %s", prefix);
+
+    return 0;
+  }
+
+  size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img);
+  if (valid_symtabs_amount == 0) {
+    LOGW("No valid symbols (FUNC/OBJECT with size > 0) found in .symtab for %s", img->elf);
+
+    return false;
+  }
+
+  size_t prefix_len = strlen(prefix);
+  if (prefix_len == 0) return 0;
+
+  for (size_t i = 0; i < valid_symtabs_amount; i++) {
+    if (!img->symtabs_[i].name || strlen(img->symtabs_[i].name) < prefix_len)
+      continue;
+
+    if (strncmp(img->symtabs_[i].name, prefix, prefix_len) != 0)
+      continue;
+
+    if (img->symtabs_[i].sym->st_shndx == SHN_UNDEF)
+      continue;
+
+    return img->symtabs_[i].sym->st_value;
+  }
+
+  return 0;
+}
+
+ElfW(Addr) getSymbOffset(ElfImg *img, const char *name) {
+  ElfW(Addr) offset = 0;
+
+  offset = GnuLookup(img, name, GnuHash(name));
+  if (offset != 0) return offset;
+
+  offset = ElfLookup(img, name, ElfHash(name));
+  if (offset != 0) return offset;
+
+  offset = LinearLookup(img, name);
+  if (offset != 0) return offset;
+
+  return 0;
+}
+
+ElfW(Addr) getSymbAddress(ElfImg *img, const char *name) {
+  ElfW(Addr) offset = getSymbOffset(img, name);
+
+  if (offset == 0 || !img->base) return 0;
+
+  ElfW(Addr) address = (ElfW(Addr))((uintptr_t)img->base + offset - img->bias);
+
+  return address;
+}
+
+ElfW(Addr) getSymbAddressByPrefix(ElfImg *img, const char *prefix) {
+  ElfW(Addr) offset = LinearLookupByPrefix(img, prefix);
+
+  if (offset == 0 || !img->base) return 0;
+
+  ElfW(Addr) address = (ElfW(Addr))((uintptr_t)img->base + offset - img->bias);
+
+  return address;
+}
+
+void *getSymbValueByPrefix(ElfImg *img, const char *prefix) {
+  ElfW(Addr) address = getSymbAddressByPrefix(img, prefix);
+
+  return address == 0 ? NULL : *((void **)address);
+}

loader/src/common/logging.cpp

@@ -1,36 +0,0 @@
-#include <android/log.h>
-#include <unistd.h>
-
-#include "logging.h"
-#include "socket_utils.h"
-
-namespace logging {
-    static int logfd = -1;
-
-    void setfd(int fd) {
-        close(logfd);
-        logfd = fd;
-    }
-
-    int getfd() {
-        return logfd;
-    }
-
-    void log(int prio, const char* tag, const char* fmt, ...) {
-        if (logfd == -1) {
-            va_list ap;
-            va_start(ap, fmt);
-            __android_log_vprint(prio, tag, fmt, ap);
-            va_end(ap);
-        } else {
-            char buf[BUFSIZ];
-            va_list ap;
-            va_start(ap, fmt);
-            vsnprintf(buf, sizeof(buf), fmt, ap);
-            va_end(ap);
-            socket_utils::write_u8(logfd, prio);
-            socket_utils::write_string(logfd, tag);
-            socket_utils::write_string(logfd, buf);
-        }
-    }
-}

loader/src/common/misc.c

@@ -0,0 +1,14 @@
+int parse_int(const char *str) {
+  int val = 0;
+
+  char *c = (char *)str;
+  while (*c) {
+    if (*c > '9' || *c < '0')
+      return -1;
+
+    val = val * 10 + *c - '0';
+    c++;
+  }
+
+  return val;
+}

loader/src/common/socket_utils.c

@@ -0,0 +1,114 @@
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/socket.h>
+
+#include <unistd.h>
+
+#include "logging.h"
+
+#include "socket_utils.h"
+
+/* TODO: Standardize how to log errors */
+int read_fd(int fd) {
+  char cmsgbuf[CMSG_SPACE(sizeof(int))];
+
+  int cnt = 1;
+  struct iovec iov = {
+    .iov_base = &cnt,
+    .iov_len = sizeof(cnt)
+  };
+
+  struct msghdr msg = {
+    .msg_iov = &iov,
+    .msg_iovlen = 1,
+    .msg_control = cmsgbuf,
+    .msg_controllen = sizeof(cmsgbuf)
+  };
+
+  ssize_t ret = recvmsg(fd, &msg, MSG_WAITALL);
+  if (ret == -1) {
+    PLOGE("recvmsg");
+
+    return -1;
+  }
+
+  struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+  if (cmsg == NULL) {
+    PLOGE("CMSG_FIRSTHDR");
+
+    return -1;
+  }
+
+  int sendfd;
+  memcpy(&sendfd, CMSG_DATA(cmsg), sizeof(int));
+
+  return sendfd;
+}
+
+ssize_t write_string(int fd, const char *str) {
+  size_t str_len = strlen(str);
+  ssize_t write_bytes = write(fd, &str_len, sizeof(size_t));
+  if (write_bytes != (ssize_t)sizeof(size_t)) {
+    LOGE("Failed to write string length: Not all bytes were written (%zd != %zu).\n", write_bytes, sizeof(size_t));
+
+    return -1;
+  }
+
+  write_bytes = write(fd, str, str_len);
+  if (write_bytes != (ssize_t)str_len) {
+    LOGE("Failed to write string: Promised bytes doesn't exist (%zd != %zu).\n", write_bytes, str_len);
+
+    return -1;
+  }
+
+  return write_bytes;
+}
+
+char *read_string(int fd) {
+  size_t str_len = 0;
+  ssize_t read_bytes = read(fd, &str_len, sizeof(size_t));
+  if (read_bytes != (ssize_t)sizeof(size_t)) {
+    LOGE("Failed to read string length: Not all bytes were read (%zd != %zu).\n", read_bytes, sizeof(size_t));
+
+    return NULL;
+  }
+
+  char *buf = malloc(str_len + 1);
+  if (buf == NULL) {
+    PLOGE("allocate memory for string");
+
+    return NULL;
+  }
+
+  read_bytes = read(fd, buf, str_len);
+  if (read_bytes != (ssize_t)str_len) {
+    LOGE("Failed to read string: Promised bytes doesn't exist (%zd != %zu).\n", read_bytes, str_len);
+
+    free(buf);
+
+    return NULL;
+  }
+
+  if (str_len > 0) buf[str_len] = '\0';
+
+  return buf;
+}
+
+#define write_func(type)                    \
+  ssize_t write_## type(int fd, type val) { \
+    return write(fd, &val, sizeof(type));   \
+  }
+
+#define read_func(type)                     \
+  ssize_t read_## type(int fd, type *val) { \
+    return read(fd, val, sizeof(type));     \
+  }
+
+write_func(uint8_t)
+read_func(uint8_t)
+
+write_func(uint32_t)
+read_func(uint32_t)
+
+write_func(size_t)
+read_func(size_t)

loader/src/common/socket_utils.cpp

@@ -1,135 +0,0 @@
-#include <cstddef>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include "socket_utils.h"
-
-namespace socket_utils {
-
-    ssize_t xread(int fd, void* buf, size_t count) {
-        size_t read_sz = 0;
-        ssize_t ret;
-        do {
-            ret = read(fd, (std::byte*) buf + read_sz, count - read_sz);
-            if (ret < 0) {
-                if (errno == EINTR) continue;
-                PLOGE("read");
-                return ret;
-            }
-            read_sz += ret;
-        } while (read_sz != count && ret != 0);
-        if (read_sz != count) {
-            PLOGE("read (%d != %d)", count, read_sz);
-        }
-        return read_sz;
-    }
-
-    ssize_t xwrite(int fd, const void* buf, size_t count) {
-        size_t write_sz = 0;
-        ssize_t ret;
-        do {
-            ret = write(fd, (std::byte*) buf + write_sz, count - write_sz);
-            if (ret < 0) {
-                if (errno == EINTR) continue;
-                PLOGE("write");
-                return ret;
-            }
-            write_sz += ret;
-        } while (write_sz != count && ret != 0);
-        if (write_sz != count) {
-            PLOGE("write (%d != %d)", count, write_sz);
-        }
-        return write_sz;
-    }
-
-    ssize_t xrecvmsg(int sockfd, struct msghdr* msg, int flags) {
-        int rec = recvmsg(sockfd, msg, flags);
-        if (rec < 0) PLOGE("recvmsg");
-        return rec;
-    }
-
-    void* recv_fds(int sockfd, char* cmsgbuf, size_t bufsz, int cnt) {
-        iovec iov = {
-                .iov_base = &cnt,
-                .iov_len  = sizeof(cnt),
-        };
-        msghdr msg = {
-                .msg_iov        = &iov,
-                .msg_iovlen     = 1,
-                .msg_control    = cmsgbuf,
-                .msg_controllen = bufsz
-        };
-
-        xrecvmsg(sockfd, &msg, MSG_WAITALL);
-        cmsghdr* cmsg = CMSG_FIRSTHDR(&msg);
-
-        if (msg.msg_controllen != bufsz ||
-            cmsg == nullptr ||
-            // TODO: pass from rust: 20, expected: 16
-            // cmsg->cmsg_len != CMSG_LEN(sizeof(int) * cnt) ||
-            cmsg->cmsg_level != SOL_SOCKET ||
-            cmsg->cmsg_type != SCM_RIGHTS) {
-            return nullptr;
-        }
-
-        return CMSG_DATA(cmsg);
-    }
-
-    template<typename T>
-    inline T read_exact_or(int fd, T fail) {
-        T res;
-        return sizeof(T) == xread(fd, &res, sizeof(T)) ? res : fail;
-    }
-
-    template<typename T>
-    inline bool write_exact(int fd, T val) {
-        return sizeof(T) == xwrite(fd, &val, sizeof(T));
-    }
-
-    uint8_t read_u8(int fd) {
-        return read_exact_or<uint8_t>(fd, 0);
-    }
-
-    uint32_t read_u32(int fd) {
-        return read_exact_or<uint32_t>(fd, 0);
-    }
-
-    size_t read_usize(int fd) {
-        return read_exact_or<size_t>(fd, 0);
-    }
-
-    bool write_usize(int fd, size_t val) {
-        return write_exact<size_t>(fd, val);
-    }
-
-    std::string read_string(int fd) {
-        auto len = read_usize(fd);
-        char buf[len + 1];
-        buf[len] = '\0';
-        xread(fd, buf, len);
-        return buf;
-    }
-
-    bool write_u8(int fd, uint8_t val) {
-        return write_exact<uint8_t>(fd, val);
-    }
-
-    bool write_u32(int fd, uint32_t val) {
-        return write_exact<uint32_t>(fd, val);
-    }
-
-    bool write_string(int fd, std::string_view str) {
-        return write_usize(fd, str.size()) && str.size() == xwrite(fd, str.data(), str.size());
-    }
-
-    int recv_fd(int sockfd) {
-        char cmsgbuf[CMSG_SPACE(sizeof(int))];
-
-        void* data = recv_fds(sockfd, cmsgbuf, sizeof(cmsgbuf), 1);
-        if (data == nullptr) return -1;
-
-        int result;
-        memcpy(&result, data, sizeof(int));
-        return result;
-    }
-}

loader/src/external/Android.mk

@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# liblsplt.a
-include $(CLEAR_VARS)
-LOCAL_MODULE:= liblsplt
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/liblsplt/lsplt/src/main/jni/include
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-LOCAL_CFLAGS := -Wall -Wextra -Werror -fvisibility=hidden
-LOCAL_CPPFLAGS := -std=c++20
-LOCAL_STATIC_LIBRARIES := libcxx
-LOCAL_SRC_FILES := \
-	liblsplt/lsplt/src/main/jni/elf_util.cc \
-	liblsplt/lsplt/src/main/jni/lsplt.cc
-include $(BUILD_STATIC_LIBRARY)
-
-# Header only library
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libphmap
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/parallel-hashmap
-include $(BUILD_STATIC_LIBRARY)

loader/src/external/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(external)
+
+OPTION(LSPLT_BUILD_SHARED OFF)
+add_subdirectory(lsplt/lsplt/src/main/jni)
+
+add_library(phmap INTERFACE)
+target_include_directories(phmap INTERFACE parallel-hashmap)
+target_compile_options(phmap INTERFACE -Wno-unused-value)

loader/src/include/api.hpp

@@ -26,14 +26,40 @@
 #define ZYGISK_API_VERSION 4
 
 /*
+
+***************
+* Introduction
+***************
+
+On Android, all app processes are forked from a special daemon called "Zygote".
+For each new app process, zygote will fork a new process and perform "specialization".
+This specialization operation enforces the Android security sandbox on the newly forked
+process to make sure that 3rd party application code is only loaded after it is being
+restricted within a sandbox.
+
+On Android, there is also this special process called "system_server". This single
+process hosts a significant portion of system services, which controls how the
+Android operating system and apps interact with each other.
+
+The Zygisk framework provides a way to allow developers to build modules and run custom
+code before and after system_server and any app processes' specialization.
+This enable developers to inject code and alter the behavior of system_server and app processes.
+
+Please note that modules will only be loaded after zygote has forked the child process.
+THIS MEANS ALL OF YOUR CODE RUNS IN THE APP/SYSTEM_SERVER PROCESS, NOT THE ZYGOTE DAEMON!
+
+*********************
+* Development Guide
+*********************
+
 Define a class and inherit zygisk::ModuleBase to implement the functionality of your module.
 Use the macro REGISTER_ZYGISK_MODULE(className) to register that class to Zygisk.
-Please note that modules will only be loaded after zygote has forked the child process.
-THIS MEANS ALL OF YOUR CODE RUNS IN THE APP/SYSTEM SERVER PROCESS, NOT THE ZYGOTE DAEMON!
+
 Example code:
+
 static jint (*orig_logger_entry_max)(JNIEnv *env);
 static jint my_logger_entry_max(JNIEnv *env) { return orig_logger_entry_max(env); }
-static void example_handler(int socket) { ... }
+
 class ExampleModule : public zygisk::ModuleBase {
 public:
     void onLoad(zygisk::Api *api, JNIEnv *env) override {
@@ -51,8 +77,26 @@ private:
     zygisk::Api *api;
     JNIEnv *env;
 };
+
 REGISTER_ZYGISK_MODULE(ExampleModule)
+
+-----------------------------------------------------------------------------------------
+
+Since your module class's code runs with either Zygote's privilege in pre[XXX]Specialize,
+or runs in the sandbox of the target process in post[XXX]Specialize, the code in your class
+never runs in a true superuser environment.
+
+If your module require access to superuser permissions, you can create and register
+a root companion handler function. This function runs in a separate root companion
+daemon process, and an Unix domain socket is provided to allow you to perform IPC between
+your target process and the root companion process.
+
+Example code:
+
+static void example_handler(int socket) { ... }
+
 REGISTER_ZYGISK_COMPANION(example_handler)
+
 */
 
 namespace zygisk {
@@ -84,7 +128,7 @@ namespace zygisk {
 
         // This method is called after the app process is specialized.
         // At this point, the process has all sandbox restrictions enabled for this application.
-        // This means that this method runs as the same privilege of the app's own code.
+        // This means that this method runs with the same privilege of the app's own code.
         virtual void postAppSpecialize([[maybe_unused]] const AppSpecializeArgs *args) {}
 
         // This method is called before the system server process is specialized.
@@ -117,6 +161,7 @@ namespace zygisk {
         jobjectArray *const whitelisted_data_info_list;
         jboolean *const mount_data_dirs;
         jboolean *const mount_storage_dirs;
+        jboolean *const mount_sysprop_overrides;
 
         AppSpecializeArgs() = delete;
     };
@@ -219,7 +264,16 @@ namespace zygisk {
         // will be set to nullptr.
         void hookJniNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, int numMethods);
 
-        // For ELFs loaded in memory matching `inode`, replace function `symbol` with `newFunc`.
+        // Hook functions in the PLT (Procedure Linkage Table) of ELFs loaded in memory.
+        //
+        // Parsing /proc/[PID]/maps will give you the memory map of a process. As an example:
+        //
+        //       <address>       <perms>  <offset>   <dev>  <inode>           <pathname>
+        // 56b4346000-56b4347000  r-xp    00002000   fe:00    235       /system/bin/app_process64
+        // (More details: https://man7.org/linux/man-pages/man5/proc.5.html)
+        //
+        // The `dev` and `inode` pair uniquely identifies a file being mapped into memory.
+        // For matching ELFs loaded in memory, replace function `symbol` with `newFunc`.
         // If `oldFunc` is not nullptr, the original function pointer will be saved to `oldFunc`.
         void pltHookRegister(dev_t dev, ino_t inode, const char *symbol, void *newFunc, void **oldFunc);
 
@@ -243,11 +297,11 @@ void zygisk_module_entry(zygisk::internal::api_table *table, JNIEnv *env) { \
 //
 // The function runs in a superuser daemon process and handles a root companion request from
 // your module running in a target process. The function has to accept an integer value,
-// which is a socket that is connected to the target process.
+// which is a Unix domain socket that is connected to the target process.
 // See Api::connectCompanion() for more info.
 //
 // NOTE: the function can run concurrently on multiple threads.
-// Be aware of race conditions if you have a globally shared resource.
+// Be aware of race conditions if you have globally shared resources.
 
 #define REGISTER_ZYGISK_COMPANION(func) \
 void zygisk_companion_entry(int client) { func(client); }

loader/src/include/daemon.h

@@ -1,76 +1,90 @@
-#pragma once
+#ifndef DAEMON_H
+#define DAEMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <stdbool.h>
 
-#include <string_view>
-#include <string>
 #include <unistd.h>
-#include <vector>
 
-#if defined(__LP64__)
-# define LP_SELECT(lp32, lp64) lp64
+#ifdef __LP64__
+  #define LP_SELECT(lp32, lp64) lp64
 #else
-# define LP_SELECT(lp32, lp64) lp32
+  #define LP_SELECT(lp32, lp64) lp32
 #endif
-constexpr std::string_view kZygiskSocket = LP_SELECT("zygiskd32", "zygiskd64") "socket_placeholder";
 
-class UniqueFd {
-    using Fd = int;
-public:
-    UniqueFd() = default;
+#define SOCKET_FILE_NAME LP_SELECT("cp32", "cp64") ".sock"
 
-    UniqueFd(Fd fd) : fd_(fd) {}
-
-    ~UniqueFd() { close(fd_); }
-
-    // Disallow copy
-    UniqueFd(const UniqueFd&) = delete;
-
-    UniqueFd& operator=(const UniqueFd&) = delete;
-
-    // Allow move
-    UniqueFd(UniqueFd&& other) { std::swap(fd_, other.fd_); }
-
-    UniqueFd& operator=(UniqueFd&& other) {
-        std::swap(fd_, other.fd_);
-        return *this;
-    }
-
-    // Implict cast to Fd
-    operator const Fd&() const { return fd_; }
-
-private:
-    Fd fd_ = -1;
+enum rezygiskd_actions {
+  PingHeartbeat,
+  GetProcessFlags,
+  GetInfo,
+  ReadModules,
+  RequestCompanionSocket,
+  GetModuleDir,
+  ZygoteRestart,
+  SystemServerStarted,
+  UpdateMountNamespace
 };
 
-namespace zygiskd {
+struct zygisk_modules {
+  char **modules;
+  size_t modules_count;
+};
 
-    struct Module {
-        std::string name;
-        UniqueFd memfd;
+enum root_impl {
+  ROOT_IMPL_NONE,
+  ROOT_IMPL_APATCH,
+  ROOT_IMPL_KERNELSU,
+  ROOT_IMPL_MAGISK
+};
 
-        inline explicit Module(std::string name, int memfd) : name(name), memfd(memfd) {}
-    };
+struct rezygisk_info {
+  struct zygisk_modules *modules;
+  enum root_impl root_impl;
+  pid_t pid;
+  bool running;
+};
 
-    enum class SocketAction {
-        PingHeartBeat,
-        RequestLogcatFd,
-        ReadNativeBridge,
-        GetProcessFlags,
-        ReadModules,
-        RequestCompanionSocket,
-        GetModuleDir,
-    };
+enum mount_namespace_state {
+  Clean,
+  Mounted
+};
 
-    bool PingHeartbeat();
+#define TMP_PATH "/data/adb/rezygisk"
 
-    int RequestLogcatFd();
-
-    std::string ReadNativeBridge();
-
-    std::vector<Module> ReadModules();
-
-    uint32_t GetProcessFlags(uid_t uid);
-
-    int ConnectCompanion(size_t index);
-
-    int GetModuleDir(size_t index);
+static inline const char *rezygiskd_get_path() {
+  return TMP_PATH;
 }
+
+int rezygiskd_connect(uint8_t retry);
+
+bool rezygiskd_ping();
+
+uint32_t rezygiskd_get_process_flags(uid_t uid, const char *const process);
+
+void rezygiskd_get_info(struct rezygisk_info *info);
+
+void free_rezygisk_info(struct rezygisk_info *info);
+
+bool rezygiskd_read_modules(struct zygisk_modules *modules);
+
+void free_modules(struct zygisk_modules *modules);
+
+int rezygiskd_connect_companion(size_t index);
+
+int rezygiskd_get_module_dir(size_t index);
+
+void rezygiskd_zygote_restart();
+
+void rezygiskd_system_server_started();
+
+bool rezygiskd_update_mns(enum mount_namespace_state nms_state, char *buf, size_t buf_size);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* DAEMON_H */

loader/src/include/dl.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <dlfcn.h>
-
-void *DlopenExt(const char *path, int flags);
-
-void *DlopenMem(int memfd, int flags);

loader/src/include/elf_util.h

@@ -0,0 +1,75 @@
+#ifndef ELF_UTIL_H
+#define ELF_UTIL_H
+
+#include <string.h>
+#include <link.h>
+#include <linux/elf.h>
+#include <sys/types.h>
+
+#define SHT_GNU_HASH 0x6ffffff6
+
+struct symtabs {
+  char *name;
+  ElfW(Sym) *sym;
+};
+
+typedef struct {
+  char *elf;
+  void *base;
+  ElfW(Ehdr) *header;
+  size_t size;
+  off_t bias;
+  ElfW(Shdr) *section_header;
+
+  ElfW(Shdr) *dynsym;
+  ElfW(Off) dynsym_offset;
+  ElfW(Sym) *dynsym_start;
+  ElfW(Shdr) *strtab;
+  ElfW(Off) symstr_offset;
+  void *strtab_start;
+
+  uint32_t nbucket_;
+  uint32_t *bucket_;
+  uint32_t *chain_;
+
+  uint32_t gnu_nbucket_;
+  uint32_t gnu_symndx_;
+  uint32_t gnu_bloom_size_;
+  uint32_t gnu_shift2_;
+  uintptr_t *gnu_bloom_filter_;
+  uint32_t *gnu_bucket_;
+  uint32_t *gnu_chain_;
+
+  ElfW(Shdr) *symtab;
+  ElfW(Off) symtab_offset;
+  size_t symtab_size;
+  size_t symtab_count;
+  ElfW(Sym) *symtab_start;
+  ElfW(Off) symstr_offset_for_symtab;
+
+  struct symtabs *symtabs_;
+} ElfImg;
+
+void ElfImg_destroy(ElfImg *img);
+
+ElfImg *ElfImg_create(const char *elf, void *base);
+
+ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash);
+
+ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash);
+
+ElfW(Addr) LinearLookup(ElfImg *restrict img, const char *restrict name);
+
+ElfW(Addr) LinearLookupByPrefix(ElfImg *restrict img, const char *name);
+
+int dl_cb(struct dl_phdr_info *info, size_t size, void *data);
+
+ElfW(Addr) getSymbOffset(ElfImg *img, const char *name);
+
+ElfW(Addr) getSymbAddress(ElfImg *img, const char *name);
+
+ElfW(Addr) getSymbAddressByPrefix(ElfImg *img, const char *prefix);
+
+void *getSymbValueByPrefix(ElfImg *img, const char *prefix);
+
+#endif /* ELF_UTIL_H */

loader/src/include/logging.h

@@ -1,43 +1,30 @@
-#pragma once
+#ifndef LOGGING_H
+#define LOGGING_H
 
 #include <android/log.h>
 #include <errno.h>
 #include <string.h>
 
 #ifndef LOG_TAG
-#if defined(__LP64__)
-# define LOG_TAG "zygisksu64"
-#else
-# define LOG_TAG "zygisksu32"
-#endif
+  #ifdef __LP64__
+    #define LOG_TAG "zygisk-core64"
+  #else
+    #define LOG_TAG "zygisk-core32"
+  #endif
 #endif
 
-#ifdef LOG_DISABLED
-#define LOGD(...)
-#define LOGV(...)
-#define LOGI(...)
-#define LOGW(...)
-#define LOGE(...)
-#else
 #ifndef NDEBUG
-#define LOGD(...)  logging::log(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define LOGV(...)  logging::log(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
+  #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+  #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
-#define LOGD(...)
-#define LOGV(...)
+  #define LOGD(...)
+  #define LOGV(...)
 #endif
-#define LOGI(...)  logging::log(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
-#define LOGW(...)  logging::log(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
-#define LOGE(...)  logging::log(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
-#define LOGF(...)  logging::log(ANDROID_LOG_FATAL, LOG_TAG, __VA_ARGS__)
+
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, LOG_TAG, __VA_ARGS__)
 #define PLOGE(fmt, args...) LOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno))
-#endif
 
-namespace logging {
-    void setfd(int fd);
-
-    int getfd();
-
-    [[gnu::format(printf, 3, 4)]]
-    void log(int prio, const char* tag, const char* fmt, ...);
-}
+#endif /* LOGGING_H */

loader/src/include/misc.h

@@ -0,0 +1,17 @@
+#ifndef MISC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * Bionic's atoi runs through strtol().
+ * Use our own implementation for faster conversion.
+ */
+int parse_int(const char *str);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* MISC_H */

loader/src/include/native_bridge_callbacks.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <android/api-level.h>
-#include <cstdint>
-
-template<unsigned>
-struct NativeBridgeCallbacks;
-
-template<>
-struct NativeBridgeCallbacks<__ANDROID_API_Q__> {
-    [[maybe_unused]] uint32_t version;
-    [[maybe_unused]] void *initialize;
-    [[maybe_unused]] void *loadLibrary;
-    [[maybe_unused]] void *getTrampoline;
-    [[maybe_unused]] void *isSupported;
-    [[maybe_unused]] void *getAppEnv;
-    [[maybe_unused]] void *isCompatibleWith;
-    [[maybe_unused]] void *getSignalHandler;
-    [[maybe_unused]] void *unloadLibrary;
-    [[maybe_unused]] void *getError;
-    [[maybe_unused]] void *isPathSupported;
-    [[maybe_unused]] void *initAnonymousNamespace;
-    [[maybe_unused]] void *createNamespace;
-    [[maybe_unused]] void *linkNamespaces;
-    [[maybe_unused]] void *loadLibraryExt;
-    [[maybe_unused]] void *getVendorNamespace;
-    [[maybe_unused]] void *getExportedNamespace;
-};
-
-template<>
-struct NativeBridgeCallbacks<__ANDROID_API_R__> : NativeBridgeCallbacks<__ANDROID_API_Q__> {
-    [[maybe_unused]] void *preZygoteFork;
-};

loader/src/include/socket_utils.h

@@ -1,31 +1,27 @@
-#pragma once
+#ifndef SOCKET_UTILS_H
+#define SOCKET_UTILS_H
 
-#include <string>
-#include <string_view>
+#include <stdint.h>
 
-#include "logging.h"
+int read_fd(int fd);
 
-namespace socket_utils {
+ssize_t write_string(int fd, const char *str);
+  
+char *read_string(int fd);
 
-    ssize_t xread(int fd, void *buf, size_t count);
+#define write_func_def(type)              \
+  ssize_t write_## type(int fd, type val)
 
-    ssize_t xwrite(int fd, const void *buf, size_t count);
+#define read_func_def(type)               \
+  ssize_t read_## type(int fd, type *val)
 
-    uint8_t read_u8(int fd);
+write_func_def(uint8_t);
+read_func_def(uint8_t);
 
-    uint32_t read_u32(int fd);
+write_func_def(uint32_t);
+read_func_def(uint32_t);
 
-    size_t read_usize(int fd);
+write_func_def(size_t);
+read_func_def(size_t);
 
-    std::string read_string(int fd);
-
-    bool write_u8(int fd, uint8_t val);
-
-    bool write_u32(int fd, uint32_t val);
-
-    int recv_fd(int fd);
-
-    bool write_usize(int fd, size_t val);
-
-    bool write_string(int fd, std::string_view str);
-}
+#endif /* SOCKET_UTILS_H */

loader/src/injector/art_method.hpp

@@ -0,0 +1,83 @@
+#pragma once
+
+#include "logging.h"
+#include "jni_helper.hpp"
+
+template <typename T>
+constexpr inline auto RoundUpTo(T v, size_t size) {
+    return v + size - 1 - ((v + size - 1) & (size - 1));
+}
+
+inline static constexpr auto kPointerSize = sizeof(void *);
+
+namespace lsplant::art {
+
+    class ArtMethod {
+
+    public:
+        void *GetData() {
+            return *reinterpret_cast<void **>(reinterpret_cast<uintptr_t>(this) + data_offset);
+        }
+
+        static art::ArtMethod *FromReflectedMethod(JNIEnv *env, jobject method) {
+            if (art_method_field) [[likely]] {
+                return reinterpret_cast<art::ArtMethod *>(
+                        JNI_GetLongField(env, method, art_method_field));
+            } else {
+                return reinterpret_cast<art::ArtMethod *>(env->FromReflectedMethod(method));
+            }
+        }
+
+        static bool Init(JNIEnv *env) {
+            ScopedLocalRef<jclass> executable{env, nullptr};
+            executable = JNI_FindClass(env, "java/lang/reflect/Executable");
+            if (!executable) {
+                LOGE("Failed to found Executable");
+                return false;
+            }
+
+            if (art_method_field = JNI_GetFieldID(env, executable, "artMethod", "J");
+                    !art_method_field) {
+                LOGE("Failed to find artMethod field");
+                return false;
+            }
+
+            auto throwable = JNI_FindClass(env, "java/lang/Throwable");
+            if (!throwable) {
+                LOGE("Failed to found Executable");
+                return false;
+            }
+            auto clazz = JNI_FindClass(env, "java/lang/Class");
+            static_assert(std::is_same_v<decltype(clazz)::BaseType, jclass>);
+            jmethodID get_declared_constructors = JNI_GetMethodID(env, clazz, "getDeclaredConstructors",
+                                                                  "()[Ljava/lang/reflect/Constructor;");
+            const auto constructors =
+                    JNI_Cast<jobjectArray>(JNI_CallObjectMethod(env, throwable, get_declared_constructors));
+            if (constructors.size() < 2) {
+                LOGE("Throwable has less than 2 constructors");
+                return false;
+            }
+            auto &first_ctor = constructors[0];
+            auto &second_ctor = constructors[1];
+            auto *first = FromReflectedMethod(env, first_ctor.get());
+            auto *second = FromReflectedMethod(env, second_ctor.get());
+            art_method_size = reinterpret_cast<uintptr_t>(second) - reinterpret_cast<uintptr_t>(first);
+            LOGD("ArtMethod size: %zu", art_method_size);
+            if (RoundUpTo(4 * 9, kPointerSize) + kPointerSize * 3 < art_method_size) [[unlikely]] {
+                LOGW("ArtMethod size exceeds maximum assume. There may be something wrong.");
+            }
+            entry_point_offset = art_method_size - kPointerSize;
+            data_offset = entry_point_offset - kPointerSize;
+            LOGD("ArtMethod::entrypoint offset: %zu", entry_point_offset);
+            LOGD("ArtMethod::data offset: %zu", data_offset);
+            return true;
+        }
+
+    private:
+        inline static jfieldID art_method_field = nullptr;
+        inline static size_t art_method_size = 0;
+        inline static size_t entry_point_offset = 0;
+        inline static size_t data_offset = 0;
+    };
+
+}  // namespace lsplant::art

loader/src/injector/entry.cpp

@@ -1,28 +1,26 @@
 #include "daemon.h"
 #include "logging.h"
 #include "zygisk.hpp"
-#include "module.hpp"
 
 using namespace std;
 
-void *self_handle = nullptr;
-
-[[gnu::destructor]] [[maybe_unused]]
-static void zygisk_cleanup_wait() {
-    if (self_handle) {
-        // Wait 10us to make sure none of our code is executing
-        timespec ts = { .tv_sec = 0, .tv_nsec = 10000L };
-        nanosleep(&ts, nullptr);
-    }
-}
+void *start_addr = nullptr;
+size_t block_size = 0;
 
 extern "C" [[gnu::visibility("default")]]
-void entry(void *handle) {
-#ifdef NDEBUG
-    logging::setfd(zygiskd::RequestLogcatFd());
-#endif
-    self_handle = handle;
+void entry(void* addr, size_t size, const char* path) {
+    LOGD("Zygisk library injected, version %s", ZKSU_VERSION);
 
-    LOGD("Load injector successfully");
+    start_addr = addr;
+    block_size = size;
+
+    if (!rezygiskd_ping()) {
+        LOGE("Zygisk daemon is not running");
+
+        return;
+    }
+
+    LOGD("start plt hooking");
     hook_functions();
+    clean_trace(path, 1, 0, false);
 }

loader/src/injector/files.cpp

@@ -1,122 +0,0 @@
-#include <sys/sysmacros.h>
-
-#include "files.hpp"
-#include "misc.hpp"
-
-using namespace std::string_view_literals;
-
-void file_readline(bool trim, FILE *fp, const std::function<bool(std::string_view)> &fn) {
-    size_t len = 1024;
-    char *buf = (char *) malloc(len);
-    char *start;
-    ssize_t read;
-    while ((read = getline(&buf, &len, fp)) >= 0) {
-        start = buf;
-        if (trim) {
-            while (read && "\n\r "sv.find(buf[read - 1]) != std::string::npos)
-                --read;
-            buf[read] = '\0';
-            while (*start == ' ')
-                ++start;
-        }
-        if (!fn(start))
-            break;
-    }
-    free(buf);
-}
-
-void file_readline(bool trim, const char *file, const std::function<bool(std::string_view)> &fn) {
-    if (auto fp = open_file(file, "re"))
-        file_readline(trim, fp.get(), fn);
-}
-void file_readline(const char *file, const std::function<bool(std::string_view)> &fn) {
-    file_readline(false, file, fn);
-}
-
-std::vector<mount_info> parse_mount_info(const char *pid) {
-    char buf[PATH_MAX] = {};
-    snprintf(buf, sizeof(buf), "/proc/%s/mountinfo", pid);
-    std::vector<mount_info> result;
-
-    file_readline(buf, [&result](std::string_view line) -> bool {
-        int root_start = 0, root_end = 0;
-        int target_start = 0, target_end = 0;
-        int vfs_option_start = 0, vfs_option_end = 0;
-        int type_start = 0, type_end = 0;
-        int source_start = 0, source_end = 0;
-        int fs_option_start = 0, fs_option_end = 0;
-        int optional_start = 0, optional_end = 0;
-        unsigned int id, parent, maj, min;
-        sscanf(line.data(),
-               "%u "           // (1) id
-               "%u "           // (2) parent
-               "%u:%u "        // (3) maj:min
-               "%n%*s%n "      // (4) mountroot
-               "%n%*s%n "      // (5) target
-               "%n%*s%n"       // (6) vfs options (fs-independent)
-               "%n%*[^-]%n - " // (7) optional fields
-               "%n%*s%n "      // (8) FS type
-               "%n%*s%n "      // (9) source
-               "%n%*s%n",      // (10) fs options (fs specific)
-               &id, &parent, &maj, &min, &root_start, &root_end, &target_start,
-               &target_end, &vfs_option_start, &vfs_option_end,
-               &optional_start, &optional_end, &type_start, &type_end,
-               &source_start, &source_end, &fs_option_start, &fs_option_end);
-
-        auto root = line.substr(root_start, root_end - root_start);
-        auto target = line.substr(target_start, target_end - target_start);
-        auto vfs_option =
-                line.substr(vfs_option_start, vfs_option_end - vfs_option_start);
-        ++optional_start;
-        --optional_end;
-        auto optional = line.substr(
-                optional_start,
-                optional_end - optional_start > 0 ? optional_end - optional_start : 0);
-
-        auto type = line.substr(type_start, type_end - type_start);
-        auto source = line.substr(source_start, source_end - source_start);
-        auto fs_option =
-                line.substr(fs_option_start, fs_option_end - fs_option_start);
-
-        unsigned int shared = 0;
-        unsigned int master = 0;
-        unsigned int propagate_from = 0;
-        if (auto pos = optional.find("shared:"); pos != std::string_view::npos) {
-            shared = parse_int(optional.substr(pos + 7));
-        }
-        if (auto pos = optional.find("master:"); pos != std::string_view::npos) {
-            master = parse_int(optional.substr(pos + 7));
-        }
-        if (auto pos = optional.find("propagate_from:");
-                pos != std::string_view::npos) {
-            propagate_from = parse_int(optional.substr(pos + 15));
-        }
-
-        result.emplace_back(mount_info {
-                .id = id,
-                .parent = parent,
-                .device = static_cast<dev_t>(makedev(maj, min)),
-                .root {root},
-                .target {target},
-                .vfs_option {vfs_option},
-                .optional {
-                        .shared = shared,
-                        .master = master,
-                        .propagate_from = propagate_from,
-                },
-                .type {type},
-                .source {source},
-                .fs_option {fs_option},
-        });
-        return true;
-    });
-    return result;
-}
-
-sDIR make_dir(DIR *dp) {
-    return sDIR(dp, [](DIR *dp){ return dp ? closedir(dp) : 1; });
-}
-
-sFILE make_file(FILE *fp) {
-    return sFILE(fp, [](FILE *fp){ return fp ? fclose(fp) : 1; });
-}

loader/src/injector/files.hpp

@@ -1,56 +0,0 @@
-#include <dirent.h>
-#include <functional>
-#include <string>
-#include <vector>
-
-struct mount_info {
-    unsigned int id;
-    unsigned int parent;
-    dev_t device;
-    std::string root;
-    std::string target;
-    std::string vfs_option;
-    struct {
-        unsigned int shared;
-        unsigned int master;
-        unsigned int propagate_from;
-    } optional;
-    std::string type;
-    std::string source;
-    std::string fs_option;
-};
-
-void file_readline(bool trim, FILE *fp, const std::function<bool(std::string_view)> &fn);
-void file_readline(bool trim, const char *file, const std::function<bool(std::string_view)> &fn);
-void file_readline(const char *file, const std::function<bool(std::string_view)> &fn);
-
-std::vector<mount_info> parse_mount_info(const char *pid);
-
-using sFILE = std::unique_ptr<FILE, decltype(&fclose)>;
-using sDIR = std::unique_ptr<DIR, decltype(&closedir)>;
-sDIR make_dir(DIR *dp);
-sFILE make_file(FILE *fp);
-
-static inline sDIR open_dir(const char *path) {
-    return make_dir(opendir(path));
-}
-
-static inline sDIR xopen_dir(const char *path) {
-    return make_dir(opendir(path));
-}
-
-static inline sDIR xopen_dir(int dirfd) {
-    return make_dir(fdopendir(dirfd));
-}
-
-static inline sFILE open_file(const char *path, const char *mode) {
-    return make_file(fopen(path, mode));
-}
-
-static inline sFILE xopen_file(const char *path, const char *mode) {
-    return make_file(fopen(path, mode));
-}
-
-static inline sFILE xopen_file(int fd, const char *mode) {
-    return make_file(fdopen(fd, mode));
-}

loader/src/injector/gen_jni_hooks.py

@@ -0,0 +1,302 @@
+#!/usr/bin/env python3
+
+primitives = ['jint', 'jboolean', 'jlong']
+
+class JType:
+    def __init__(self, cpp, jni):
+        self.cpp = cpp
+        self.jni = jni
+
+
+class JArray(JType):
+    def __init__(self, type):
+        if type.cpp in primitives:
+            name = type.cpp + 'Array'
+        else:
+            name = 'jobjectArray'
+        super().__init__(name, '[' + type.jni)
+
+
+class Argument:
+    def __init__(self, name, type, set_arg = False):
+        self.name = name
+        self.type = type
+        self.set_arg = set_arg
+
+    def cpp(self):
+        return f'{self.type.cpp} {self.name}'
+
+# Args we don't care, give it an auto generated name
+class Anon(Argument):
+    cnt = 0
+    def __init__(self, type):
+        super().__init__(f'_{Anon.cnt}', type)
+        Anon.cnt += 1
+
+class Return:
+    def __init__(self, value, type):
+        self.value = value
+        self.type = type
+
+class Method:
+    def __init__(self, name, ret, args):
+        self.name = name
+        self.ret = ret
+        self.args = args
+
+    def cpp(self):
+        return ', '.join(map(lambda x: x.cpp(), self.args))
+
+    def name_list(self):
+        return ', '.join(map(lambda x: x.name, self.args))
+
+    def jni(self):
+        args = ''.join(map(lambda x: x.type.jni, self.args))
+        return f'({args}){self.ret.type.jni}'
+
+    def body(self):
+        return ''
+
+class JNIHook(Method):
+    def __init__(self, ver, ret, args):
+        name = f'{self.base_name()}_{ver}'
+        super().__init__(name, ret, args)
+
+    def base_name(self):
+        return ''
+
+    def orig_method(self):
+        return f'reinterpret_cast<decltype(&{self.name})>({self.base_name()}_orig)'
+
+def ind(i):
+    return '\n' + '    ' * i
+
+# Common types
+jint = JType('jint', 'I')
+jintArray = JArray(jint)
+jstring = JType('jstring', 'Ljava/lang/String;')
+jboolean = JType('jboolean', 'Z')
+jlong = JType('jlong', 'J')
+jlongArray = JArray(jlong)
+void = JType('void', 'V')
+
+class ForkAndSpec(JNIHook):
+    def __init__(self, ver, args):
+        super().__init__(ver, Return('ctx.pid', jint), args)
+
+    def base_name(self):
+        return 'nativeForkAndSpecialize'
+
+    def init_args(self):
+        return 'AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);'
+
+    def body(self):
+        decl = ''
+        decl += ind(1) + self.init_args()
+        for a in self.args:
+            if a.set_arg:
+                decl += ind(1) + f'args.{a.name} = &{a.name};'
+        decl += ind(1) + 'ZygiskContext ctx(env, &args);'
+        decl += ind(1) + f'ctx.{self.base_name()}_pre();'
+        decl += ind(1) + self.orig_method() + '('
+        decl += ind(2) + f'env, clazz, {self.name_list()}'
+        decl += ind(1) + ');'
+        decl += ind(1) + f'ctx.{self.base_name()}_post();'
+        return decl
+
+class SpecApp(ForkAndSpec):
+    def __init__(self, ver, args):
+        super().__init__(ver, args)
+        self.ret = Return('', void)
+
+    def base_name(self):
+        return 'nativeSpecializeAppProcess'
+
+class ForkServer(ForkAndSpec):
+    def base_name(self):
+        return 'nativeForkSystemServer'
+
+    def init_args(self):
+        return 'ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);'
+
+# Common args
+uid = Argument('uid', jint)
+gid = Argument('gid', jint)
+gids = Argument('gids', jintArray)
+runtime_flags = Argument('runtime_flags', jint)
+rlimits = Argument('rlimits', JArray(jintArray))
+mount_external = Argument('mount_external', jint)
+se_info = Argument('se_info', jstring)
+nice_name = Argument('nice_name', jstring)
+fds_to_close = Argument('fds_to_close', jintArray)
+instruction_set = Argument('instruction_set', jstring)
+app_data_dir = Argument('app_data_dir', jstring)
+
+# o
+fds_to_ignore = Argument('fds_to_ignore', jintArray, True)
+
+# p
+is_child_zygote = Argument('is_child_zygote', jboolean, True)
+
+# q_alt
+is_top_app = Argument('is_top_app', jboolean, True)
+
+# r
+pkg_data_info_list = Argument('pkg_data_info_list', JArray(jstring), True)
+whitelisted_data_info_list = Argument('whitelisted_data_info_list', JArray(jstring), True)
+mount_data_dirs = Argument('mount_data_dirs', jboolean, True)
+mount_storage_dirs = Argument('mount_storage_dirs', jboolean, True)
+
+# u
+mount_sysprop_overrides = Argument('mount_sysprop_overrides', jboolean, True)
+
+# server
+permitted_capabilities = Argument('permitted_capabilities', jlong)
+effective_capabilities = Argument('effective_capabilities', jlong)
+
+# Method definitions
+fas_l = ForkAndSpec('l', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, nice_name, fds_to_close, instruction_set, app_data_dir])
+
+fas_o = ForkAndSpec('o', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, nice_name, fds_to_close, fds_to_ignore, instruction_set, app_data_dir])
+
+fas_p = ForkAndSpec('p', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info,
+    nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir])
+
+fas_q_alt = ForkAndSpec('q_alt', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info,
+    nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app])
+
+fas_r = ForkAndSpec('r', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info,
+    nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app,
+    pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs])
+
+fas_u = ForkAndSpec('u', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info,
+    nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app,
+    pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides])
+
+fas_samsung_m = ForkAndSpec('samsung_m', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, Anon(jint), Anon(jint), nice_name, fds_to_close, instruction_set, app_data_dir])
+
+fas_samsung_n = ForkAndSpec('samsung_n', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, Anon(jint), Anon(jint), nice_name, fds_to_close, instruction_set, app_data_dir, Anon(jint)])
+
+fas_samsung_o = ForkAndSpec('samsung_o', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, Anon(jint), Anon(jint), nice_name, fds_to_close, fds_to_ignore, instruction_set, app_data_dir])
+
+fas_samsung_p = ForkAndSpec('samsung_p', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, Anon(jint), Anon(jint), nice_name, fds_to_close, fds_to_ignore, is_child_zygote,
+    instruction_set, app_data_dir])
+
+spec_q = SpecApp('q', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info,
+    nice_name, is_child_zygote, instruction_set, app_data_dir])
+
+spec_q_alt = SpecApp('q_alt', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info,
+    nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app])
+
+spec_r = SpecApp('r', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name,
+    is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list,
+    whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs])
+
+spec_u = SpecApp('u', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name,
+    is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list,
+    whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides])
+
+spec_samsung_q = SpecApp('samsung_q', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, Anon(jint), Anon(jint), nice_name, is_child_zygote, instruction_set, app_data_dir])
+
+server_l = ForkServer('l', [uid, gid, gids, runtime_flags, rlimits,
+    permitted_capabilities, effective_capabilities])
+
+server_samsung_q = ForkServer('samsung_q', [uid, gid, gids, runtime_flags, Anon(jint), Anon(jint), rlimits,
+    permitted_capabilities, effective_capabilities])
+
+# GrapheneOS Android 14 Support
+server_grapheneos_u = ForkServer('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, permitted_capabilities, effective_capabilities])
+
+fas_grapheneos_u = ForkAndSpec('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, 
+    is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, Anon(jlongArray)])
+
+spec_grapheneos_u = SpecApp('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, mount_external,
+    se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list,
+    whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, Anon(jlongArray)])
+
+hook_map = {}
+
+def gen_jni_def(clz, methods):
+    if clz not in hook_map:
+        hook_map[clz] = []
+
+    decl = ''
+    for m in methods:
+        decl += ind(0) + f'[[clang::no_stack_protector]] {m.ret.type.cpp} {m.name}(JNIEnv *env, jclass clazz, {m.cpp()}) {{'
+        decl += m.body()
+        if m.ret.value:
+            decl += ind(1) + f'return {m.ret.value};'
+        decl += ind(0) + '}'
+
+    decl += ind(0) + f'std::array {m.base_name()}_methods = {{'
+    for m in methods:
+        decl += ind(1) + 'JNINativeMethod {'
+        decl += ind(2) + f'"{m.base_name()}",'
+        decl += ind(2) + f'"{m.jni()}",'
+        decl += ind(2) + f'(void *) &{m.name}'
+        decl += ind(1) + '},'
+    decl += ind(0) + '};'
+    decl = ind(0) + f'void *{m.base_name()}_orig = nullptr;' + decl
+    decl += ind(0)
+
+    hook_map[clz].append(m.base_name())
+
+    return decl
+
+with open('jni_hooks.hpp', 'w') as f:
+    f.write('// Generated by gen_jni_hooks.py\n')
+    f.write('\nnamespace {\n')
+
+    zygote = 'com/android/internal/os/Zygote'
+
+    methods = [fas_l, fas_o, fas_p, fas_q_alt, fas_r, fas_u, fas_samsung_m, fas_samsung_n, fas_samsung_o, fas_samsung_p, fas_grapheneos_u]
+    f.write(gen_jni_def(zygote, methods))
+
+    methods = [spec_q, spec_q_alt, spec_r, spec_u, spec_samsung_q, spec_grapheneos_u]
+    f.write(gen_jni_def(zygote, methods))
+
+    methods = [server_l, server_samsung_q, server_grapheneos_u]
+    f.write(gen_jni_def(zygote, methods))
+
+    f.write('\n} // namespace\n')
+
+    f.write("""
+static void do_hook_zygote(JNIEnv *env) {
+    vector<JNINativeMethod> hooks;
+    const char *clz;
+    clz = "com/android/internal/os/Zygote";
+    hookJniNativeMethods(env, clz, nativeForkAndSpecialize_methods.data(), nativeForkAndSpecialize_methods.size());
+    for (auto &method : nativeForkAndSpecialize_methods) {
+        if (method.fnPtr) {
+            nativeForkAndSpecialize_orig = method.fnPtr;
+            hooks.emplace_back(method);
+            break;
+        }
+    }
+    hookJniNativeMethods(env, clz, nativeSpecializeAppProcess_methods.data(), nativeSpecializeAppProcess_methods.size());
+    for (auto &method : nativeSpecializeAppProcess_methods) {
+        if (method.fnPtr) {
+            nativeSpecializeAppProcess_orig = method.fnPtr;
+            hooks.emplace_back(method);
+            break;
+        }
+    }
+    hookJniNativeMethods(env, clz, nativeForkSystemServer_methods.data(), nativeForkSystemServer_methods.size());
+    for (auto &method : nativeForkSystemServer_methods) {
+        if (method.fnPtr) {
+            nativeForkSystemServer_orig = method.fnPtr;
+            hooks.emplace_back(method);
+            break;
+        }
+    }
+    jni_hook_list->emplace(clz, std::move(hooks));
+}
+""")

loader/src/injector/jni_hooks.hpp

@@ -4,10 +4,8 @@ namespace {
 
 void *nativeForkAndSpecialize_orig = nullptr;
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_l(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_l)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, instruction_set, app_data_dir
@@ -16,11 +14,9 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_o(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.fds_to_ignore = &fds_to_ignore;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_o)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, instruction_set, app_data_dir
@@ -29,12 +25,10 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_p(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.fds_to_ignore = &fds_to_ignore;
     args.is_child_zygote = &is_child_zygote;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_p)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir
@@ -43,13 +37,11 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_q_alt(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.fds_to_ignore = &fds_to_ignore;
     args.is_child_zygote = &is_child_zygote;
     args.is_top_app = &is_top_app;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_q_alt)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app
@@ -58,7 +50,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_r(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.fds_to_ignore = &fds_to_ignore;
     args.is_child_zygote = &is_child_zygote;
     args.is_top_app = &is_top_app;
@@ -66,9 +58,7 @@ void *nativeForkAndSpecialize_orig = nullptr;
     args.whitelisted_data_info_list = &whitelisted_data_info_list;
     args.mount_data_dirs = &mount_data_dirs;
     args.mount_storage_dirs = &mount_storage_dirs;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_r)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs
@@ -76,11 +66,27 @@ void *nativeForkAndSpecialize_orig = nullptr;
     ctx.nativeForkAndSpecialize_post();
     return ctx.pid;
 }
+[[clang::no_stack_protector]] jint nativeForkAndSpecialize_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides) {
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    args.fds_to_ignore = &fds_to_ignore;
+    args.is_child_zygote = &is_child_zygote;
+    args.is_top_app = &is_top_app;
+    args.pkg_data_info_list = &pkg_data_info_list;
+    args.whitelisted_data_info_list = &whitelisted_data_info_list;
+    args.mount_data_dirs = &mount_data_dirs;
+    args.mount_storage_dirs = &mount_storage_dirs;
+    args.mount_sysprop_overrides = &mount_sysprop_overrides;
+    ZygiskContext ctx(env, &args);
+    ctx.nativeForkAndSpecialize_pre();
+    reinterpret_cast<decltype(&nativeForkAndSpecialize_u)>(nativeForkAndSpecialize_orig)(
+        env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides
+    );
+    ctx.nativeForkAndSpecialize_post();
+    return ctx.pid;
+}
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_m(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _0, jint _1, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_samsung_m)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, _0, _1, nice_name, fds_to_close, instruction_set, app_data_dir
@@ -89,10 +95,8 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_n(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _2, jint _3, jstring nice_name, jintArray fds_to_close, jstring instruction_set, jstring app_data_dir, jint _4) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_samsung_n)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, _2, _3, nice_name, fds_to_close, instruction_set, app_data_dir, _4
@@ -101,11 +105,9 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_o(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _5, jint _6, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.fds_to_ignore = &fds_to_ignore;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_samsung_o)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, _5, _6, nice_name, fds_to_close, fds_to_ignore, instruction_set, app_data_dir
@@ -114,12 +116,10 @@ void *nativeForkAndSpecialize_orig = nullptr;
     return ctx.pid;
 }
 [[clang::no_stack_protector]] jint nativeForkAndSpecialize_samsung_p(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _7, jint _8, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.fds_to_ignore = &fds_to_ignore;
     args.is_child_zygote = &is_child_zygote;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkAndSpecialize_pre();
     reinterpret_cast<decltype(&nativeForkAndSpecialize_samsung_p)>(nativeForkAndSpecialize_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, _7, _8, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir
@@ -127,62 +127,87 @@ void *nativeForkAndSpecialize_orig = nullptr;
     ctx.nativeForkAndSpecialize_post();
     return ctx.pid;
 }
-const JNINativeMethod nativeForkAndSpecialize_methods[] = {
-    {
+[[clang::no_stack_protector]] jint nativeForkAndSpecialize_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _13) {
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    args.fds_to_ignore = &fds_to_ignore;
+    args.is_child_zygote = &is_child_zygote;
+    args.is_top_app = &is_top_app;
+    args.pkg_data_info_list = &pkg_data_info_list;
+    args.whitelisted_data_info_list = &whitelisted_data_info_list;
+    args.mount_data_dirs = &mount_data_dirs;
+    args.mount_storage_dirs = &mount_storage_dirs;
+    args.mount_sysprop_overrides = &mount_sysprop_overrides;
+    ZygiskContext ctx(env, &args);
+    ctx.nativeForkAndSpecialize_pre();
+    reinterpret_cast<decltype(&nativeForkAndSpecialize_grapheneos_u)>(nativeForkAndSpecialize_orig)(
+        env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _13
+    );
+    ctx.nativeForkAndSpecialize_post();
+    return ctx.pid;
+}
+std::array nativeForkAndSpecialize_methods = {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;[ILjava/lang/String;Ljava/lang/String;)I",
         (void *) &nativeForkAndSpecialize_l
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[ILjava/lang/String;Ljava/lang/String;)I",
         (void *) &nativeForkAndSpecialize_o
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;)I",
         (void *) &nativeForkAndSpecialize_p
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;Z)I",
         (void *) &nativeForkAndSpecialize_q_alt
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZ)I",
         (void *) &nativeForkAndSpecialize_r
     },
-    {
+    JNINativeMethod {
+        "nativeForkAndSpecialize",
+        "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZZ)I",
+        (void *) &nativeForkAndSpecialize_u
+    },
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;IILjava/lang/String;[ILjava/lang/String;Ljava/lang/String;)I",
         (void *) &nativeForkAndSpecialize_samsung_m
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;IILjava/lang/String;[ILjava/lang/String;Ljava/lang/String;I)I",
         (void *) &nativeForkAndSpecialize_samsung_n
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;IILjava/lang/String;[I[ILjava/lang/String;Ljava/lang/String;)I",
         (void *) &nativeForkAndSpecialize_samsung_o
     },
-    {
+    JNINativeMethod {
         "nativeForkAndSpecialize",
         "(II[II[[IILjava/lang/String;IILjava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;)I",
         (void *) &nativeForkAndSpecialize_samsung_p
     },
+    JNINativeMethod {
+        "nativeForkAndSpecialize",
+        "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZZ[J)I",
+        (void *) &nativeForkAndSpecialize_grapheneos_u
+    },
 };
-constexpr int nativeForkAndSpecialize_methods_num = std::size(nativeForkAndSpecialize_methods);
 
 void *nativeSpecializeAppProcess_orig = nullptr;
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.is_child_zygote = &is_child_zygote;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeSpecializeAppProcess_pre();
     reinterpret_cast<decltype(&nativeSpecializeAppProcess_q)>(nativeSpecializeAppProcess_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir
@@ -190,12 +215,10 @@ void *nativeSpecializeAppProcess_orig = nullptr;
     ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_q_alt(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.is_child_zygote = &is_child_zygote;
     args.is_top_app = &is_top_app;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeSpecializeAppProcess_pre();
     reinterpret_cast<decltype(&nativeSpecializeAppProcess_q_alt)>(nativeSpecializeAppProcess_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app
@@ -203,64 +226,99 @@ void *nativeSpecializeAppProcess_orig = nullptr;
     ctx.nativeSpecializeAppProcess_post();
 }
 [[clang::no_stack_protector]] void nativeSpecializeAppProcess_r(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.is_child_zygote = &is_child_zygote;
     args.is_top_app = &is_top_app;
     args.pkg_data_info_list = &pkg_data_info_list;
     args.whitelisted_data_info_list = &whitelisted_data_info_list;
     args.mount_data_dirs = &mount_data_dirs;
     args.mount_storage_dirs = &mount_storage_dirs;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeSpecializeAppProcess_pre();
     reinterpret_cast<decltype(&nativeSpecializeAppProcess_r)>(nativeSpecializeAppProcess_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs
     );
     ctx.nativeSpecializeAppProcess_post();
 }
-[[clang::no_stack_protector]] void nativeSpecializeAppProcess_samsung_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _9, jint _10, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
-    AppSpecializeArgs_v3 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+[[clang::no_stack_protector]] void nativeSpecializeAppProcess_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides) {
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
     args.is_child_zygote = &is_child_zygote;
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    args.is_top_app = &is_top_app;
+    args.pkg_data_info_list = &pkg_data_info_list;
+    args.whitelisted_data_info_list = &whitelisted_data_info_list;
+    args.mount_data_dirs = &mount_data_dirs;
+    args.mount_storage_dirs = &mount_storage_dirs;
+    args.mount_sysprop_overrides = &mount_sysprop_overrides;
+    ZygiskContext ctx(env, &args);
+    ctx.nativeSpecializeAppProcess_pre();
+    reinterpret_cast<decltype(&nativeSpecializeAppProcess_u)>(nativeSpecializeAppProcess_orig)(
+        env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides
+    );
+    ctx.nativeSpecializeAppProcess_post();
+}
+[[clang::no_stack_protector]] void nativeSpecializeAppProcess_samsung_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jint _9, jint _10, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir) {
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    args.is_child_zygote = &is_child_zygote;
+    ZygiskContext ctx(env, &args);
     ctx.nativeSpecializeAppProcess_pre();
     reinterpret_cast<decltype(&nativeSpecializeAppProcess_samsung_q)>(nativeSpecializeAppProcess_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, _9, _10, nice_name, is_child_zygote, instruction_set, app_data_dir
     );
     ctx.nativeSpecializeAppProcess_post();
 }
-const JNINativeMethod nativeSpecializeAppProcess_methods[] = {
-    {
+[[clang::no_stack_protector]] void nativeSpecializeAppProcess_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _14) {
+    AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir);
+    args.is_child_zygote = &is_child_zygote;
+    args.is_top_app = &is_top_app;
+    args.pkg_data_info_list = &pkg_data_info_list;
+    args.whitelisted_data_info_list = &whitelisted_data_info_list;
+    args.mount_data_dirs = &mount_data_dirs;
+    args.mount_storage_dirs = &mount_storage_dirs;
+    args.mount_sysprop_overrides = &mount_sysprop_overrides;
+    ZygiskContext ctx(env, &args);
+    ctx.nativeSpecializeAppProcess_pre();
+    reinterpret_cast<decltype(&nativeSpecializeAppProcess_grapheneos_u)>(nativeSpecializeAppProcess_orig)(
+        env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _14
+    );
+    ctx.nativeSpecializeAppProcess_post();
+}
+std::array nativeSpecializeAppProcess_methods = {
+    JNINativeMethod {
         "nativeSpecializeAppProcess",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;)V",
         (void *) &nativeSpecializeAppProcess_q
     },
-    {
+    JNINativeMethod {
         "nativeSpecializeAppProcess",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;Z)V",
         (void *) &nativeSpecializeAppProcess_q_alt
     },
-    {
+    JNINativeMethod {
         "nativeSpecializeAppProcess",
         "(II[II[[IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZ)V",
         (void *) &nativeSpecializeAppProcess_r
     },
-    {
+    JNINativeMethod {
+        "nativeSpecializeAppProcess",
+        "(II[II[[IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZZ)V",
+        (void *) &nativeSpecializeAppProcess_u
+    },
+    JNINativeMethod {
         "nativeSpecializeAppProcess",
         "(II[II[[IILjava/lang/String;IILjava/lang/String;ZLjava/lang/String;Ljava/lang/String;)V",
         (void *) &nativeSpecializeAppProcess_samsung_q
     },
+    JNINativeMethod {
+        "nativeSpecializeAppProcess",
+        "(II[II[[IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZZ[J)V",
+        (void *) &nativeSpecializeAppProcess_grapheneos_u
+    },
 };
-constexpr int nativeSpecializeAppProcess_methods_num = std::size(nativeSpecializeAppProcess_methods);
 
 void *nativeForkSystemServer_orig = nullptr;
 [[clang::no_stack_protector]] jint nativeForkSystemServer_l(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) {
     ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkSystemServer_pre();
     reinterpret_cast<decltype(&nativeForkSystemServer_l)>(nativeForkSystemServer_orig)(
         env, clazz, uid, gid, gids, runtime_flags, rlimits, permitted_capabilities, effective_capabilities
@@ -270,9 +328,7 @@ void *nativeForkSystemServer_orig = nullptr;
 }
 [[clang::no_stack_protector]] jint nativeForkSystemServer_samsung_q(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jint _11, jint _12, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) {
     ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);
-    HookContext ctx;
-    ctx.env = env;
-    ctx.args = { &args };
+    ZygiskContext ctx(env, &args);
     ctx.nativeForkSystemServer_pre();
     reinterpret_cast<decltype(&nativeForkSystemServer_samsung_q)>(nativeForkSystemServer_orig)(
         env, clazz, uid, gid, gids, runtime_flags, _11, _12, rlimits, permitted_capabilities, effective_capabilities
@@ -280,45 +336,63 @@ void *nativeForkSystemServer_orig = nullptr;
     ctx.nativeForkSystemServer_post();
     return ctx.pid;
 }
-const JNINativeMethod nativeForkSystemServer_methods[] = {
-    {
+[[clang::no_stack_protector]] jint nativeForkSystemServer_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) {
+    ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities);
+    ZygiskContext ctx(env, &args);
+    ctx.nativeForkSystemServer_pre();
+    reinterpret_cast<decltype(&nativeForkSystemServer_grapheneos_u)>(nativeForkSystemServer_orig)(
+        env, clazz, uid, gid, gids, runtime_flags, rlimits, permitted_capabilities, effective_capabilities
+    );
+    ctx.nativeForkSystemServer_post();
+    return ctx.pid;
+}
+std::array nativeForkSystemServer_methods = {
+    JNINativeMethod {
         "nativeForkSystemServer",
         "(II[II[[IJJ)I",
         (void *) &nativeForkSystemServer_l
     },
-    {
+    JNINativeMethod {
         "nativeForkSystemServer",
         "(II[IIII[[IJJ)I",
         (void *) &nativeForkSystemServer_samsung_q
     },
+    JNINativeMethod {
+        "nativeForkSystemServer",
+        "(II[II[[IJJ)I",
+        (void *) &nativeForkSystemServer_grapheneos_u
+    },
 };
-constexpr int nativeForkSystemServer_methods_num = std::size(nativeForkSystemServer_methods);
-
-unique_ptr<JNINativeMethod[]> hookAndSaveJNIMethods(const char *className, const JNINativeMethod *methods, int numMethods) {
-    unique_ptr<JNINativeMethod[]> newMethods;
-    int clz_id = -1;
-    int hook_cnt = 0;
-    do {
-        if (className == "com/android/internal/os/Zygote"sv) {
-            clz_id = 0;
-            hook_cnt = 3;
-            break;
-        }
-    } while (false);
-    if (hook_cnt) {
-        newMethods = make_unique<JNINativeMethod[]>(numMethods);
-        memcpy(newMethods.get(), methods, sizeof(JNINativeMethod) * numMethods);
-    }
-    auto &class_map = (*jni_method_map)[className];
-    for (int i = 0; i < numMethods; ++i) {
-        if (hook_cnt && clz_id == 0) {
-            HOOK_JNI(nativeForkAndSpecialize)
-            HOOK_JNI(nativeSpecializeAppProcess)
-            HOOK_JNI(nativeForkSystemServer)
-        }
-        class_map[methods[i].name][methods[i].signature] = methods[i].fnPtr;
-    }
-    return newMethods;
-}
 
 } // namespace
+
+static void do_hook_zygote(JNIEnv *env) {
+    vector<JNINativeMethod> hooks;
+    const char *clz;
+    clz = "com/android/internal/os/Zygote";
+    hookJniNativeMethods(env, clz, nativeForkAndSpecialize_methods.data(), nativeForkAndSpecialize_methods.size());
+    for (auto &method : nativeForkAndSpecialize_methods) {
+        if (method.fnPtr) {
+            nativeForkAndSpecialize_orig = method.fnPtr;
+            hooks.emplace_back(method);
+            break;
+        }
+    }
+    hookJniNativeMethods(env, clz, nativeSpecializeAppProcess_methods.data(), nativeSpecializeAppProcess_methods.size());
+    for (auto &method : nativeSpecializeAppProcess_methods) {
+        if (method.fnPtr) {
+            nativeSpecializeAppProcess_orig = method.fnPtr;
+            hooks.emplace_back(method);
+            break;
+        }
+    }
+    hookJniNativeMethods(env, clz, nativeForkSystemServer_methods.data(), nativeForkSystemServer_methods.size());
+    for (auto &method : nativeForkSystemServer_methods) {
+        if (method.fnPtr) {
+            nativeForkSystemServer_orig = method.fnPtr;
+            hooks.emplace_back(method);
+            break;
+        }
+    }
+    jni_hook_list->emplace(clz, std::move(hooks));
+}

loader/src/injector/memory.cpp

@@ -1,31 +0,0 @@
-#include "memory.hpp"
-
-namespace jni_hook {
-
-// We know our minimum alignment is WORD size (size of pointer)
-static constexpr size_t ALIGN = sizeof(long);
-
-// 4MB is more than enough
-static constexpr size_t CAPACITY = (1 << 22);
-
-// No need to be thread safe as the initial mmap always happens on the main thread
-static uint8_t *_area = nullptr;
-
-static std::atomic<uint8_t *> _curr = nullptr;
-
-void *memory_block::allocate(size_t sz) {
-    if (!_area) {
-        // Memory will not actually be allocated because physical pages are mapped in on-demand
-        _area = static_cast<uint8_t *>(mmap(
-                nullptr, CAPACITY, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));
-        _curr = _area;
-    }
-    return _curr.fetch_add(align_to(sz, ALIGN));
-}
-
-void memory_block::release() {
-    if (_area)
-        munmap(_area, CAPACITY);
-}
-
-} // namespace jni_hook

loader/src/injector/memory.hpp

@@ -1,44 +0,0 @@
-#pragma once
-
-#include <map>
-#include <sys/mman.h>
-
-#pragma clang diagnostic push
-#include <parallel_hashmap/phmap.h>
-#pragma clang diagnostic pop
-
-#include "misc.hpp"
-
-namespace jni_hook {
-
-struct memory_block {
-    static void *allocate(size_t sz);
-    static void deallocate(void *, size_t) { /* Monotonic increase */ }
-    static void release();
-};
-
-template<class T>
-using allocator = stateless_allocator<T, memory_block>;
-
-using string = std::basic_string<char, std::char_traits<char>, allocator<char>>;
-
-// Use node_hash_map since it will use less memory because we are using a monotonic allocator
-template<class K, class V>
-using hash_map = phmap::node_hash_map<K, V,
-    phmap::priv::hash_default_hash<K>,
-    phmap::priv::hash_default_eq<K>,
-    allocator<std::pair<const K, V>>
->;
-
-template<class K, class V>
-using tree_map = std::map<K, V,
-    std::less<K>,
-    allocator<std::pair<const K, V>>
->;
-
-} // namespace jni_hook
-
-// Provide heterogeneous lookup for jni_hook::string
-namespace phmap::priv {
-template <> struct HashEq<jni_hook::string> : StringHashEqT<char> {};
-} // namespace phmap::priv

loader/src/injector/misc.cpp

@@ -1,49 +0,0 @@
-#include "misc.hpp"
-
-int new_daemon_thread(thread_entry entry, void *arg) {
-    pthread_t thread;
-    pthread_attr_t attr;
-    pthread_attr_init(&attr);
-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-    errno = pthread_create(&thread, &attr, entry, arg);
-    if (errno) {
-        PLOGE("pthread_create");
-    }
-    return errno;
-}
-
-int parse_int(std::string_view s) {
-    int val = 0;
-    for (char c : s) {
-        if (!c) break;
-        if (c > '9' || c < '0')
-            return -1;
-        val = val * 10 + c - '0';
-    }
-    return val;
-}
-
-std::list<std::string> split_str(std::string_view s, std::string_view delimiter) {
-    std::list<std::string> ret;
-    size_t pos = 0;
-    while (pos < s.size()) {
-        auto next = s.find(delimiter, pos);
-        if (next == std::string_view::npos) {
-            ret.emplace_back(s.substr(pos));
-            break;
-        }
-        ret.emplace_back(s.substr(pos, next - pos));
-        pos = next + delimiter.size();
-    }
-    return ret;
-}
-
-std::string join_str(const std::list<std::string>& list, std::string_view delimiter) {
-    std::string ret;
-    for (auto& s : list) {
-        if (!ret.empty())
-            ret += delimiter;
-        ret += s;
-    }
-    return ret;
-}

loader/src/injector/misc.hpp

@@ -1,98 +0,0 @@
-#pragma once
-
-#include <list>
-#include <memory>
-#include <pthread.h>
-#include <string>
-#include <string_view>
-
-#include "logging.h"
-
-#define DISALLOW_COPY_AND_MOVE(clazz) \
-clazz(const clazz &) = delete; \
-clazz(clazz &&) = delete;
-
-class mutex_guard {
-    DISALLOW_COPY_AND_MOVE(mutex_guard)
-public:
-    explicit mutex_guard(pthread_mutex_t &m): mutex(&m) {
-        pthread_mutex_lock(mutex);
-    }
-    void unlock() {
-        pthread_mutex_unlock(mutex);
-        mutex = nullptr;
-    }
-    ~mutex_guard() {
-        if (mutex) pthread_mutex_unlock(mutex);
-    }
-private:
-    pthread_mutex_t *mutex;
-};
-
-using thread_entry = void *(*)(void *);
-int new_daemon_thread(thread_entry entry, void *arg);
-
-static inline bool str_contains(std::string_view s, std::string_view ss) {
-    return s.find(ss) != std::string_view::npos;
-}
-
-template<typename T, typename Impl>
-class stateless_allocator {
-public:
-    using value_type = T;
-    T *allocate(size_t num) { return static_cast<T*>(Impl::allocate(sizeof(T) * num)); }
-    void deallocate(T *ptr, size_t num) { Impl::deallocate(ptr, sizeof(T) * num); }
-    stateless_allocator()                           = default;
-    stateless_allocator(const stateless_allocator&) = default;
-    stateless_allocator(stateless_allocator&&)      = default;
-    template <typename U>
-    stateless_allocator(const stateless_allocator<U, Impl>&) {}
-    bool operator==(const stateless_allocator&) { return true; }
-    bool operator!=(const stateless_allocator&) { return false; }
-};
-
-template <typename T>
-class reversed_container {
-public:
-    reversed_container(T &base) : base(base) {}
-    decltype(std::declval<T>().rbegin()) begin() { return base.rbegin(); }
-    decltype(std::declval<T>().crbegin()) begin() const { return base.crbegin(); }
-    decltype(std::declval<T>().crbegin()) cbegin() const { return base.crbegin(); }
-    decltype(std::declval<T>().rend()) end() { return base.rend(); }
-    decltype(std::declval<T>().crend()) end() const { return base.crend(); }
-    decltype(std::declval<T>().crend()) cend() const { return base.crend(); }
-private:
-    T &base;
-};
-
-template <typename T>
-reversed_container<T> reversed(T &base) {
-    return reversed_container<T>(base);
-}
-
-template<class T>
-static inline void default_new(T *&p) { p = new T(); }
-
-template<class T>
-static inline void default_new(std::unique_ptr<T> &p) { p.reset(new T()); }
-
-struct StringCmp {
-    using is_transparent = void;
-    bool operator()(std::string_view a, std::string_view b) const { return a < b; }
-};
-
-/*
- * Bionic's atoi runs through strtol().
- * Use our own implementation for faster conversion.
- */
-int parse_int(std::string_view s);
-
-std::list<std::string> split_str(std::string_view s, std::string_view delimiter);
-
-std::string join_str(const std::list<std::string>& list, std::string_view delimiter);
-
-template <typename T>
-static inline T align_to(T v, int a) {
-    static_assert(std::is_integral<T>::value);
-    return (v + a - 1) / a * a;
-}

loader/src/injector/module.hpp

@@ -1,27 +1,31 @@
 #pragma once
 
+#include <cstring>
 #include <dlfcn.h>
 #include "api.hpp"
 
 namespace {
 
-    struct HookContext;
+    struct ZygiskContext;
     struct ZygiskModule;
 
     struct AppSpecializeArgs_v1;
     using  AppSpecializeArgs_v2 = AppSpecializeArgs_v1;
     struct AppSpecializeArgs_v3;
     using  AppSpecializeArgs_v4 = AppSpecializeArgs_v3;
+    struct AppSpecializeArgs_v5;
 
     struct module_abi_v1;
     using  module_abi_v2 = module_abi_v1;
     using  module_abi_v3 = module_abi_v1;
     using  module_abi_v4 = module_abi_v1;
+    using  module_abi_v5 = module_abi_v1;
 
     struct api_abi_v1;
     struct api_abi_v2;
     using  api_abi_v3 = api_abi_v2;
     struct api_abi_v4;
+    using  api_abi_v5 = api_abi_v4;
 
     union ApiTable;
 
@@ -54,6 +58,17 @@ namespace {
                 instruction_set(instruction_set), app_data_dir(app_data_dir) {}
     };
 
+    struct AppSpecializeArgs_v5 : public AppSpecializeArgs_v3 {
+      jboolean *mount_sysprop_overrides = nullptr;
+
+      AppSpecializeArgs_v5(
+              jint &uid, jint &gid, jintArray &gids, jint &runtime_flags,
+              jobjectArray &rlimits, jint &mount_external, jstring &se_info, jstring &nice_name,
+              jstring &instruction_set, jstring &app_data_dir) : AppSpecializeArgs_v3(
+                      uid, gid, gids, runtime_flags, rlimits, mount_external,
+                      se_info, nice_name, instruction_set, app_data_dir) {}
+    };
+
     struct AppSpecializeArgs_v1 {
         jint &uid;
         jint &gid;
@@ -72,14 +87,14 @@ namespace {
         jboolean *const mount_data_dirs;
         jboolean *const mount_storage_dirs;
 
-        AppSpecializeArgs_v1(const AppSpecializeArgs_v3 *v3) :
-                uid(v3->uid), gid(v3->gid), gids(v3->gids), runtime_flags(v3->runtime_flags),
-                mount_external(v3->mount_external), se_info(v3->se_info), nice_name(v3->nice_name),
-                instruction_set(v3->instruction_set), app_data_dir(v3->app_data_dir),
-                is_child_zygote(v3->is_child_zygote), is_top_app(v3->is_top_app),
-                pkg_data_info_list(v3->pkg_data_info_list),
-                whitelisted_data_info_list(v3->whitelisted_data_info_list),
-                mount_data_dirs(v3->mount_data_dirs), mount_storage_dirs(v3->mount_storage_dirs) {}
+        AppSpecializeArgs_v1(const AppSpecializeArgs_v5 *a) :
+                uid(a->uid), gid(a->gid), gids(a->gids), runtime_flags(a->runtime_flags),
+                mount_external(a->mount_external), se_info(a->se_info), nice_name(a->nice_name),
+                instruction_set(a->instruction_set), app_data_dir(a->app_data_dir),
+                is_child_zygote(a->is_child_zygote), is_top_app(a->is_top_app),
+                pkg_data_info_list(a->pkg_data_info_list),
+                whitelisted_data_info_list(a->whitelisted_data_info_list),
+                mount_data_dirs(a->mount_data_dirs), mount_storage_dirs(a->mount_storage_dirs) {}
     };
 
     struct ServerSpecializeArgs_v1 {
@@ -111,11 +126,13 @@ namespace {
         PROCESS_GRANTED_ROOT = zygisk::StateFlag::PROCESS_GRANTED_ROOT,
         PROCESS_ON_DENYLIST = zygisk::StateFlag::PROCESS_ON_DENYLIST,
 
+        PROCESS_IS_MANAGER = (1u << 27),
+        PROCESS_ROOT_IS_APATCH = (1u << 28),
         PROCESS_ROOT_IS_KSU = (1u << 29),
         PROCESS_ROOT_IS_MAGISK = (1u << 30),
-        PROCESS_IS_SYS_UI = (1u << 31),
+        PROCESS_IS_FIRST_STARTED = (1u << 31),
 
-        PRIVATE_MASK = PROCESS_IS_SYS_UI
+        PRIVATE_MASK = PROCESS_IS_FIRST_STARTED
     };
 
     struct api_abi_base {
@@ -165,6 +182,7 @@ case 2: {                              \
 }                                      \
 case 3:                                \
 case 4:                                \
+case 5:                                \
     mod.v1->method(mod.v1->impl, args);\
     break;                             \
 }
@@ -174,10 +192,10 @@ case 4:                                \
         void onLoad(void *env) {
             entry.fn(&api, env);
         }
-        void preAppSpecialize(AppSpecializeArgs_v3 *args) const {
+        void preAppSpecialize(AppSpecializeArgs_v5 *args) const {
             call_app(preAppSpecialize)
         }
-        void postAppSpecialize(const AppSpecializeArgs_v3 *args) const {
+        void postAppSpecialize(const AppSpecializeArgs_v5 *args) const {
             call_app(postAppSpecialize)
         }
         void preServerSpecialize(ServerSpecializeArgs_v1 *args) const {
@@ -192,7 +210,7 @@ case 4:                                \
         int getModuleDir() const;
         void setOption(zygisk::Option opt);
         static uint32_t getFlags();
-        void tryUnload() const { if (unload) dlclose(handle); }
+        bool tryUnload() const { return unload && dlclose(handle) == 0; };
         void clearApi() { memset(&api, 0, sizeof(api)); }
         int getId() const { return id; }
 
@@ -218,4 +236,4 @@ case 4:                                \
         } mod;
     };
 
-} // namespace
+} // namespace

loader/src/injector/solist.c

@@ -0,0 +1,241 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "elf_util.h"
+#include "logging.h"
+
+#include "solist.h"
+
+#ifdef __LP64__
+  size_t solist_size_offset = 0x18;
+  size_t solist_next_offset = 0x30;
+  size_t solist_realpath_offset = 0x1a8;
+#else
+  size_t solist_size_offset = 0x90;
+  size_t solist_next_offset = 0xa4;
+  size_t solist_realpath_offset = 0x174;
+#endif
+
+static const char *(*get_realpath_sym)(SoInfo *) = NULL;
+static void (*soinfo_free)(SoInfo *) = NULL;
+
+static inline SoInfo *get_next(SoInfo *self) {
+  return *(SoInfo **)((uintptr_t)self + solist_next_offset);
+}
+
+static inline const char *get_path(SoInfo *self) {
+  if (get_realpath_sym)
+    return (*get_realpath_sym)(self);
+
+  return ((const char *)((uintptr_t)self + solist_realpath_offset));
+}
+
+static inline void set_size(SoInfo *self, size_t size) {
+  *(size_t *) ((uintptr_t)self + solist_size_offset) = size;
+}
+
+static inline size_t get_size(SoInfo *self) {
+  return *(size_t *) ((uintptr_t)self + solist_size_offset);
+}
+
+struct pdg ppdg;
+
+static bool pdg_setup(ElfImg *img) {
+  ppdg.ctor = (void *(*)())getSymbAddress(img,  "__dl__ZN18ProtectedDataGuardC2Ev");
+  ppdg.dtor = (void *(*)())getSymbAddress(img, "__dl__ZN18ProtectedDataGuardD2Ev");
+
+  return ppdg.ctor != NULL && ppdg.dtor != NULL;
+}
+
+static void pdg_protect() {
+  if (ppdg.ctor != NULL)
+    (*(ppdg.ctor))();
+}
+
+static void pdg_unprotect() {
+  if (ppdg.dtor != NULL)
+    (*(ppdg.dtor))();
+}
+
+static SoInfo *solist = NULL;
+static SoInfo *somain = NULL;
+static SoInfo **sonext = NULL;
+
+static uint64_t *g_module_load_counter = NULL;
+static uint64_t *g_module_unload_counter = NULL;
+
+static bool solist_init() {
+  #ifdef __LP64__
+    ElfImg *linker = ElfImg_create("/system/bin/linker64", NULL);
+  #else
+    ElfImg *linker = ElfImg_create("/system/bin/linker", NULL);
+  #endif
+  if (linker == NULL) {
+    LOGE("Failed to load linker");
+
+    return false;
+  }
+
+  ppdg = (struct pdg) {
+    .ctor = NULL,
+    .dtor = NULL
+  };
+  if (!pdg_setup(linker)) {
+    LOGE("Failed to setup pdg");
+
+    ElfImg_destroy(linker);
+
+    return false;
+  }
+
+  /* INFO: Since Android 15, the symbol names for the linker have a suffix,
+              this makes it impossible to hardcode the symbol names. To allow
+              this to work on all versions, we need to iterate over the loaded
+              symbols and find the correct ones.
+
+      See #63 for more information.
+  */
+  solist = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL6solist");
+  if ((void *)solist == NULL) {
+    LOGE("Failed to find solist __dl__ZL6solist*");
+
+    ElfImg_destroy(linker);
+
+    return false;
+  }
+
+  LOGD("%p is solist", (void *)solist);
+
+  somain = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL6somain");
+  if (somain == NULL) {
+    LOGE("Failed to find somain __dl__ZL6somain*");
+
+    ElfImg_destroy(linker);
+
+    return false;
+  }
+
+  LOGD("%p is somain", (void *)somain);
+
+  sonext = (SoInfo **)getSymbAddressByPrefix(linker, "__dl__ZL6sonext");
+  if (sonext == NULL) {
+    LOGE("Failed to find sonext __dl__ZL6sonext*");
+
+    ElfImg_destroy(linker);
+
+    return false;
+  }
+
+  LOGD("%p is sonext", (void *)sonext);
+
+  SoInfo *vdso = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL4vdso");
+  if (vdso != NULL) LOGD("%p is vdso", (void *)vdso);
+
+  get_realpath_sym = (const char *(*)(SoInfo *))getSymbAddress(linker, "__dl__ZNK6soinfo12get_realpathEv");
+  if (get_realpath_sym == NULL) {
+    LOGE("Failed to find get_realpath __dl__ZNK6soinfo12get_realpathEv");
+
+    ElfImg_destroy(linker);
+
+    return false;
+  }
+
+  LOGD("%p is get_realpath", (void *)get_realpath_sym);
+
+  soinfo_free = (void (*)(SoInfo *))getSymbAddressByPrefix(linker, "__dl__ZL11soinfo_freeP6soinfo");
+  if (soinfo_free == NULL) {
+    LOGE("Failed to find soinfo_free __dl__ZL11soinfo_freeP6soinfo*");
+
+    ElfImg_destroy(linker);
+
+    return false;
+  }
+
+  LOGD("%p is soinfo_free", (void *)soinfo_free);
+
+  g_module_load_counter = (uint64_t *)getSymbAddress(linker, "__dl__ZL21g_module_load_counter");
+  if (g_module_load_counter != NULL) LOGD("found symbol g_module_load_counter");
+
+  g_module_unload_counter = (uint64_t *)getSymbAddress(linker, "__dl__ZL23g_module_unload_counter");
+  if (g_module_unload_counter != NULL) LOGD("found symbol g_module_unload_counter");
+
+  for (size_t i = 0; i < 1024 / sizeof(void *); i++) {
+    uintptr_t possible_field = (uintptr_t)solist + i * sizeof(void *);
+    size_t possible_size_of_somain = *(size_t *)((uintptr_t)somain + i * sizeof(void *));
+
+    if (possible_size_of_somain < 0x100000 && possible_size_of_somain > 0x100) {
+      solist_size_offset = i * sizeof(void *);
+
+      LOGD("solist_size_offset is %zu * %zu = %p", i, sizeof(void *), (void *)solist_size_offset);
+    }
+
+    if (*(void **)possible_field == somain || (vdso != NULL && *(void **)possible_field == vdso)) {
+      solist_next_offset = i * sizeof(void *);
+      LOGD("solist_next_offset is %zu * %zu = %p", i, sizeof(void *), (void *)solist_next_offset);
+
+      break;
+    }
+  }
+
+  ElfImg_destroy(linker);
+
+  return true;
+}
+
+bool solist_drop_so_path(const char *target_path) {
+  if (solist == NULL && !solist_init()) {
+    LOGE("Failed to initialize solist");
+
+    return false;
+  }
+
+  for (SoInfo *iter = solist; iter; iter = get_next(iter)) {
+    if (get_path(iter) && strstr(get_path(iter), target_path)) {
+      pdg_protect();
+
+      LOGV("dropping solist record loaded at %s with size %zu", get_path(iter), get_size(iter));
+      if (get_size(iter) > 0) {
+        set_size(iter, 0);
+        soinfo_free(iter);
+
+        pdg_unprotect();
+
+        return true;
+      }
+
+      pdg_unprotect();
+    }
+  }
+
+  return false;
+}
+
+void solist_reset_counters(size_t load, size_t unload) {
+  if (solist == NULL && !solist_init()) {
+    LOGE("Failed to initialize solist");
+
+    return;
+  }
+
+  if (g_module_load_counter == NULL || g_module_unload_counter == NULL) {
+    LOGD("g_module counters not defined, skip reseting them");
+
+    return;
+  }
+
+  uint64_t loaded_modules = *g_module_load_counter;
+  uint64_t unloaded_modules = *g_module_unload_counter;
+
+  if (loaded_modules >= load) {
+    *g_module_load_counter = loaded_modules - load;
+
+    LOGD("reset g_module_load_counter to %zu", (size_t) *g_module_load_counter);
+  }
+
+  if (unloaded_modules >= unload) {
+    *g_module_unload_counter = unloaded_modules - unload;
+
+    LOGD("reset g_module_unload_counter to %zu", (size_t) *g_module_unload_counter);
+  }
+}

loader/src/injector/solist.h

@@ -0,0 +1,65 @@
+#ifndef SOLIST_H
+#define SOLIST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef struct SoInfo SoInfo;
+
+struct SoInfo {
+  char data[0];
+};
+
+#define FuncType(name) void (*name)
+
+struct pdg {
+  void *(*ctor)();
+  void *(*dtor)();
+};
+
+/* 
+  INFO: When dlopen'ing a library, the system will save information of the
+          opened library so a structure called soinfo, which contains another
+          called solist, a list with the information of opened objects.
+
+        Due to special handling in ptracer, however, it won't heave gaps in the
+          memory of the list since we will remove the info immediatly after loading
+          libzygisk.so, so that it doesn't create gaps between current module info
+          and the next (soinfo).
+
+        To do that, we use 2 functions: soinfo_free, and set_size, which will
+          zero the region size, and then remove all traces of that library (libzygisk.so)
+          which was previously loaded.
+
+  SOURCES:
+   - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1712
+*/
+bool solist_drop_so_path(const char *target_path);
+
+/* 
+  INFO: When dlopen'ing a library, the system will increment 1 to a global
+          counter that tracks the amount of libraries ever loaded in that process,
+          the same happening in dlclose.
+
+        This cannot directly be used to detect if ReZygisk is present, however, with
+          enough data about specific environments, this can be used to detect if any
+          other library (be it malicious or not) was loaded. To avoid future detections,
+          we patch that value to the original value.
+
+        To do that, we retrieve the address of both "g_module_load_counter" and "g_module
+          _unload_counter" variables and force set them to the original value, based on
+          the modules dlopen'ed.
+
+  SOURCES:
+   - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1874
+   - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1944
+   - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#3413
+*/
+void solist_reset_counters(size_t load, size_t unload);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SOLIST_H */

loader/src/injector/unmount.cpp

@@ -1,122 +0,0 @@
-#include <mntent.h>
-#include <sys/mount.h>
-
-#include "files.hpp"
-#include "logging.h"
-#include "misc.hpp"
-#include "zygisk.hpp"
-
-using namespace std::string_view_literals;
-
-namespace {
-    constexpr auto MODULE_DIR = "/data/adb/modules";
-
-    struct overlay_backup {
-        std::string target;
-        std::string vfs_option;
-        std::string fs_option;
-    };
-
-    void lazy_unmount(const char* mountpoint) {
-        if (umount2(mountpoint, MNT_DETACH) != -1) {
-            LOGD("Unmounted (%s)", mountpoint);
-        } else {
-            PLOGE("Unmount (%s)", mountpoint);
-        }
-    }
-}
-
-#define PARSE_OPT(name, flag)   \
-    if (opt == (name)) {        \
-        flags |= (flag);        \
-        return true;            \
-    }
-
-void revert_unmount_ksu() {
-    std::string ksu_loop;
-    std::vector<std::string> targets;
-    std::list<overlay_backup> backups;
-
-    // Unmount ksu module dir last
-    targets.emplace_back(MODULE_DIR);
-
-    for (auto& info: parse_mount_info("self")) {
-        if (info.target == MODULE_DIR) {
-            ksu_loop = info.source;
-            continue;
-        }
-        // Unmount everything on /data/adb except ksu module dir
-        if (info.target.starts_with("/data/adb")) {
-            targets.emplace_back(info.target);
-        }
-        // Unmount ksu overlays
-        if (info.type == "overlay") {
-            if (str_contains(info.fs_option, MODULE_DIR)) {
-                targets.emplace_back(info.target);
-            } else {
-                auto backup = overlay_backup{
-                        .target = info.target,
-                        .vfs_option = info.vfs_option,
-                        .fs_option = info.fs_option,
-                };
-                backups.emplace_back(backup);
-            }
-        }
-    }
-    for (auto& info: parse_mount_info("self")) {
-        // Unmount everything from ksu loop except ksu module dir
-        if (info.source == ksu_loop && info.target != MODULE_DIR) {
-            targets.emplace_back(info.target);
-        }
-    }
-
-    // Do unmount
-    for (auto& s: reversed(targets)) {
-        lazy_unmount(s.data());
-    }
-
-    // Affirm unmounted system overlays
-    for (auto& info: parse_mount_info("self")) {
-        if (info.type == "overlay") {
-            backups.remove_if([&](overlay_backup& mnt) {
-                return mnt.target == info.target && mnt.fs_option == info.fs_option;
-            });
-        }
-    }
-
-    // Restore system overlays
-    for (auto& mnt: backups) {
-        auto opts = split_str(mnt.vfs_option, ",");
-        opts.splice(opts.end(), split_str(mnt.fs_option, ","));
-        unsigned long flags = 0;
-        opts.remove_if([&](auto& opt) {
-            PARSE_OPT(MNTOPT_RO, MS_RDONLY)
-            PARSE_OPT(MNTOPT_NOSUID, MS_NOSUID)
-            PARSE_OPT("relatime", MS_RELATIME)
-            return false;
-        });
-        auto mnt_data = join_str(opts, ",");
-        if (mount("overlay", mnt.target.data(), "overlay", flags, mnt_data.data()) != -1) {
-            LOGD("Remounted (%s)", mnt.target.data());
-        } else {
-            PLOGE("Remount (%s, %s)", mnt.target.data(), mnt.fs_option.data());
-        }
-    }
-}
-
-void revert_unmount_magisk() {
-    std::vector<std::string> targets;
-
-    // Unmount dummy skeletons and MAGISKTMP
-    // since mirror nodes are always mounted under skeleton, we don't have to specifically unmount
-    for (auto& info: parse_mount_info("self")) {
-        if (info.source == "magisk" || info.source == "worker" || // magisktmp tmpfs
-            info.root.starts_with("/adb/modules")) { // bind mount from data partition
-            targets.push_back(info.target);
-        }
-    }
-
-    for (auto& s: reversed(targets)) {
-        lazy_unmount(s.data());
-    }
-}

loader/src/injector/zygisk.hpp

@@ -1,14 +1,10 @@
 #pragma once
 
-#include <stdint.h>
 #include <jni.h>
-#include <vector>
 
-extern void *self_handle;
+extern void *start_addr;
+extern size_t block_size;
 
 void hook_functions();
 
-void revert_unmount_ksu();
-
-void revert_unmount_magisk();
-
+void clean_trace(const char* path, size_t load = 1, size_t unload = 0, bool spoof_maps = false);

loader/src/loader/loader.cpp

@@ -1,100 +0,0 @@
-#include <string_view>
-#include <sys/system_properties.h>
-#include <unistd.h>
-#include <array>
-
-#include "daemon.h"
-#include "dl.h"
-#include "logging.h"
-#include "native_bridge_callbacks.h"
-
-extern "C" [[gnu::visibility("default")]]
-uint8_t NativeBridgeItf[sizeof(NativeBridgeCallbacks<__ANDROID_API_R__>) * 2]{0};
-
-namespace {
-    constexpr auto kZygoteProcesses = {"zygote", "zygote32", "zygote64", "usap32", "usap64"};
-    constexpr auto kInjector = "/system/" LP_SELECT("lib", "lib64") "/libzygisk_injector.so";
-
-    void* sOriginalBridge = nullptr;
-}
-
-__used __attribute__((destructor))
-void Destructor() {
-    if (sOriginalBridge) {
-        dlclose(sOriginalBridge);
-    }
-}
-
-__used __attribute__((constructor))
-void Constructor() {
-    if (getuid() != 0) {
-        return;
-    }
-
-    std::string_view cmdline = getprogname();
-    if (std::none_of(
-            kZygoteProcesses.begin(), kZygoteProcesses.end(),
-            [&](const char* p) { return cmdline == p; }
-    )) {
-        LOGW("Not started as zygote (cmdline=%s)", cmdline.data());
-        return;
-    }
-
-    std::string native_bridge;
-    do {
-        if (!zygiskd::PingHeartbeat()) break;
-#ifdef NDEBUG
-        logging::setfd(zygiskd::RequestLogcatFd());
-#endif
-        LOGI("Read native bridge");
-        native_bridge = zygiskd::ReadNativeBridge();
-
-        LOGI("Load injector");
-        auto handle = DlopenExt(kInjector, RTLD_NOW);
-        if (handle == nullptr) {
-            LOGE("Failed to dlopen injector: %s", dlerror());
-            break;
-        }
-        auto entry = dlsym(handle, "entry");
-        if (entry == nullptr) {
-            LOGE("Failed to dlsym injector entry: %s", dlerror());
-            dlclose(handle);
-            break;
-        }
-        reinterpret_cast<void (*)(void*)>(entry)(handle);
-    } while (false);
-
-    do {
-        if (native_bridge.empty() || native_bridge == "0") break;
-
-        LOGI("Load original native bridge: %s", native_bridge.data());
-        sOriginalBridge = dlopen(native_bridge.data(), RTLD_NOW);
-        if (sOriginalBridge == nullptr) {
-            LOGE("%s", dlerror());
-            break;
-        }
-
-        auto* original_native_bridge_itf = dlsym(sOriginalBridge, "NativeBridgeItf");
-        if (original_native_bridge_itf == nullptr) {
-            LOGE("%s", dlerror());
-            break;
-        }
-
-        long sdk = 0;
-        char value[PROP_VALUE_MAX + 1];
-        if (__system_property_get("ro.build.version.sdk", value) > 0) {
-            sdk = strtol(value, nullptr, 10);
-        }
-
-        auto callbacks_size = 0;
-        if (sdk >= __ANDROID_API_R__) {
-            callbacks_size = sizeof(NativeBridgeCallbacks<__ANDROID_API_R__>);
-        } else if (sdk == __ANDROID_API_Q__) {
-            callbacks_size = sizeof(NativeBridgeCallbacks<__ANDROID_API_Q__>);
-        }
-
-        memcpy(NativeBridgeItf, original_native_bridge_itf, callbacks_size);
-    } while (false);
-
-    logging::setfd(-1);
-}

loader/src/ptracer/main.c

@@ -0,0 +1,107 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "utils.h"
+#include "monitor.h"
+#include "daemon.h"
+
+int main(int argc, char **argv) {
+  printf("The ReZygisk Tracer %s\n\n", ZKSU_VERSION);
+
+  if (argc >= 2 && strcmp(argv[1], "monitor") == 0) {
+    init_monitor();
+
+    return 0;
+  } else if (argc >= 3 && strcmp(argv[1], "trace") == 0) {
+      if (argc >= 4 && strcmp(argv[3], "--restart") == 0) rezygiskd_zygote_restart();
+
+      long pid = strtol(argv[2], 0, 0);
+      if (!trace_zygote(pid)) {
+        kill(pid, SIGKILL);
+
+        return 1;
+      }
+
+      return 0;
+  } else if (argc >= 2 && strcmp(argv[1], "ctl") == 0) {
+    enum rezygiskd_command command;
+
+    if (strcmp(argv[2], "start") == 0) command = START;
+    else if (strcmp(argv[2], "stop") == 0) command = STOP;
+    else if (strcmp(argv[2], "exit") == 0) command = EXIT;
+    else {
+      printf("[ReZygisk]: Usage: %s ctl <start|stop|exit>\n", argv[0]);
+
+      return 1;
+    }
+
+    if (send_control_command(command) == -1) {
+      printf("[ReZygisk]: Failed to send the command, is the daemon running?\n");
+
+      return 1;
+    }
+
+    printf("[ReZygisk]: command sent\n");
+
+    return 0;
+  } else if (argc >= 2 && strcmp(argv[1], "version") == 0) {
+    /* INFO: Noop*/
+
+    return 0;
+  } else if (argc >= 2 && strcmp(argv[1], "info") == 0) {
+    struct rezygisk_info info;
+    rezygiskd_get_info(&info);
+
+    printf("Daemon process PID: %d\n", info.pid);
+
+    switch (info.root_impl) {
+      case ROOT_IMPL_NONE: {
+        printf("Root implementation: none\n");
+
+        break;
+      }
+      case ROOT_IMPL_APATCH: {
+        printf("Root implementation: APatch\n");
+
+        break;
+      }
+      case ROOT_IMPL_KERNELSU: {
+        printf("Root implementation: KernelSU\n");
+
+        break;
+      }
+      case ROOT_IMPL_MAGISK: {
+        printf("Root implementation: Magisk\n");
+
+        break;
+      }
+    }
+
+    if (info.modules->modules_count != 0) {
+      printf("Modules: %zu\n", info.modules->modules_count);
+
+      for (size_t i = 0; i < info.modules->modules_count; i++) {
+        printf(" - %s\n", info.modules->modules[i]);
+      }
+    } else {
+      printf("Modules: N/A\n");
+    }
+
+    free_rezygisk_info(&info);
+
+    return 0;
+  } else {
+    printf(
+      "Available commands:\n"
+      " - monitor\n"
+      " - trace <pid> [--restart]\n"
+      " - ctl <start|stop|exit>\n"
+      " - version: Shows the version of ReZygisk.\n"
+      " - info: Shows information about the created daemon/injection.\n"
+      "\n"
+      "<...>: Obligatory\n"
+      "[...]: Optional\n");
+
+    return 1;
+  }
+}

loader/src/ptracer/monitor.c

@@ -0,0 +1,907 @@
+#include <stdlib.h>
+
+#include <time.h>
+
+#include <sys/system_properties.h>
+#include <sys/signalfd.h>
+#include <err.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/epoll.h>
+#include <sys/wait.h>
+#include <sys/mount.h>
+#include <fcntl.h>
+
+#include <unistd.h>
+
+#include "utils.h"
+#include "daemon.h"
+#include "misc.h"
+
+#include "monitor.h"
+
+#define PROP_PATH TMP_PATH "/module.prop"
+#define SOCKET_NAME "init_monitor"
+
+#define STOPPED_WITH(sig, event) WIFSTOPPED(sigchld_status) && (sigchld_status >> 8 == ((sig) | (event << 8)))
+
+static bool update_status(const char *message);
+
+char monitor_stop_reason[32];
+
+enum ptracer_tracing_state {
+  TRACING,
+  STOPPING,
+  STOPPED,
+  EXITING
+};
+
+enum ptracer_tracing_state tracing_state = TRACING;
+
+struct rezygiskd_status {
+  bool supported;
+  bool zygote_injected;
+  bool daemon_running;
+  pid_t daemon_pid;
+  char *daemon_info;
+  char *daemon_error_info;
+};
+
+struct rezygiskd_status status64 = {
+  .supported = false,
+  .zygote_injected = false,
+  .daemon_running = false,
+  .daemon_pid = -1,
+  .daemon_info = NULL,
+  .daemon_error_info = NULL
+};
+struct rezygiskd_status status32 = {
+  .supported = false,
+  .zygote_injected = false,
+  .daemon_running = false,
+  .daemon_pid = -1,
+  .daemon_info = NULL,
+  .daemon_error_info = NULL
+};
+
+int monitor_epoll_fd;
+bool monitor_events_running = true;
+
+bool monitor_events_init() {
+  monitor_epoll_fd = epoll_create(1);
+  if (monitor_epoll_fd == -1) {
+    PLOGE("epoll_create");
+
+    return false;
+  }
+
+  return true;
+}
+
+struct monitor_event_cbs {
+  void (*callback)();
+  void (*stop_callback)();
+};
+
+bool monitor_events_register_event(struct monitor_event_cbs *event_cbs, int fd, uint32_t events) {
+  struct epoll_event ev = {
+    .data.ptr = event_cbs,
+    .events = events
+  };
+
+  if (epoll_ctl(monitor_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
+    PLOGE("epoll_ctl");
+
+    return false;
+  }
+
+  return true;
+}
+
+bool monitor_events_unregister_event(int fd) {
+  if (epoll_ctl(monitor_epoll_fd, EPOLL_CTL_DEL, fd, NULL) == -1) {
+    PLOGE("epoll_ctl");
+
+    return false;
+  }
+
+  return true;
+}
+
+void monitor_events_stop() {
+  monitor_events_running = false;
+};
+
+void monitor_events_loop() {
+  struct epoll_event events[2];
+  while (monitor_events_running) {
+    int nfds = epoll_wait(monitor_epoll_fd, events, 2, -1);
+    if (nfds == -1) {
+      if (errno != EINTR) PLOGE("epoll_wait");
+
+      continue;
+    }
+
+    for (int i = 0; i < nfds; i++) {
+      struct monitor_event_cbs *event_cbs = (struct monitor_event_cbs *)events[i].data.ptr;
+      event_cbs->callback();
+
+      if (!monitor_events_running) break;
+    }
+  }
+
+  if (monitor_epoll_fd >= 0) close(monitor_epoll_fd);
+  monitor_epoll_fd = -1;
+
+  for (int i = 0; i < (int)(sizeof(events) / sizeof(events[0])); i++) {
+    struct monitor_event_cbs *event_cbs = (struct monitor_event_cbs *)events[i].data.ptr;
+    event_cbs->stop_callback();
+  }
+}
+
+int monitor_sock_fd;
+
+bool rezygiskd_listener_init() {
+  monitor_sock_fd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
+  if (monitor_sock_fd == -1) {
+    PLOGE("socket create");
+
+    return false;
+  }
+
+  struct sockaddr_un addr = {
+    .sun_family = AF_UNIX,
+    .sun_path = { 0 }
+  };
+
+  size_t sun_path_len = sprintf(addr.sun_path, "%s/%s", rezygiskd_get_path(), SOCKET_NAME);
+
+  socklen_t socklen = sizeof(sa_family_t) + sun_path_len;
+  if (bind(monitor_sock_fd, (struct sockaddr *)&addr, socklen) == -1) {
+    PLOGE("bind socket");
+
+    return false;
+  }
+
+  return true;
+}
+
+struct __attribute__((__packed__)) MsgHead {
+  unsigned int cmd;
+  int length;
+};
+
+void rezygiskd_listener_callback() {
+  while (1) {
+    struct MsgHead msg = { 0 };
+
+    size_t nread;
+
+    again:
+      nread = read(monitor_sock_fd, &msg, sizeof(msg));
+      if ((int)nread == -1) {
+        if (errno == EAGAIN || errno == EWOULDBLOCK) goto again;
+
+        PLOGE("read socket");
+
+        continue;
+      }
+
+    char *msg_data = NULL;
+
+    if (msg.length != 0) {
+      msg_data = malloc(msg.length);
+      if (!msg_data) {
+        LOGE("malloc msg data failed");
+
+        continue;
+      }
+
+      again_msg_data:
+        nread = read(monitor_sock_fd, msg_data, msg.length);
+        if ((int)nread == -1) {
+          if (errno == EAGAIN || errno == EWOULDBLOCK) goto again_msg_data;
+
+          PLOGE("read socket");
+
+          free(msg_data);
+
+          continue;
+        }
+    }
+
+    switch (msg.cmd) {
+      case START: {
+        if (tracing_state == STOPPING) tracing_state = TRACING;
+        else if (tracing_state == STOPPED) {
+          ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK);
+
+          LOGI("start tracing init");
+
+          tracing_state = TRACING;
+        }
+
+        update_status(NULL);
+
+        break;
+      }
+      case STOP: {
+        if (tracing_state == TRACING) {
+          LOGI("stop tracing requested");
+
+          tracing_state = STOPPING;
+          strcpy(monitor_stop_reason, "user requested");
+
+          ptrace(PTRACE_INTERRUPT, 1, 0, 0);
+          update_status(NULL);
+        }
+
+        break;
+      }
+      case EXIT: {
+        LOGI("prepare for exit ...");
+
+        tracing_state = EXITING;
+        strcpy(monitor_stop_reason, "user requested");
+
+        update_status(NULL);
+        monitor_events_stop();
+
+        break;
+      }
+      case ZYGOTE64_INJECTED: {
+        status64.zygote_injected = true;
+
+        update_status(NULL);
+
+        break;
+      }
+      case ZYGOTE32_INJECTED: {
+        status32.zygote_injected = true;
+
+        update_status(NULL);
+
+        break;
+      }
+      case DAEMON64_SET_INFO: {
+        LOGD("received daemon64 info %s", msg_data);
+
+        /* Will only happen if somehow the daemon restarts */
+        if (status64.daemon_info) {
+          free(status64.daemon_info);
+          status64.daemon_info = NULL;
+        }
+
+        status64.daemon_info = (char *)malloc(msg.length);
+        if (!status64.daemon_info) {
+          PLOGE("malloc daemon64 info");
+
+          break;
+        }
+
+        strcpy(status64.daemon_info, msg_data);
+
+        update_status(NULL);
+
+        break;
+      }
+      case DAEMON32_SET_INFO: {
+        LOGD("received daemon32 info %s", msg_data);
+
+        if (status32.daemon_info) {
+          free(status32.daemon_info);
+          status32.daemon_info = NULL;
+        }
+
+        status32.daemon_info = (char *)malloc(msg.length);
+        if (!status32.daemon_info) {
+          PLOGE("malloc daemon32 info");
+
+          break;
+        }
+
+        strcpy(status32.daemon_info, msg_data);
+
+        update_status(NULL);
+
+        break;
+      }
+      case DAEMON64_SET_ERROR_INFO: {
+        LOGD("received daemon64 error info %s", msg_data);
+
+        status64.daemon_running = false;
+
+        if (status64.daemon_error_info) {
+          free(status64.daemon_error_info);
+          status64.daemon_error_info = NULL;
+        }
+
+        status64.daemon_error_info = (char *)malloc(msg.length);
+        if (!status64.daemon_error_info) {
+          PLOGE("malloc daemon64 error info");
+
+          break;
+        }
+
+        strcpy(status64.daemon_error_info, msg_data);
+
+        update_status(NULL);
+
+        break;
+      }
+      case DAEMON32_SET_ERROR_INFO: {
+        LOGD("received daemon32 error info %s", msg_data);
+
+        status32.daemon_running = false;
+
+        if (status32.daemon_error_info) {
+          free(status32.daemon_error_info);
+          status32.daemon_error_info = NULL;
+        }
+
+        status32.daemon_error_info = (char *)malloc(msg.length);
+        if (!status32.daemon_error_info) {
+          PLOGE("malloc daemon32 error info");
+
+          break;
+        }
+
+        strcpy(status32.daemon_error_info, msg_data);
+
+        update_status(NULL);
+
+        break;
+      }
+      case SYSTEM_SERVER_STARTED: {
+        LOGD("system server started, mounting prop");
+
+        if (mount(PROP_PATH, "/data/adb/modules/rezygisk/module.prop", NULL, MS_BIND, NULL) == -1) {
+          PLOGE("failed to mount prop");
+        }
+
+        break;
+      }
+    }
+
+    if (msg_data) free(msg_data);
+
+    break;
+  }
+}
+
+void rezygiskd_listener_stop() {
+  if (monitor_sock_fd >= 0) close(monitor_sock_fd);
+  monitor_sock_fd = -1;
+}
+
+#define MAX_RETRY_COUNT 5
+
+#define CREATE_ZYGOTE_START_COUNTER(abi)             \
+  struct timespec last_zygote##abi = {               \
+    .tv_sec = 0,                                     \
+    .tv_nsec = 0                                     \
+  };                                                 \
+                                                     \
+  int count_zygote ## abi = 0;                       \
+  bool should_stop_inject ## abi() {                 \
+    struct timespec now = {};                        \
+    clock_gettime(CLOCK_MONOTONIC, &now);            \
+    if (now.tv_sec - last_zygote ## abi.tv_sec < 30) \
+      count_zygote ## abi++;                         \
+    else                                             \
+      count_zygote ## abi = 0;                       \
+                                                     \
+    last_zygote##abi = now;                          \
+                                                     \
+    return count_zygote##abi >= MAX_RETRY_COUNT;     \
+  }
+
+CREATE_ZYGOTE_START_COUNTER(64)
+CREATE_ZYGOTE_START_COUNTER(32)
+
+static bool ensure_daemon_created(bool is_64bit) {
+  struct rezygiskd_status *status = is_64bit ? &status64 : &status32;
+
+  if (is_64bit || (!is_64bit && !status64.supported)) {
+    LOGD("new zygote started.");
+
+    umount2("/data/adb/modules/rezygisk/module.prop", MNT_DETACH);
+  }
+
+  if (status->daemon_pid != -1) {
+    LOGI("daemon%s already running", is_64bit ? "64" : "32");
+
+    return status->daemon_running;
+  }
+
+  pid_t pid = fork();
+  if (pid < 0) {
+    PLOGE("create daemon%s", is_64bit ? "64" : "32");
+
+    return false;
+  }
+
+  if (pid == 0) {
+    char daemon_name[PATH_MAX] = "./bin/zygiskd";
+    strcat(daemon_name, is_64bit ? "64" : "32");
+
+    execl(daemon_name, daemon_name, NULL);
+
+    PLOGE("exec daemon %s failed", daemon_name);
+
+    exit(1);
+  }
+
+  status->supported = true;
+  status->daemon_pid = pid;
+  status->daemon_running = true;
+
+  return true;
+}
+
+#define CHECK_DAEMON_EXIT(abi)                                                   \
+  if (status##abi.supported && pid == status##abi.daemon_pid) {                  \
+    char status_str[64];                                                         \
+    parse_status(sigchld_status, status_str, sizeof(status_str));                \
+                                                                                 \
+    LOGW("daemon" #abi " pid %d exited: %s", pid, status_str);                   \
+    status##abi.daemon_running = false;                                          \
+                                                                                 \
+    if (!status##abi.daemon_error_info) {                                        \
+      status##abi.daemon_error_info = (char *)malloc(strlen(status_str) + 1);    \
+      if (!status##abi.daemon_error_info) {                                      \
+        LOGE("malloc daemon" #abi " error info failed");                         \
+                                                                                 \
+        return;                                                                  \
+      }                                                                          \
+                                                                                 \
+      memcpy(status##abi.daemon_error_info, status_str, strlen(status_str) + 1); \
+    }                                                                            \
+                                                                                 \
+    update_status(NULL);                                                         \
+    continue;                                                                    \
+  }
+
+#define PRE_INJECT(abi, is_64)                                                         \
+  if (strcmp(program, "/system/bin/app_process" # abi) == 0) {                         \
+    tracer = "./bin/zygisk-ptrace" # abi;                                              \
+                                                                                       \
+    if (should_stop_inject ## abi()) {                                                 \
+      LOGW("zygote" # abi " restart too much times, stop injecting");                  \
+                                                                                       \
+      tracing_state = STOPPING;                                                        \
+      memcpy(monitor_stop_reason, "zygote crashed", sizeof("zygote crashed"));         \
+      ptrace(PTRACE_INTERRUPT, 1, 0, 0);                                               \
+                                                                                       \
+      break;                                                                           \
+    }                                                                                  \
+    if (!ensure_daemon_created(is_64)) {                                               \
+      LOGW("daemon" #abi " not running, stop injecting");                              \
+                                                                                       \
+      tracing_state = STOPPING;                                                        \
+      memcpy(monitor_stop_reason, "daemon not running", sizeof("daemon not running")); \
+      ptrace(PTRACE_INTERRUPT, 1, 0, 0);                                               \
+                                                                                       \
+      break;                                                                           \
+    }                                                                                  \
+  }
+
+int sigchld_signal_fd;
+struct signalfd_siginfo sigchld_fdsi;
+int sigchld_status;
+
+pid_t *sigchld_process;
+size_t sigchld_process_count = 0;
+
+bool sigchld_listener_init() {
+  sigchld_process = NULL;
+
+  sigset_t mask;
+  sigemptyset(&mask);
+  sigaddset(&mask, SIGCHLD);
+
+  if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) {
+    PLOGE("set sigprocmask");
+
+    return false;
+  }
+
+  sigchld_signal_fd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC);
+  if (sigchld_signal_fd == -1) {
+    PLOGE("create signalfd");
+
+    return false;
+  }
+
+  ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK);
+
+  return true;
+}
+
+void sigchld_listener_callback() {
+  while (1) {
+    ssize_t s = read(sigchld_signal_fd, &sigchld_fdsi, sizeof(sigchld_fdsi));
+    if (s == -1) {
+      if (errno == EAGAIN) break;
+
+      PLOGE("read signalfd");
+
+      continue;
+    }
+
+    if (s != sizeof(sigchld_fdsi)) {
+      LOGW("read %zu != %zu", s, sizeof(sigchld_fdsi));
+
+      continue;
+    }
+
+    if (sigchld_fdsi.ssi_signo != SIGCHLD) {
+      LOGW("no sigchld received");
+
+      continue;
+    }
+
+    int pid;
+    while ((pid = waitpid(-1, &sigchld_status, __WALL | WNOHANG)) != 0) {
+      if (pid == -1) {
+        if (tracing_state == STOPPED && errno == ECHILD) break;
+        PLOGE("waitpid");
+      }
+
+      if (pid == 1) {
+        if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_FORK)) {
+          long child_pid;
+
+          ptrace(PTRACE_GETEVENTMSG, pid, 0, &child_pid);
+
+          LOGV("forked %ld", child_pid);
+        } else if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_STOP) && tracing_state == STOPPING) {
+          if (ptrace(PTRACE_DETACH, 1, 0, 0) == -1) PLOGE("failed to detach init");
+
+          tracing_state = STOPPED;
+
+          LOGI("stop tracing init");
+
+          continue;
+        }
+
+        if (WIFSTOPPED(sigchld_status)) {
+          if (WPTEVENT(sigchld_status) == 0) {
+            if (WSTOPSIG(sigchld_status) != SIGSTOP && WSTOPSIG(sigchld_status) != SIGTSTP && WSTOPSIG(sigchld_status) != SIGTTIN && WSTOPSIG(sigchld_status) != SIGTTOU) {
+              LOGW("inject signal sent to init: %s %d", sigabbrev_np(WSTOPSIG(sigchld_status)), WSTOPSIG(sigchld_status));
+
+              ptrace(PTRACE_CONT, pid, 0, WSTOPSIG(sigchld_status));
+
+              continue;
+            } else {
+              LOGW("suppress stopping signal sent to init: %s %d", sigabbrev_np(WSTOPSIG(sigchld_status)), WSTOPSIG(sigchld_status));
+            }
+          }
+
+          ptrace(PTRACE_CONT, pid, 0, 0);
+        }
+
+        continue;
+      }
+
+      CHECK_DAEMON_EXIT(64)
+      CHECK_DAEMON_EXIT(32)
+
+      pid_t state = 0;
+      for (size_t i = 0; i < sigchld_process_count; i++) {
+        if (sigchld_process[i] != pid) continue;
+
+        state = sigchld_process[i];
+
+        break;
+      }
+
+      if (state == 0) {
+        LOGV("new process %d attached", pid);
+
+        for (size_t i = 0; i < sigchld_process_count; i++) {
+          if (sigchld_process[i] != 0) continue;
+
+          sigchld_process[i] = pid;
+
+          goto ptrace_process;
+        }
+
+        sigchld_process = (pid_t *)realloc(sigchld_process, sizeof(pid_t) * (sigchld_process_count + 1));
+        if (sigchld_process == NULL) {
+          PLOGE("realloc sigchld_process");
+
+          continue;
+        }
+
+        sigchld_process[sigchld_process_count] = pid;
+        sigchld_process_count++;
+
+        ptrace_process:
+
+        ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACEEXEC);
+        ptrace(PTRACE_CONT, pid, 0, 0);
+
+        continue;
+      } else {
+        if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_EXEC)) {
+          char program[PATH_MAX];
+          if (get_program(pid, program, sizeof(program)) == -1) {
+            LOGW("failed to get program %d", pid);
+
+            continue;
+          }
+
+          LOGV("%d program %s", pid, program);
+          const char* tracer = NULL;
+
+          do {
+            if (tracing_state != TRACING) {
+              LOGW("stop injecting %d because not tracing", pid);
+
+              break;
+            }
+
+            PRE_INJECT(64, true)
+            PRE_INJECT(32, false)
+
+            if (tracer != NULL) {
+              LOGD("stopping %d", pid);
+
+              kill(pid, SIGSTOP);
+              ptrace(PTRACE_CONT, pid, 0, 0);
+              waitpid(pid, &sigchld_status, __WALL);
+
+              if (STOPPED_WITH(SIGSTOP, 0)) {
+                LOGD("detaching %d", pid);
+
+                ptrace(PTRACE_DETACH, pid, 0, SIGSTOP);
+                sigchld_status = 0;
+                int p = fork_dont_care();
+
+                if (p == 0) {
+                  char pid_str[32];
+                  sprintf(pid_str, "%d", pid);
+
+                  execl(tracer, basename(tracer), "trace", pid_str, "--restart", NULL);
+
+                  PLOGE("failed to exec, kill");
+
+                  kill(pid, SIGKILL);
+                  exit(1);
+                } else if (p == -1) {
+                  PLOGE("failed to fork, kill");
+
+                  kill(pid, SIGKILL);
+                }
+              }
+            }
+          } while (false);
+
+          update_status(NULL);
+        } else {
+          char status_str[64];
+          parse_status(sigchld_status, status_str, sizeof(status_str));
+
+          LOGW("process %d received unknown sigchld_status %s", pid, status_str);
+        }
+
+        for (size_t i = 0; i < sigchld_process_count; i++) {
+          if (sigchld_process[i] != pid) continue;
+
+          sigchld_process[i] = 0;
+
+          break;
+        }
+
+        if (WIFSTOPPED(sigchld_status)) {
+          LOGV("detach process %d", pid);
+
+          ptrace(PTRACE_DETACH, pid, 0, 0);
+        }
+      }
+    }
+  }
+}
+
+void sigchld_listener_stop() {
+  if (sigchld_signal_fd >= 0) close(sigchld_signal_fd);
+  sigchld_signal_fd = -1;
+
+  if (sigchld_process != NULL) free(sigchld_process);
+  sigchld_process = NULL;
+  sigchld_process_count = 0;
+}
+
+static char pre_section[1024];
+static char post_section[1024];
+
+#define WRITE_STATUS_ABI(suffix)                                                     \
+  if (status ## suffix.supported) {                                                  \
+    strcat(status_text, " zygote" # suffix ": ");                                    \
+    if (tracing_state != TRACING) strcat(status_text, "❓ unknown, ");               \
+    else if (status ## suffix.zygote_injected) strcat(status_text, "😋 injected, "); \
+    else strcat(status_text, "❌ not injected, ");                                   \
+                                                                                     \
+    strcat(status_text, "daemon" # suffix ": ");                                     \
+    if (status ## suffix.daemon_running) {                                           \
+      strcat(status_text, "😋 running ");                                            \
+                                                                                     \
+      if (status ## suffix.daemon_info != NULL) {                                    \
+        strcat(status_text, "(");                                                    \
+        strcat(status_text, status ## suffix.daemon_info);                           \
+        strcat(status_text, ")");                                                    \
+      }                                                                              \
+    } else {                                                                         \
+      strcat(status_text, "❌ crashed ");                                            \
+                                                                                     \
+      if (status ## suffix.daemon_error_info != NULL) {                              \
+        strcat(status_text, "(");                                                    \
+        strcat(status_text, status ## suffix.daemon_error_info);                     \
+        strcat(status_text, ")");                                                    \
+      }                                                                              \
+    }                                                                                \
+  }
+
+static bool update_status(const char *message) {
+  FILE *prop = fopen(PROP_PATH, "w");
+  if (prop == NULL) {
+    PLOGE("failed to open prop");
+
+    return false;
+  }
+
+  if (message) {
+    fprintf(prop, "%s[%s] %s", pre_section, message, post_section);
+    fclose(prop);
+
+    return true;
+  }
+
+  char status_text[1024] = "monitor: ";
+
+  switch (tracing_state) {
+    case TRACING: {
+      strcat(status_text, "😋 tracing");
+
+      break;
+    }
+    case STOPPING: [[fallthrough]];
+    case STOPPED: {
+      strcat(status_text, "❌ stopped");
+
+      break;
+    }
+    case EXITING: {
+      strcat(status_text, "❌ exited");
+
+      break;
+    }
+  }
+
+  if (tracing_state != TRACING && monitor_stop_reason[0] != '\0') {
+    strcat(status_text, " (");
+    strcat(status_text, monitor_stop_reason);
+    strcat(status_text, ")");
+  }
+  strcat(status_text, ",");
+
+  WRITE_STATUS_ABI(64)
+  WRITE_STATUS_ABI(32)
+
+  fprintf(prop, "%s[%s] %s", pre_section, status_text, post_section);
+
+  fclose(prop);
+
+  return true;
+}
+
+static bool prepare_environment() {
+  /* INFO: We need to create the file first, otherwise the mount will fail */
+  close(open(PROP_PATH, O_WRONLY | O_CREAT | O_TRUNC, 0644));
+
+  FILE *orig_prop = fopen("/data/adb/modules/rezygisk/module.prop", "r");
+  if (orig_prop == NULL) {
+    PLOGE("failed to open orig prop");
+
+    return false;
+  }
+
+  bool after_description = false;
+
+  char line[1024];
+  while (fgets(line, sizeof(line), orig_prop) != NULL) {
+    if (strncmp(line, "description=", strlen("description=")) == 0) {
+      strcat(pre_section, "description=");
+      strcat(post_section, line + strlen("description="));
+      after_description = true;
+
+      continue;
+    }
+
+    if (after_description) strcat(post_section, line);
+    else strcat(pre_section, line);
+  }
+
+  fclose(orig_prop);
+
+  /* INFO: This environment variable is related to Magisk Zygisk/Manager. It
+             it used by Magisk's Zygisk to communicate to Magisk Manager whether
+             Zygisk is working or not.
+
+           Because of that behavior, we can knowledge built-in Zygisk is being
+             used and stop the continuation of initialization of ReZygisk.*/
+  if (getenv("ZYGISK_ENABLED")) {
+    update_status("❌ Disable Magisk's built-in Zygisk");
+
+    return false;
+  }
+
+  return update_status(NULL);
+}
+
+void init_monitor() {
+  LOGI("ReZygisk %s", ZKSU_VERSION);
+
+  if (!prepare_environment()) exit(1);
+
+  monitor_events_init();
+
+  struct monitor_event_cbs listener_cbs = {
+    .callback = rezygiskd_listener_callback,
+    .stop_callback = rezygiskd_listener_stop
+  };
+  if (!rezygiskd_listener_init()) {
+    LOGE("failed to create socket");
+
+    close(monitor_epoll_fd);
+
+    exit(1);
+  }
+
+  monitor_events_register_event(&listener_cbs, monitor_sock_fd, EPOLLIN | EPOLLET);
+
+  struct monitor_event_cbs sigchld_cbs = {
+    .callback = sigchld_listener_callback,
+    .stop_callback = sigchld_listener_stop
+  };
+  if (sigchld_listener_init() == false) {
+    LOGE("failed to create signalfd");
+
+    rezygiskd_listener_stop();
+    close(monitor_epoll_fd);
+
+    exit(1);
+  }
+
+  monitor_events_register_event(&sigchld_cbs, sigchld_signal_fd, EPOLLIN | EPOLLET);
+
+  monitor_events_loop();
+
+  if (status64.daemon_info) free(status64.daemon_info);
+  if (status64.daemon_error_info) free(status64.daemon_error_info);
+  if (status32.daemon_info) free(status32.daemon_info);
+  if (status32.daemon_error_info) free(status32.daemon_error_info);
+
+  LOGI("exit");
+}
+
+int send_control_command(enum rezygiskd_command cmd) {
+  int sockfd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+  if (sockfd == -1) return -1;
+
+  struct sockaddr_un addr = {
+    .sun_family = AF_UNIX,
+    .sun_path = { 0 }
+  };
+
+  size_t sun_path_len = snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", rezygiskd_get_path(), SOCKET_NAME);
+
+  socklen_t socklen = sizeof(sa_family_t) + sun_path_len;
+
+  ssize_t nsend = sendto(sockfd, (void *)&cmd, sizeof(cmd), 0, (struct sockaddr *)&addr, socklen);
+
+  close(sockfd);
+
+  return nsend != sizeof(cmd) ? -1 : 0;
+}

loader/src/ptracer/monitor.h

@@ -0,0 +1,27 @@
+#ifndef MONITOR_H
+#define MONITOR_H
+
+#include <stdbool.h>
+
+void init_monitor();
+
+bool trace_zygote(int pid);
+
+enum rezygiskd_command {
+  START = 1,
+  STOP = 2,
+  EXIT = 3,
+
+  /* sent from daemon */
+  ZYGOTE64_INJECTED = 4,
+  ZYGOTE32_INJECTED = 5,
+  DAEMON64_SET_INFO = 6,
+  DAEMON32_SET_INFO = 7,
+  DAEMON64_SET_ERROR_INFO = 8,
+  DAEMON32_SET_ERROR_INFO = 9,
+  SYSTEM_SERVER_STARTED = 10
+};
+
+int send_control_command(enum rezygiskd_command cmd);
+
+#endif /* MONITOR_H */

loader/src/ptracer/ptracer.c

@@ -0,0 +1,432 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include <sys/ptrace.h>
+#include <sys/auxv.h>
+#include <elf.h>
+#include <link.h>
+#include <sys/wait.h>
+#include <dlfcn.h>
+#include <signal.h>
+
+#include <unistd.h>
+
+#include "utils.h"
+
+bool inject_on_main(int pid, const char *lib_path) {
+  LOGI("injecting %s to zygote %d", lib_path, pid);
+
+  /*
+    parsing KernelArgumentBlock
+
+    https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/private/KernelArgumentBlock.h;l=30;drc=6d1ee77ee32220e4202c3066f7e1f69572967ad8
+  */
+
+  struct user_regs_struct regs = { 0 };
+
+  char pid_maps[PATH_MAX];
+  snprintf(pid_maps, sizeof(pid_maps), "/proc/%d/maps", pid);
+
+  struct maps *map = parse_maps(pid_maps);
+  if (map == NULL) {
+    LOGE("failed to parse remote maps");
+
+    return false;
+  }
+
+  if (!get_regs(pid, &regs)) return false;
+
+  uintptr_t arg = (uintptr_t)regs.REG_SP;
+
+  char addr_mem_region[1024];
+  get_addr_mem_region(map, arg, addr_mem_region, sizeof(addr_mem_region));
+
+  LOGV("kernel argument %" PRIxPTR " %s", arg, addr_mem_region);
+
+  int argc;
+  char **argv = (char **)((uintptr_t *)arg + 1);
+  LOGV("argv %p", (void *)argv);
+
+  read_proc(pid, arg, &argc, sizeof(argc));
+  LOGV("argc %d", argc);
+
+  char **envp = argv + argc + 1;
+  LOGV("envp %p", (void *)envp);
+
+  char **p = envp;
+  while (1) {
+    uintptr_t *buf;
+    read_proc(pid, (uintptr_t)p, &buf, sizeof(buf));
+
+    if (buf == NULL) break;
+
+    /* TODO: Why ++p? */
+    p++;
+  }
+
+  /* TODO: Why ++p? */
+  p++;
+
+  ElfW(auxv_t) *auxv = (ElfW(auxv_t) *)p;
+
+  get_addr_mem_region(map, (uintptr_t)auxv, addr_mem_region, sizeof(addr_mem_region));
+  LOGV("auxv %p %s", auxv, addr_mem_region);
+
+  ElfW(auxv_t) *v = auxv;
+  uintptr_t entry_addr = 0;
+  uintptr_t addr_of_entry_addr = 0;
+
+  while (1) {
+    ElfW(auxv_t) buf;
+
+    read_proc(pid, (uintptr_t)v, &buf, sizeof(buf));
+
+    if (buf.a_type == AT_ENTRY) {
+      entry_addr = (uintptr_t)buf.a_un.a_val;
+      addr_of_entry_addr = (uintptr_t)v + offsetof(ElfW(auxv_t), a_un);
+
+      get_addr_mem_region(map, entry_addr, addr_mem_region, sizeof(addr_mem_region));
+      LOGV("entry address %" PRIxPTR " %s (entry=%" PRIxPTR ", entry_addr=%" PRIxPTR ")", entry_addr,
+            addr_mem_region, (uintptr_t)v, addr_of_entry_addr);
+
+      break;
+    }
+
+    if (buf.a_type == AT_NULL) break;
+
+    v++;
+  }
+
+  if (entry_addr == 0) {
+    LOGE("failed to get entry");
+
+    return false;
+  }
+
+  /*
+    Replace the program entry with an invalid address
+    For arm32 compatibility, we set the last bit to the same as the entry address
+  */
+
+  /* INFO: (-0x0F & ~1) is a value below zero, while the one after "|"
+            is an unsigned (must be 0 or greater) value, so we must
+            cast the second value to signed long (intptr_t) to avoid
+            undefined behavior.
+  */
+  uintptr_t break_addr = (uintptr_t)((intptr_t)(-0x0F & ~1) | (intptr_t)((uintptr_t)entry_addr & 1));
+  if (!write_proc(pid, (uintptr_t)addr_of_entry_addr, &break_addr, sizeof(break_addr))) return false;
+
+  ptrace(PTRACE_CONT, pid, 0, 0);
+
+  int status;
+  wait_for_trace(pid, &status, __WALL);
+  if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGSEGV) {
+    if (!get_regs(pid, &regs)) return false;
+
+    if (((int)regs.REG_IP & ~1) != ((int)break_addr & ~1)) {
+      LOGE("stopped at unknown addr %p", (void *) regs.REG_IP);
+
+      return false;
+    }
+
+    /* The linker has been initialized now, we can do dlopen */
+    LOGD("stopped at entry");
+
+    /* restore entry address */
+    if (!write_proc(pid, (uintptr_t) addr_of_entry_addr, &entry_addr, sizeof(entry_addr))) return false;
+
+    /* backup registers */
+    struct user_regs_struct backup;
+    memcpy(&backup, &regs, sizeof(regs));
+
+    free_maps(map);
+
+    map = parse_maps(pid_maps);
+    if (!map) {
+      LOGE("failed to parse remote maps");
+
+      return false;
+    }
+
+    struct maps *local_map = parse_maps("/proc/self/maps");
+    if (!local_map) {
+      LOGE("failed to parse local maps");
+
+      return false;
+    }
+
+    void *libc_return_addr = find_module_return_addr(map, "libc.so");
+    LOGD("libc return addr %p", libc_return_addr);
+
+    /* call dlopen */
+    #ifdef __LP64__
+      void *dlopen_addr = find_func_addr(local_map, map, "/apex/com.android.runtime/lib64/bionic/libdl.so", "dlopen");
+    #else
+      void *dlopen_addr = find_func_addr(local_map, map, "/apex/com.android.runtime/lib/bionic/libdl.so", "dlopen");
+    #endif
+    if (dlopen_addr == NULL) {
+      /* INFO: Android 7.1 and below doesn't have libdl.so loaded in Zygote */
+      LOGW("Failed to find dlopen from libdl.so, will load from linker");
+
+      dlopen_addr = find_func_addr(local_map, map, "/system/bin/linker", "__dl_dlopen");
+      if (dlopen_addr == NULL) {
+        PLOGE("Find __dl_dlopen");
+
+        free_maps(local_map);
+        free_maps(map);
+
+        return false;
+      }
+    }
+
+    long *args = (long *)malloc(3 * sizeof(long));
+    if (args == NULL) {
+      LOGE("malloc args");
+
+      return false;
+    }
+
+    uintptr_t str = push_string(pid, &regs, lib_path);
+
+    args[0] = (long) str;
+    args[1] = (long) RTLD_NOW;
+
+    uintptr_t remote_handle = remote_call(pid, &regs, (uintptr_t)dlopen_addr, (uintptr_t)libc_return_addr, args, 2);
+    LOGD("remote handle %p", (void *)remote_handle);
+    if (remote_handle == 0) {
+      LOGE("handle is null");
+
+      /* call dlerror */
+      #ifdef __LP64__
+        void *dlerror_addr = find_func_addr(local_map, map, "/apex/com.android.runtime/lib64/bionic/libdl.so", "dlerror");
+      #else
+        void *dlerror_addr = find_func_addr(local_map, map, "/apex/com.android.runtime/lib/bionic/libdl.so", "dlerror");
+      #endif
+      if (dlerror_addr == NULL) {
+        /* INFO: Android 7.1 and below doesn't have libdl.so loaded in Zygote */
+        LOGW("Failed to find dlerror from libdl.so, will load from linker");
+
+        dlerror_addr = find_func_addr(local_map, map, "/system/bin/linker", "__dl_dlerror");
+        if (dlerror_addr == NULL) {
+          LOGE("Find __dl_dlerror");
+
+          free(args);
+          free_maps(local_map);
+          free_maps(map);
+
+          return false;
+        }
+      }
+
+      uintptr_t dlerror_str_addr = remote_call(pid, &regs, (uintptr_t)dlerror_addr, (uintptr_t)libc_return_addr, args, 0);
+      LOGD("dlerror str %p", (void *)dlerror_str_addr);
+      if (dlerror_str_addr == 0) {
+        LOGE("dlerror str is null");
+
+        free(args);
+
+        return false;
+      }
+
+      #ifdef __LP64__
+        void *strlen_addr = find_func_addr(local_map, map, "/system/lib64/libc.so", "strlen");
+      #else
+        void *strlen_addr = find_func_addr(local_map, map, "/system/lib/libc.so", "strlen");
+      #endif
+      if (strlen_addr == NULL) {
+        LOGE("find strlen");
+
+        free(args);
+
+        return false;
+      }
+
+      args[0] = (long) dlerror_str_addr;
+
+      uintptr_t dlerror_len = remote_call(pid, &regs, (uintptr_t)strlen_addr, (uintptr_t)libc_return_addr, args, 1);
+      if (dlerror_len <= 0) {
+        LOGE("dlerror len <= 0");
+
+        free(args);
+
+        return false;
+      }
+
+      char *err = (char *)malloc((dlerror_len + 1) * sizeof(char));
+      if (err == NULL) {
+        LOGE("malloc err");
+
+        free(args);
+
+        return false;
+      }
+
+      read_proc(pid, dlerror_str_addr, err, dlerror_len + 1);
+
+      LOGE("dlerror info %s", err);
+
+      free(err);
+      free(args);
+
+      return false;
+    }
+
+    /* call dlsym(handle, "entry") */
+    #ifdef __LP64__
+      void *dlsym_addr = find_func_addr(local_map, map, "/apex/com.android.runtime/lib64/bionic/libdl.so", "dlsym");
+    #else
+      void *dlsym_addr = find_func_addr(local_map, map, "/apex/com.android.runtime/lib/bionic/libdl.so", "dlsym");
+    #endif
+    if (dlsym_addr == NULL) {
+      /* INFO: Android 7.1 and below doesn't have libdl.so loaded in Zygote */
+      LOGW("Failed to find dlsym from libdl.so, will load from linker");
+
+      dlsym_addr = find_func_addr(local_map, map, "/system/bin/linker", "__dl_dlsym");
+      if (dlsym_addr == NULL) {
+        LOGE("find __dl_dlsym");
+
+        free(args);
+        free_maps(local_map);
+        free_maps(map);
+
+        return false;
+      }
+    }
+
+    free_maps(local_map);
+
+    str = push_string(pid, &regs, "entry");
+    args[0] = remote_handle;
+    args[1] = (long) str;
+
+    uintptr_t injector_entry = remote_call(pid, &regs, (uintptr_t)dlsym_addr, (uintptr_t)libc_return_addr, args, 2);
+    LOGD("injector entry %p", (void *)injector_entry);
+    if (injector_entry == 0) {
+      LOGE("injector entry is null");
+
+      return false;
+    }
+
+    /* record the address range of libzygisk.so */
+    map = parse_maps(pid_maps);
+
+    void *start_addr = NULL;
+    size_t block_size = 0;
+
+    for (size_t i = 0; i < map->size; i++) {
+      if (!strstr(map->maps[i].path, "libzygisk.so")) continue;
+
+      if (start_addr == NULL) start_addr = (void *)map->maps[i].start;
+
+      size_t size = map->maps[i].end - map->maps[i].start;
+      block_size += size;
+
+      LOGD("found block %s: [%p-%p] with size %zu", map->maps[i].path, (void *)map->maps[i].start,
+            (void *)map->maps[i].end, size);
+    }
+
+    free_maps(map);
+
+    /* call injector entry(start_addr, block_size, path) */
+    args[0] = (uintptr_t)start_addr;
+    args[1] = block_size;
+    str = push_string(pid, &regs, rezygiskd_get_path());
+    args[2] = (uintptr_t)str;
+
+    remote_call(pid, &regs, injector_entry, (uintptr_t)libc_return_addr, args, 3);
+
+    free(args);
+
+    /* reset pc to entry */
+    backup.REG_IP = (long) entry_addr;
+    LOGD("invoke entry");
+
+    /* restore registers */
+    if (!set_regs(pid, &backup)) return false;
+
+    return true;
+  } else {
+    char status_str[64];
+    parse_status(status, status_str, sizeof(status_str));
+
+    LOGE("stopped by other reason: %s", status_str);
+  }
+
+  return false;
+}
+
+#define STOPPED_WITH(sig, event) (WIFSTOPPED(status) && WSTOPSIG(status) == (sig) && (status >> 16) == (event))
+#define WAIT_OR_DIE wait_for_trace(pid, &status, __WALL);
+#define CONT_OR_DIE                           \
+  if (ptrace(PTRACE_CONT, pid, 0, 0) == -1) { \
+    PLOGE("cont");                            \
+                                              \
+    return false;                             \
+  }
+
+bool trace_zygote(int pid) {
+  LOGI("start tracing %d (tracer %d)", pid, getpid());
+
+  int status;
+
+  if (ptrace(PTRACE_SEIZE, pid, 0, PTRACE_O_EXITKILL) == -1) {
+    PLOGE("seize");
+
+    return false;
+  }
+
+  WAIT_OR_DIE
+
+  if (STOPPED_WITH(SIGSTOP, PTRACE_EVENT_STOP)) {
+    char lib_path[PATH_MAX];
+    snprintf(lib_path, sizeof(lib_path), "%s/lib" LP_SELECT("", "64") "/libzygisk.so", rezygiskd_get_path());
+
+    if (!inject_on_main(pid, lib_path)) {
+      LOGE("failed to inject");
+
+      return false;
+    }
+
+    LOGD("inject done, continue process");
+    if (kill(pid, SIGCONT)) {
+      PLOGE("kill");
+
+      return false;
+    }
+
+    CONT_OR_DIE
+    WAIT_OR_DIE
+
+    if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_STOP)) {
+      CONT_OR_DIE
+      WAIT_OR_DIE
+
+      if (STOPPED_WITH(SIGCONT, 0)) {
+        LOGD("received SIGCONT");
+
+        ptrace(PTRACE_DETACH, pid, 0, SIGCONT);
+      }
+    } else {
+      char status_str[64];
+      parse_status(status, status_str, sizeof(status_str));
+
+      LOGE("unknown state %s, not SIGTRAP + EVENT_STOP", status_str);
+
+      ptrace(PTRACE_DETACH, pid, 0, 0);
+
+      return false;
+    }
+  } else {
+    char status_str[64];
+    parse_status(status, status_str, sizeof(status_str));
+
+    LOGE("unknown state %s, not SIGSTOP + EVENT_STOP", status_str);
+
+    ptrace(PTRACE_DETACH, pid, 0, 0);
+
+    return false;
+  }
+
+  return true;
+}

loader/src/ptracer/utils.c

@@ -0,0 +1,589 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <ctype.h>
+
+#include <sys/sysmacros.h>
+#include <sys/ptrace.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/auxv.h>
+#include <sys/uio.h>
+#include <signal.h>
+#include <dlfcn.h>
+#include <sched.h>
+#include <fcntl.h>
+#include <link.h>
+
+#include <unistd.h>
+#include <linux/limits.h>
+
+#include "elf_util.h"
+
+#include "utils.h"
+
+bool switch_mnt_ns(int pid, int *fd) {
+  int nsfd, old_nsfd = -1;
+
+  char path[PATH_MAX];
+  if (pid == 0) {
+    if (fd != NULL) {
+      nsfd = *fd;
+      *fd = -1;
+    } else return false;
+
+    snprintf(path, sizeof(path), "/proc/self/fd/%d", nsfd);
+  } else {
+    if (fd != NULL) {
+      old_nsfd = open("/proc/self/ns/mnt", O_RDONLY | O_CLOEXEC);
+      if (old_nsfd == -1) {
+        PLOGE("get old nsfd");
+
+        return false;
+      }
+
+      *fd = old_nsfd;
+    }
+
+    snprintf(path, sizeof(path), "/proc/%d/ns/mnt", pid);
+
+    nsfd = open(path, O_RDONLY | O_CLOEXEC);
+    if (nsfd == -1) {
+      PLOGE("open nsfd %s", path);
+
+      close(old_nsfd);
+
+      return false;
+    }
+  }
+
+  if (setns(nsfd, CLONE_NEWNS) == -1) {
+    PLOGE("set ns to %s", path);
+
+    close(nsfd);
+    close(old_nsfd);
+
+    return false;
+  }
+
+  close(nsfd);
+
+  return true;
+}
+
+struct maps *parse_maps(const char *filename) {
+  FILE *fp = fopen(filename, "r");
+  if (!fp) {
+    LOGE("Failed to open %s", filename);
+
+    return NULL;
+  }
+
+  struct maps *maps = (struct maps *)malloc(sizeof(struct maps));
+  if (!maps) {
+    LOGE("Failed to allocate memory for maps");
+
+    fclose(fp);
+
+    return NULL;
+  }
+
+  /* INFO: To ensure in the realloc the libc will know it is meant
+             to allocate, and not reallocate from a garbage address. */
+  maps->maps = NULL;
+
+  char line[4096 * 2];
+  size_t i = 0;
+
+  while (fgets(line, sizeof(line), fp) != NULL) {
+    /* INFO: Remove line ending at the end */
+    line[strlen(line) - 1] = '\0';
+
+    uintptr_t addr_start;
+    uintptr_t addr_end;
+    uintptr_t addr_offset;
+    ino_t inode;
+    unsigned int dev_major;
+    unsigned int dev_minor;
+    char permissions[5] = "";
+    int path_offset;
+
+    sscanf(line,
+           "%" PRIxPTR "-%" PRIxPTR " %4s %" PRIxPTR " %x:%x %lu %n%*s",
+           &addr_start, &addr_end, permissions, &addr_offset, &dev_major, &dev_minor,
+           &inode, &path_offset);
+
+    while (isspace(line[path_offset])) {
+      path_offset++;
+    }
+
+    maps->maps = (struct map *)realloc(maps->maps, (i + 1) * sizeof(struct map));
+    if (!maps->maps) {
+      LOGE("Failed to allocate memory for maps->maps");
+
+      maps->size = i;
+
+      fclose(fp);
+      free_maps(maps);
+
+      return NULL;
+    }
+
+    maps->maps[i].start = addr_start;
+    maps->maps[i].end = addr_end;
+    maps->maps[i].offset = addr_offset;
+
+    maps->maps[i].perms = 0;
+    if (permissions[0] == 'r') maps->maps[i].perms |= PROT_READ;
+    if (permissions[1] == 'w') maps->maps[i].perms |= PROT_WRITE;
+    if (permissions[2] == 'x') maps->maps[i].perms |= PROT_EXEC;
+
+    maps->maps[i].is_private = permissions[3] == 'p';
+    maps->maps[i].dev = makedev(dev_major, dev_minor);
+    maps->maps[i].inode = inode;
+    maps->maps[i].path = strdup(line + path_offset);
+    if (!maps->maps[i].path) {
+      LOGE("Failed to allocate memory for maps->maps[%zu].path", i);
+
+      maps->size = i;
+
+      fclose(fp);
+      free_maps(maps);
+
+      return NULL;
+    }
+
+    i++;
+  }
+
+  fclose(fp);
+
+  maps->size = i;
+
+  return maps;
+}
+
+void free_maps(struct maps *maps) {
+  if (!maps) {
+    return;
+  }
+
+  for (size_t i = 0; i < maps->size; i++) {
+    free((void *)maps->maps[i].path);
+  }
+
+  free(maps->maps);
+  free(maps);
+}
+
+ssize_t write_proc(int pid, uintptr_t remote_addr, const void *buf, size_t len) {
+  LOGV("write to remote addr %" PRIxPTR " size %zu", remote_addr, len);
+
+  struct iovec local = {
+    .iov_base = (void *)buf,
+    .iov_len = len
+  };
+
+  struct iovec remote = {
+    .iov_base = (void *)remote_addr,
+    .iov_len = len
+  };
+
+  ssize_t l = process_vm_writev(pid, &local, 1, &remote, 1, 0);
+  if (l == -1) PLOGE("process_vm_writev");
+  else if ((size_t)l != len) LOGW("not fully written: %zu, excepted %zu", l, len);
+
+  return l;
+}
+
+ssize_t read_proc(int pid, uintptr_t remote_addr, void *buf, size_t len) {
+  struct iovec local = {
+    .iov_base = (void *)buf,
+    .iov_len = len
+  };
+
+  struct iovec remote = {
+    .iov_base = (void *)remote_addr,
+    .iov_len = len
+  };
+
+  ssize_t l = process_vm_readv(pid, &local, 1, &remote, 1, 0);
+  if (l == -1) PLOGE("process_vm_readv");
+  else if ((size_t)l != len) LOGW("not fully read: %zu, excepted %zu", l, len);
+
+  return l;
+}
+
+bool get_regs(int pid, struct user_regs_struct *regs) {
+  #if defined(__x86_64__) || defined(__i386__)
+    if (ptrace(PTRACE_GETREGS, pid, 0, regs) == -1) {
+      PLOGE("getregs");
+
+      return false;
+    }
+  #elif defined(__aarch64__) || defined(__arm__)
+    struct iovec iov = {
+      .iov_base = regs,
+      .iov_len = sizeof(struct user_regs_struct),
+    };
+
+    if (ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov) == -1) {
+      PLOGE("getregs");
+
+      return false;
+    }
+  #endif
+
+  return true;
+}
+
+bool set_regs(int pid, struct user_regs_struct *regs) {
+  #if defined(__x86_64__) || defined(__i386__)
+    if (ptrace(PTRACE_SETREGS, pid, 0, regs) == -1) {
+      PLOGE("setregs");
+
+      return false;
+    }
+  #elif defined(__aarch64__) || defined(__arm__)
+    struct iovec iov = {
+      .iov_base = regs,
+      .iov_len = sizeof(struct user_regs_struct),
+    };
+
+    if (ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov) == -1) {
+      PLOGE("setregs");
+
+      return false;
+    }
+  #endif
+
+  return true;
+}
+
+void get_addr_mem_region(struct maps *info, uintptr_t addr, char *buf, size_t buf_size) {
+  for (size_t i = 0; i < info->size; i++) {
+    /* TODO: Early "leave" */
+    if (info->maps[i].start <= addr && info->maps[i].end > addr) {
+      snprintf(buf, buf_size, "%s %s%s%s",
+               info->maps[i].path,
+               info->maps[i].perms & PROT_READ ? "r" : "-",
+               info->maps[i].perms & PROT_WRITE ? "w" : "-",
+               info->maps[i].perms & PROT_EXEC ? "x" : "-");
+
+      return;
+    }
+  }
+
+  snprintf(buf, buf_size, "<unknown>");
+}
+
+/* INFO: strrchr but without modifying the string */
+const char *position_after(const char *str, const char needle) {
+  const char *positioned = str + strlen(str);
+
+  int i = strlen(str);
+  while (i != 0) {
+    i--;
+    if (str[i] == needle) {
+      positioned = str + i + 1;
+
+      break;
+    }
+  }
+
+  return positioned;
+}
+
+void *find_module_return_addr(struct maps *map, const char *suffix) {
+  for (size_t i = 0; i < map->size; i++) {
+    /* TODO: Make it NULL in 1 length path */
+    if (map->maps[i].path == NULL) continue;
+
+    const char *file_name = position_after(map->maps[i].path, '/');
+    if (!file_name) continue;
+
+    if (strlen(file_name) < strlen(suffix) || (map->maps[i].perms & PROT_EXEC) != 0 || strncmp(file_name, suffix, strlen(suffix)) != 0) continue;
+
+    return (void *)map->maps[i].start;
+  }
+
+  return NULL;
+}
+
+void *find_module_base(struct maps *map, const char *file) {
+  const char *suffix = position_after(file, '/');
+  if (!suffix) {
+    LOGE("failed to find suffix in %s", file);
+
+    return NULL;
+  }
+
+  for (size_t i = 0; i < map->size; i++) {
+    if (map->maps[i].path == NULL) continue;
+
+    const char *file_name = position_after(map->maps[i].path, '/');
+    if (!file_name) continue;
+
+    if (strlen(file_name) < strlen(suffix) || map->maps[i].offset != 0 || strncmp(file_name, suffix, strlen(suffix)) != 0) continue;
+
+    return (void *)map->maps[i].start;
+  }
+
+  return NULL;
+}
+
+void *find_func_addr(struct maps *local_info, struct maps *remote_info, const char *module, const char *func) {
+  uint8_t *local_base = (uint8_t *)find_module_base(local_info, module);
+  if (local_base == NULL) {
+    LOGE("failed to find local base for module %s", module);
+
+    return NULL;
+  }
+
+  uint8_t *remote_base = (uint8_t *)find_module_base(remote_info, module);
+  if (remote_base == NULL) {
+    LOGE("failed to find remote base for module %s", module);
+
+    return NULL;
+  }
+
+  LOGD("found local base %p remote base %p", local_base, remote_base);
+
+  ElfImg *mod = ElfImg_create(module, local_base);
+  if (mod == NULL) {
+    LOGE("failed to create elf img %s", module);
+
+    return NULL;
+  }
+
+  uint8_t *sym = (uint8_t *)getSymbAddress(mod, func);
+  if (sym == NULL) {
+    LOGE("failed to find symbol %s in %s", func, module);
+
+    ElfImg_destroy(mod);
+
+    return NULL;
+  }
+
+  LOGD("found symbol %s in %s: %p", func, module, sym);
+
+  uintptr_t addr = (uintptr_t)(sym - local_base) + (uintptr_t)remote_base;
+  LOGD("addr %p", (void *)addr);
+
+  ElfImg_destroy(mod);
+
+  return (void *)addr;
+}
+
+void align_stack(struct user_regs_struct *regs, long preserve) {
+  /* INFO: ~0xf is a negative value, and REG_SP is unsigned,
+             so we must cast REG_SP to signed type before subtracting
+             then cast back to unsigned type.
+  */
+  regs->REG_SP = (uintptr_t)((intptr_t)(regs->REG_SP - preserve) & ~0xf);
+}
+
+uintptr_t push_string(int pid, struct user_regs_struct *regs, const char *str) {
+  size_t len = strlen(str) + 1;
+
+  regs->REG_SP -= len;
+
+  align_stack(regs, 0);
+
+  uintptr_t addr = (uintptr_t)regs->REG_SP;
+  if (!write_proc(pid, addr, str, len)) LOGE("failed to write string %s", str);
+
+  LOGD("pushed string %" PRIxPTR, addr);
+
+  return addr;
+}
+
+uintptr_t remote_call(int pid, struct user_regs_struct *regs, uintptr_t func_addr, uintptr_t return_addr, long *args, size_t args_size) {
+  align_stack(regs, 0);
+
+  LOGV("calling remote function %" PRIxPTR " args %zu", func_addr, args_size);
+
+  for (size_t i = 0; i < args_size; i++) {
+    LOGV("arg %p", (void *)args[i]);
+  }
+
+  #if defined(__x86_64__)
+    if (args_size >= 1) regs->rdi = args[0];
+    if (args_size >= 2) regs->rsi = args[1];
+    if (args_size >= 3) regs->rdx = args[2];
+    if (args_size >= 4) regs->rcx = args[3];
+    if (args_size >= 5) regs->r8 = args[4];
+    if (args_size >= 6) regs->r9 = args[5];
+    if (args_size > 6) {
+      long remain = (args_size - 6L) * sizeof(long);
+      align_stack(regs, remain);
+
+      if (!write_proc(pid, (uintptr_t) regs->REG_SP, args, remain)) LOGE("failed to push arguments");
+    }
+
+    regs->REG_SP -= sizeof(long);
+
+    if (!write_proc(pid, (uintptr_t) regs->REG_SP, &return_addr, sizeof(return_addr))) LOGE("failed to write return addr");
+
+    regs->REG_IP = func_addr;
+  #elif defined(__i386__)
+    if (args_size > 0) {
+      long remain = (args_size) * sizeof(long);
+      align_stack(regs, remain);
+
+      if (!write_proc(pid, (uintptr_t) regs->REG_SP, args, remain)) LOGE("failed to push arguments");
+    }
+
+    regs->REG_SP -= sizeof(long);
+
+    if (!write_proc(pid, (uintptr_t) regs->REG_SP, &return_addr, sizeof(return_addr))) LOGE("failed to write return addr");
+
+    regs->REG_IP = func_addr;
+  #elif defined(__aarch64__)
+    for (size_t i = 0; i < args_size && i < 8; i++) {
+      regs->regs[i] = args[i];
+    }
+
+    if (args_size > 8) {
+      long remain = (args_size - 8) * sizeof(long);
+      align_stack(regs, remain);
+
+      write_proc(pid, (uintptr_t)regs->REG_SP, args, remain);
+    }
+
+    regs->regs[30] = return_addr;
+    regs->REG_IP = func_addr;
+  #elif defined(__arm__)
+    for (size_t i = 0; i < args_size && i < 4; i++) {
+      regs->uregs[i] = args[i];
+    }
+
+    if (args_size > 4) {
+      long remain = (args_size - 4) * sizeof(long);
+      align_stack(regs, remain);
+
+      write_proc(pid, (uintptr_t)regs->REG_SP, args, remain);
+    }
+
+    regs->uregs[14] = return_addr;
+    regs->REG_IP = func_addr;
+
+    unsigned long CPSR_T_MASK = 1lu << 5;
+
+    if ((regs->REG_IP & 1) != 0) {
+      regs->REG_IP = regs->REG_IP & ~1;
+      regs->uregs[16] = regs->uregs[16] | CPSR_T_MASK;
+    } else {
+      regs->uregs[16] = regs->uregs[16] & ~CPSR_T_MASK;
+    }
+  #endif
+
+  if (!set_regs(pid, regs)) {
+    LOGE("failed to set regs");
+
+    return 0;
+  }
+
+  ptrace(PTRACE_CONT, pid, 0, 0);
+
+  int status;
+  wait_for_trace(pid, &status, __WALL);
+  if (!get_regs(pid, regs)) {
+    LOGE("failed to get regs after call");
+
+    return 0;
+  }
+
+  if (WSTOPSIG(status) == SIGSEGV) {
+    if ((uintptr_t)regs->REG_IP != return_addr) {
+      LOGE("wrong return addr %p", (void *) regs->REG_IP);
+
+      return 0;
+    }
+
+    return regs->REG_RET;
+  } else {
+    char status_str[64];
+    parse_status(status, status_str, sizeof(status_str));
+
+    LOGE("stopped by other reason %s at addr %p", status_str, (void *)regs->REG_IP);
+  }
+
+  return 0;
+}
+
+int fork_dont_care() {
+  pid_t pid = fork();
+
+  if (pid < 0) PLOGE("fork 1");
+  else if (pid == 0) {
+    pid = fork();
+    if (pid < 0) PLOGE("fork 2");
+    else if (pid > 0) exit(0);
+  } else {
+    int status;
+    waitpid(pid, &status, __WALL);
+  }
+
+  return pid;
+}
+
+void wait_for_trace(int pid, int *status, int flags) {
+  while (1) {
+    pid_t result = waitpid(pid, status, flags);
+    if (result == -1) {
+      if (errno == EINTR) continue;
+
+      PLOGE("wait %d failed", pid);
+      exit(1);
+    }
+
+    if (!WIFSTOPPED(*status)) {
+      char status_str[64];
+      parse_status(*status, status_str, sizeof(status_str));
+
+      LOGE("process %d not stopped for trace: %s, exit", pid, status_str);
+
+      exit(1);
+    }
+
+    return;
+  }
+}
+
+void parse_status(int status, char *buf, size_t len) {
+  snprintf(buf, len, "0x%x ", status);
+
+  if (WIFEXITED(status)) {
+    snprintf(buf + strlen(buf), len - strlen(buf), "exited with %d", WEXITSTATUS(status));
+  } else if (WIFSIGNALED(status)) {
+    snprintf(buf + strlen(buf), len - strlen(buf), "signaled with %s(%d)", sigabbrev_np(WTERMSIG(status)), WTERMSIG(status));
+  } else if (WIFSTOPPED(status)) {
+    snprintf(buf + strlen(buf), len - strlen(buf), "stopped by ");
+
+    int stop_sig = WSTOPSIG(status);
+    snprintf(buf + strlen(buf), len - strlen(buf), "signal=%s(%d),", sigabbrev_np(stop_sig), stop_sig);
+    snprintf(buf + strlen(buf), len - strlen(buf), "event=%s", parse_ptrace_event(status));
+  } else {
+    snprintf(buf + strlen(buf), len - strlen(buf), "unknown");
+  }
+}
+
+int get_program(int pid, char *buf, size_t size) {
+  char path[PATH_MAX];
+  snprintf(path, sizeof(path), "/proc/%d/exe", pid);
+
+  ssize_t sz = readlink(path, buf, size);
+
+  if (sz == -1) {
+    PLOGE("readlink /proc/%d/exe", pid);
+
+    return -1;
+  }
+
+  buf[sz] = '\0';
+
+  return 0;
+}

loader/src/ptracer/utils.h

@@ -0,0 +1,115 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#include <sys/ptrace.h>
+
+#include "daemon.h"
+
+#ifdef __LP64__
+  #define LOG_TAG "zygisk-ptrace64"
+#else
+  #define LOG_TAG "zygisk-ptrace32"
+#endif
+
+#include "logging.h"
+
+struct map {
+  uintptr_t start;
+  uintptr_t end;
+  uint8_t perms;
+  bool is_private;
+  uintptr_t offset;
+  dev_t dev;
+  ino_t inode;
+  const char *path;
+};
+
+struct maps {
+  struct map *maps;
+  size_t size;
+};
+
+struct maps *parse_maps(const char *filename);
+
+void free_maps(struct maps *maps);
+
+#if defined(__x86_64__)
+  #define REG_SP rsp
+  #define REG_IP rip
+  #define REG_RET rax
+#elif defined(__i386__)
+  #define REG_SP esp
+  #define REG_IP eip
+  #define REG_RET eax
+#elif defined(__aarch64__)
+  #define REG_SP sp
+  #define REG_IP pc
+  #define REG_RET regs[0]
+#elif defined(__arm__)
+  #define REG_SP uregs[13]
+  #define REG_IP uregs[15]
+  #define REG_RET uregs[0]
+  #define user_regs_struct user_regs
+#endif
+
+ssize_t write_proc(int pid, uintptr_t remote_addr, const void *buf, size_t len);
+
+ssize_t read_proc(int pid, uintptr_t remote_addr, void *buf, size_t len);
+
+bool get_regs(int pid, struct user_regs_struct *regs);
+
+bool set_regs(int pid, struct user_regs_struct *regs);
+
+void get_addr_mem_region(struct maps *map, uintptr_t addr, char *buf, size_t buf_size);
+
+void *find_module_return_addr(struct maps *map, const char *suffix);
+
+void *find_func_addr(struct maps *local_info, struct maps *remote_info, const char *module, const char *func);
+
+void align_stack(struct user_regs_struct *regs, long preserve);
+
+uintptr_t push_string(int pid, struct user_regs_struct *regs, const char *str);
+
+uintptr_t remote_call(int pid, struct user_regs_struct *regs, uintptr_t func_addr, uintptr_t return_addr, long *args, size_t args_size);
+
+int fork_dont_care();
+
+void wait_for_trace(int pid, int* status, int flags);
+
+void parse_status(int status, char *buf, size_t len);
+
+#define WPTEVENT(x) (x >> 16)
+
+#define CASE_CONST_RETURN(x) case x: return #x;
+
+static inline const char *parse_ptrace_event(int status) {
+  status = status >> 16;
+
+  switch (status) {
+    CASE_CONST_RETURN(PTRACE_EVENT_FORK)
+    CASE_CONST_RETURN(PTRACE_EVENT_VFORK)
+    CASE_CONST_RETURN(PTRACE_EVENT_CLONE)
+    CASE_CONST_RETURN(PTRACE_EVENT_EXEC)
+    CASE_CONST_RETURN(PTRACE_EVENT_VFORK_DONE)
+    CASE_CONST_RETURN(PTRACE_EVENT_EXIT)
+    CASE_CONST_RETURN(PTRACE_EVENT_SECCOMP)
+    CASE_CONST_RETURN(PTRACE_EVENT_STOP)
+    default:
+      return "(no event)";
+  }
+}
+
+static inline const char *sigabbrev_np(int sig) {
+  if (sig > 0 && sig < NSIG) return sys_signame[sig];
+
+  return "(unknown)";
+}
+
+int get_program(int pid, char *buf, size_t size);
+
+/* INFO: pid = 0, fd != nullptr -> set to fd
+         pid != 0, fd != nullptr -> set to pid ns, give orig ns in fd
+*/
+bool switch_mnt_ns(int pid, int *fd);
+
+#endif /* UTILS_H */

module/.gitignore

@@ -0,0 +1,2 @@
+public_key
+private_key

module/build.gradle.kts

@@ -1,20 +1,35 @@
+import android.databinding.tool.ext.capitalizeUS
 import java.security.MessageDigest
 import org.apache.tools.ant.filters.ReplaceTokens
 
 import org.apache.tools.ant.filters.FixCrLfFilter
 
+import org.apache.commons.codec.binary.Hex
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.security.KeyFactory
+import java.security.KeyPairGenerator
+import java.security.Signature
+import java.security.interfaces.EdECPrivateKey
+import java.security.interfaces.EdECPublicKey
+import java.security.spec.EdECPrivateKeySpec
+import java.security.spec.NamedParameterSpec
+import java.util.TreeSet
+
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.agp.lib)
 }
 
 val moduleId: String by rootProject.extra
 val moduleName: String by rootProject.extra
 val verCode: Int by rootProject.extra
 val verName: String by rootProject.extra
+val minAPatchVersion: Int by rootProject.extra
 val minKsuVersion: Int by rootProject.extra
 val minKsudVersion: Int by rootProject.extra
 val maxKsuVersion: Int by rootProject.extra
 val minMagiskVersion: Int by rootProject.extra
+val commitHash: String by rootProject.extra
 
 android.buildFeatures {
     androidResources = false
@@ -22,23 +37,23 @@ android.buildFeatures {
 }
 
 androidComponents.onVariants { variant ->
-    val variantLowered = variant.name.toLowerCase()
-    val variantCapped = variant.name.capitalize()
-    val buildTypeLowered = variant.buildType?.toLowerCase()
+    val variantLowered = variant.name.lowercase()
+    val variantCapped = variant.name.capitalizeUS()
+    val buildTypeLowered = variant.buildType?.lowercase()
 
-    val moduleDir = "$buildDir/outputs/module/$variantLowered"
-    val zipFileName = "$moduleName-$verName-$verCode-$buildTypeLowered.zip".replace(' ', '-')
+    val moduleDir = layout.buildDirectory.dir("outputs/module/$variantLowered")
+    val zipFileName = "$moduleName-$verName-$verCode-$commitHash-$buildTypeLowered.zip".replace(' ', '-')
 
     val prepareModuleFilesTask = task<Sync>("prepareModuleFiles$variantCapped") {
         group = "module"
         dependsOn(
             ":loader:assemble$variantCapped",
-            ":zygiskd:cargoBuild",
+            ":zygiskd:buildAndStrip",
         )
         into(moduleDir)
         from("${rootProject.projectDir}/README.md")
         from("$projectDir/src") {
-            exclude("module.prop", "customize.sh", "service.sh")
+            exclude("module.prop", "customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh")
             filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
         }
         from("$projectDir/src") {
@@ -46,14 +61,15 @@ androidComponents.onVariants { variant ->
             expand(
                 "moduleId" to moduleId,
                 "moduleName" to moduleName,
-                "versionName" to "$verName ($verCode)",
-                "versionCode" to verCode,
+                "versionName" to "$verName ($verCode-$commitHash-$variantLowered)",
+                "versionCode" to verCode
             )
         }
         from("$projectDir/src") {
-            include("customize.sh", "service.sh")
+            include("customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh")
             val tokens = mapOf(
                 "DEBUG" to if (buildTypeLowered == "debug") "true" else "false",
+                "MIN_APATCH_VERSION" to "$minAPatchVersion",
                 "MIN_KSU_VERSION" to "$minKsuVersion",
                 "MIN_KSUD_VERSION" to "$minKsudVersion",
                 "MAX_KSU_VERSION" to "$maxKsuVersion",
@@ -63,20 +79,156 @@ androidComponents.onVariants { variant ->
             filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
         }
         into("bin") {
-            from(project(":zygiskd").buildDir.path + "/rustJniLibs/android")
+            from(project(":zygiskd").layout.buildDirectory.getAsFile().get())
+            include("**/zygiskd")
         }
         into("lib") {
-            from("${project(":loader").buildDir}/intermediates/stripped_native_libs/$variantLowered/out/lib")
+            from(project(":loader").layout.buildDirectory.file("intermediates/stripped_native_libs/$variantLowered/out/lib"))
+        }
+        into("webroot") {
+            from("${rootProject.projectDir}/webroot")
         }
 
+        val root = moduleDir.get()
+
         doLast {
-            fileTree(moduleDir).visit {
-                if (isDirectory) return@visit
-                val md = MessageDigest.getInstance("SHA-256")
-                file.forEachBlock(4096) { bytes, size ->
-                    md.update(bytes, 0, size)
+            if (file("private_key").exists()) {
+                val privateKey = file("private_key").readBytes()
+                val publicKey = file("public_key").readBytes()
+                val namedSpec = NamedParameterSpec("ed25519")
+                val privKeySpec = EdECPrivateKeySpec(namedSpec, privateKey)
+                val kf = KeyFactory.getInstance("ed25519")
+                val privKey = kf.generatePrivate(privKeySpec);
+                val sig = Signature.getInstance("ed25519")
+                fun File.sha(realFile: File? = null) {
+                    sig.update(this.name.toByteArray())
+                    sig.update(0) // null-terminated string
+                    val real = realFile ?: this
+                    val buffer = ByteBuffer.allocate(8)
+                        .order(ByteOrder.LITTLE_ENDIAN)
+                        .putLong(real.length())
+                        .array()
+                    sig.update(buffer)
+                    real.forEachBlock { bytes, size ->
+                        sig.update(bytes, 0, size)
+                    }
                 }
-                file(file.path + ".sha256").writeText(org.apache.commons.codec.binary.Hex.encodeHexString(md.digest()))
+
+                /* INFO: Misaki is the file that holds signed hash of
+                           all files of ReZygisk module, to ensure the
+                           zip (runtime and non-runtime) files hasn't
+                           been tampered with.
+                */
+                fun misakiSign() {
+                    sig.initSign(privKey)
+
+                    val filesToProcess = TreeSet<File> { f1, f2 ->
+                        f1.path.replace("\\", "/")
+                            .compareTo(f2.path.replace("\\", "/"))
+                    }
+
+                    root.asFile.walkTopDown().forEach { file ->
+                        if (!file.isFile) return@forEach
+
+                        val fileName = file.name
+                        if (fileName == "misaki.sig") return@forEach
+
+                        filesToProcess.add(file)
+                    }
+
+                    filesToProcess.forEach { file -> file.sha(file) }
+
+                    val misakiSignatureFile = root.file("misaki.sig").asFile
+                    misakiSignatureFile.writeBytes(sig.sign())
+                    misakiSignatureFile.appendBytes(publicKey)
+                }
+
+                fun getSign(name: String, abi: String, is64Bit: Boolean) {
+                    val set = TreeSet<Pair<File, File?>> { o1, o2 ->
+                        o1.first.path.replace("\\", "/")
+                            .compareTo(o2.first.path.replace("\\", "/"))
+                    }
+
+                    val archSuffix = if (is64Bit) "64" else "32"
+                    val pathSuffix = if (is64Bit) "lib64" else "lib"
+
+                    set.add(Pair(root.file("module.prop").asFile, null))
+                    set.add(Pair(root.file("sepolicy.rule").asFile, null))
+                    set.add(Pair(root.file("post-fs-data.sh").asFile, null))
+                    set.add(Pair(root.file("service.sh").asFile, null))
+                    set.add(
+                        Pair(
+                            root.file("$pathSuffix/libzygisk.so").asFile,
+                            root.file("lib/$abi/libzygisk.so").asFile
+                        )
+                    )
+                    set.add(
+                        Pair(
+                            root.file("bin/zygisk-ptrace$archSuffix").asFile,
+                            root.file("lib/$abi/libzygisk_ptrace.so").asFile
+                        )
+                    )
+                    set.add(
+                        Pair(
+                            root.file("bin/zygiskd$archSuffix").asFile,
+                            root.file("bin/$abi/zygiskd").asFile
+                        )
+                    )
+
+                    sig.initSign(privKey)
+                    set.forEach { it.first.sha(it.second) }
+                    val signFile = root.file(name).asFile
+                    signFile.writeBytes(sig.sign())
+                    signFile.appendBytes(publicKey)
+                }
+
+                /* INFO: Machikado is the name of files that holds signed hash of
+                           all runtime files of ReZygisk module, to ensure the
+                           runtime files hasn't been tampered with.
+                */
+                println("=== Guards the peace of Machikado ===")
+
+                getSign("machikado.arm64", "arm64-v8a", true)
+                getSign("machikado.arm", "armeabi-v7a", false)
+
+                getSign("machikado.x86_64", "x86_64", true)
+                getSign("machikado.x86", "x86", false)
+
+                fileTree(moduleDir).visit {
+                    if (isDirectory) return@visit
+
+                    val md = MessageDigest.getInstance("SHA-256")
+                    file.forEachBlock(4096) { bytes, size ->
+                        md.update(bytes, 0, size)
+                    }
+
+                    file(file.path + ".sha256").writeText(Hex.encodeHexString(md.digest()))
+                }
+
+                println("===   At the kitsune's wedding   ===")
+
+                misakiSign()
+            } else {
+                println("no private_key found, this build will not be signed")
+
+                root.file("machikado.arm64").asFile.createNewFile()
+                root.file("machikado.arm").asFile.createNewFile()
+
+                root.file("machikado.x86_64").asFile.createNewFile()
+                root.file("machikado.x86").asFile.createNewFile()
+
+                fileTree(moduleDir).visit {
+                    if (isDirectory) return@visit
+
+                    val md = MessageDigest.getInstance("SHA-256")
+                    file.forEachBlock(4096) { bytes, size ->
+                        md.update(bytes, 0, size)
+                    }
+
+                    file(file.path + ".sha256").writeText(Hex.encodeHexString(md.digest()))
+                }
+
+                root.file("misaki.sig").asFile.createNewFile()
             }
         }
     }
@@ -85,7 +237,7 @@ androidComponents.onVariants { variant ->
         group = "module"
         dependsOn(prepareModuleFilesTask)
         archiveFileName.set(zipFileName)
-        destinationDirectory.set(file("$buildDir/outputs/release"))
+        destinationDirectory.set(layout.buildDirectory.file("outputs/release").get().asFile)
         from(moduleDir)
     }
 
@@ -111,10 +263,22 @@ androidComponents.onVariants { variant ->
         }
     }
 
+    val installAPatchTask = task<Exec>("installAPatch$variantCapped") {
+        group = "module"
+        dependsOn(pushTask)
+        commandLine("adb", "shell", "su", "-c", "/data/adb/apd module install /data/local/tmp/$zipFileName")
+    }
+
     val installMagiskTask = task<Exec>("installMagisk$variantCapped") {
         group = "module"
         dependsOn(pushTask)
-        commandLine("adb", "shell", "su", "-c", "magisk --install-module /data/local/tmp/$zipFileName")
+        commandLine("adb", "shell", "su", "-M", "-c", "magisk --install-module /data/local/tmp/$zipFileName")
+    }
+
+    task<Exec>("installAPatchAndReboot$variantCapped") {
+        group = "module"
+        dependsOn(installAPatchTask)
+        commandLine("adb", "reboot")
     }
 
     task<Exec>("installKsuAndReboot$variantCapped") {

module/src/customize.sh

@@ -6,6 +6,7 @@ MIN_KSU_VERSION=@MIN_KSU_VERSION@
 MIN_KSUD_VERSION=@MIN_KSUD_VERSION@
 MAX_KSU_VERSION=@MAX_KSU_VERSION@
 MIN_MAGISK_VERSION=@MIN_MAGISK_VERSION@
+MIN_APATCH_VERSION=@MIN_APATCH_VERSION@
 
 if [ "$BOOTMODE" ] && [ "$KSU" ]; then
   ui_print "- Installing from KernelSU app"
@@ -31,9 +32,17 @@ if [ "$BOOTMODE" ] && [ "$KSU" ]; then
   if [ "$(which magisk)" ]; then
     ui_print "*********************************************************"
     ui_print "! Multiple root implementation is NOT supported!"
-    ui_print "! Please uninstall Magisk before installing Zygisksu"
+    ui_print "! Please uninstall Magisk before installing ReZygisk"
     abort    "*********************************************************"
   fi
+  elif [ "$BOOTMODE" ] && [ "$APATCH" ]; then
+    ui_print "- Installing from APatch app"
+    if ! [ "$APATCH_VER_CODE" ] || [ "$APATCH_VER_CODE" -lt "$MIN_APATCH_VERSION" ]; then
+      ui_print "*********************************************************"
+      ui_print "! APatch version is too old!"
+      ui_print "! Please update APatch to latest version"
+      abort    "*********************************************************"
+    fi
 elif [ "$BOOTMODE" ] && [ "$MAGISK_VER_CODE" ]; then
   ui_print "- Installing from Magisk app"
   if [ "$MAGISK_VER_CODE" -lt "$MIN_MAGISK_VERSION" ]; then
@@ -50,12 +59,12 @@ else
 fi
 
 VERSION=$(grep_prop version "${TMPDIR}/module.prop")
-ui_print "- Installing Zygisksu $VERSION"
+ui_print "- Installing ReZygisk $VERSION"
 
 # check android
-if [ "$API" -lt 29 ]; then
+if [ "$API" -lt 26 ]; then
   ui_print "! Unsupported sdk: $API"
-  abort "! Minimal supported sdk is 29 (Android 10)"
+  abort "! Minimal supported sdk is 26 (Android 8.0)"
 else
   ui_print "- Device sdk: $API"
 fi
@@ -93,75 +102,95 @@ fi
 ui_print "- Extracting module files"
 extract "$ZIPFILE" 'module.prop'     "$MODPATH"
 extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH"
-extract "$ZIPFILE" 'sepolicy.rule'   "$MODPATH"
 extract "$ZIPFILE" 'service.sh'      "$MODPATH"
-
-HAS32BIT=false && [ -d "/system/lib" ] && HAS32BIT=true
-HAS64BIT=false && [ -d "/system/lib64" ] && HAS64BIT=true
+extract "$ZIPFILE" 'uninstall.sh'    "$MODPATH"
+mv "$TMPDIR/sepolicy.rule" "$MODPATH"
 
 mkdir "$MODPATH/bin"
-mkdir "$MODPATH/system"
-[ "$HAS32BIT" = true ] && mkdir "$MODPATH/system/lib"
-[ "$HAS64BIT" = true ] && mkdir "$MODPATH/system/lib64"
+mkdir "$MODPATH/webroot"
+
+ui_print "- Extracting webroot"
+unzip -o "$ZIPFILE" "webroot/*" -x "*.sha256" -d "$MODPATH"
+
+CPU_ABIS=$(getprop ro.product.cpu.abilist)
+
+SUPPORTS_32BIT=false
+SUPPORTS_64BIT=false
+
+if [[ "$CPU_ABIS" == *"x86"* && "$CPU_ABIS" != "x86_64" || "$CPU_ABIS" == *"armeabi"* ]]; then
+  SUPPORTS_32BIT=true
+  ui_print "- Device supports 32-bit"
+fi
+
+if [[ "$CPU_ABIS" == *"x86_64"* || "$CPU_ABIS" == *"arm64-v8a"* ]]; then
+  SUPPORTS_64BIT=true
+  ui_print "- Device supports 64-bit"
+fi
+
+if [ "$SUPPORTS_32BIT" = true ]; then
+  mkdir "$MODPATH/lib"
+fi
+
+if [ "$SUPPORTS_64BIT" = true ]; then
+  mkdir "$MODPATH/lib64"
+fi
 
 if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
-  if [ "$HAS32BIT" = true ]; then
+  if [ "$SUPPORTS_32BIT" = true ]; then
     ui_print "- Extracting x86 libraries"
     extract "$ZIPFILE" 'bin/x86/zygiskd' "$MODPATH/bin" true
     mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
-    extract "$ZIPFILE" 'lib/x86/libzygisk_injector.so' "$MODPATH/system/lib" true
-    extract "$ZIPFILE" 'lib/x86/libzygisk_loader.so' "$MODPATH/system/lib" true
-    ln -sf "zygiskd32" "$MODPATH/bin/zygiskwd"
+    extract "$ZIPFILE" 'lib/x86/libzygisk.so' "$MODPATH/lib" true
+    extract "$ZIPFILE" 'lib/x86/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace32"
+
+    extract "$ZIPFILE" 'machikado.x86' "$MODPATH" true
   fi
 
-  if [ "$HAS64BIT" = true ]; then
+  if [ "$SUPPORTS_64BIT" = true ]; then
     ui_print "- Extracting x64 libraries"
     extract "$ZIPFILE" 'bin/x86_64/zygiskd' "$MODPATH/bin" true
     mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
-    extract "$ZIPFILE" 'lib/x86_64/libzygisk_injector.so' "$MODPATH/system/lib64" true
-    extract "$ZIPFILE" 'lib/x86_64/libzygisk_loader.so' "$MODPATH/system/lib64" true
-    ln -sf "zygiskd64" "$MODPATH/bin/zygiskwd"
+    extract "$ZIPFILE" 'lib/x86_64/libzygisk.so' "$MODPATH/lib64" true
+    extract "$ZIPFILE" 'lib/x86_64/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace64"
+
+    extract "$ZIPFILE" 'machikado.x86_64' "$MODPATH" true
   fi
 else
-  if [ "$HAS32BIT" = true ]; then
+  if [ "$SUPPORTS_32BIT" = true ]; then
     ui_print "- Extracting arm libraries"
     extract "$ZIPFILE" 'bin/armeabi-v7a/zygiskd' "$MODPATH/bin" true
     mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32"
-    extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_injector.so' "$MODPATH/system/lib" true
-    extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_loader.so' "$MODPATH/system/lib" true
-    ln -sf "zygiskd32" "$MODPATH/bin/zygiskwd"
+    extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk.so' "$MODPATH/lib" true
+    extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace32"
+
+    extract "$ZIPFILE" 'machikado.arm' "$MODPATH" true
   fi
 
-  if [ "$HAS64BIT" = true ]; then
+  if [ "$SUPPORTS_64BIT" = true ]; then
     ui_print "- Extracting arm64 libraries"
     extract "$ZIPFILE" 'bin/arm64-v8a/zygiskd' "$MODPATH/bin" true
     mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64"
-    extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_injector.so' "$MODPATH/system/lib64" true
-    extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_loader.so' "$MODPATH/system/lib64" true
-    ln -sf "zygiskd64" "$MODPATH/bin/zygiskwd"
-  fi
-fi
+    extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk.so' "$MODPATH/lib64" true
+    extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_ptrace.so' "$MODPATH/bin" true
+    mv "$MODPATH/bin/libzygisk_ptrace.so" "$MODPATH/bin/zygisk-ptrace64"
 
-if [ $DEBUG = false ]; then
-  ui_print "- Hex patching"
-  SOCKET_PATCH=$(tr -dc 'a-f0-9' </dev/urandom | head -c 18)
-  if [ "$HAS32BIT" = true ]; then
-    sed -i "s/socket_placeholder/$SOCKET_PATCH/g" "$MODPATH/bin/zygiskd32"
-    sed -i "s/socket_placeholder/$SOCKET_PATCH/g" "$MODPATH/system/lib/libzygisk_injector.so"
-    sed -i "s/socket_placeholder/$SOCKET_PATCH/g" "$MODPATH/system/lib/libzygisk_loader.so"
-  fi
-  if [ "$HAS64BIT" = true ]; then
-    sed -i "s/socket_placeholder/$SOCKET_PATCH/g" "$MODPATH/bin/zygiskd64"
-    sed -i "s/socket_placeholder/$SOCKET_PATCH/g" "$MODPATH/system/lib64/libzygisk_injector.so"
-    sed -i "s/socket_placeholder/$SOCKET_PATCH/g" "$MODPATH/system/lib64/libzygisk_loader.so"
+    extract "$ZIPFILE" 'machikado.arm64' "$MODPATH" true
   fi
 fi
 
 ui_print "- Setting permissions"
-chmod 0744 "$MODPATH/daemon.sh"
-set_perm_recursive "$MODPATH/bin" 0 2000 0755 0755
-set_perm_recursive "$MODPATH/system/lib" 0 0 0755 0644 u:object_r:system_lib_file:s0
-set_perm_recursive "$MODPATH/system/lib64" 0 0 0755 0644 u:object_r:system_lib_file:s0
+set_perm_recursive "$MODPATH/bin" 0 0 0755 0755
+
+if [ "$SUPPORTS_32BIT" = true ]; then
+  set_perm_recursive "$MODPATH/lib" 0 0 0755 0644 u:object_r:system_lib_file:s0
+fi
+
+if [ "$SUPPORTS_64BIT" = true ]; then
+  set_perm_recursive "$MODPATH/lib64" 0 0 0755 0644 u:object_r:system_lib_file:s0
+fi
 
 # If Huawei's Maple is enabled, system_server is created with a special way which is out of Zygisk's control
 HUAWEI_MAPLE_ENABLED=$(grep_prop ro.maple.enable)

module/src/module.prop

@@ -2,5 +2,5 @@ id=${moduleId}
 name=${moduleName}
 version=${versionName}
 versionCode=${versionCode}
-author=Nullptr, 5ec1cff
-description=Run Zygisk on KernelSU.
+author=The PerformanC Organization
+description=Standalone implementation of Zygisk.

module/src/post-fs-data.sh

@@ -6,18 +6,52 @@ if [ "$ZYGISK_ENABLED" ]; then
 fi
 
 cd "$MODDIR"
-getprop ro.dalvik.vm.native.bridge > /dev/.native_bridge
-resetprop ro.dalvik.vm.native.bridge libzygisk_loader.so
 
 if [ "$(which magisk)" ]; then
   for file in ../*; do
     if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then
       if [ -f "$file/post-fs-data.sh" ]; then
         cd "$file"
-        log -p i -t "zygisksu" "Manually trigger post-fs-data.sh for $file"
+        log -p i -t "zygisk-sh" "Manually trigger post-fs-data.sh for $file"
         sh "$(realpath ./post-fs-data.sh)"
         cd "$MODDIR"
       fi
     fi
   done
 fi
+
+create_sys_perm() {
+  mkdir -p $1
+  chmod 555 $1
+  chcon u:object_r:system_file:s0 $1
+}
+
+export TMP_PATH=/data/adb/rezygisk
+
+if [ -d $TMP_PATH ]; then
+  rm -rf $TMP_PATH
+fi
+
+create_sys_perm $TMP_PATH
+
+if [ -f $MODDIR/lib64/libzygisk.so ];then
+  create_sys_perm $TMP_PATH/lib64
+  cp $MODDIR/lib64/libzygisk.so $TMP_PATH/lib64/libzygisk.so
+  chcon u:object_r:system_file:s0 $TMP_PATH/lib64/libzygisk.so
+fi
+
+if [ -f $MODDIR/lib/libzygisk.so ];then
+  create_sys_perm $TMP_PATH/lib
+  cp $MODDIR/lib/libzygisk.so $TMP_PATH/lib/libzygisk.so
+  chcon u:object_r:system_file:s0 $TMP_PATH/lib/libzygisk.so
+fi
+
+CPU_ABIS=$(getprop ro.product.cpu.abilist)
+
+if [[ "$CPU_ABIS" == *"arm64-v8a"* || "$CPU_ABIS" == *"x86_64"* ]]; then
+  ./bin/zygisk-ptrace64 monitor &
+else
+  # INFO: Device is 32-bit only
+
+  ./bin/zygisk-ptrace32 monitor &
+fi

module/src/sepolicy.rule

@@ -1,15 +1,17 @@
-allow * tmpfs * *
+type zygisk_file file_type
+typeattribute zygisk_file mlstrustedobject
+allow zygote zygisk_file sock_file {read write}
 
-type magisk_file file_type
-typeattribute magisk_file mlstrustedobject
-allow * magisk_file file *
-allow * magisk_file dir *
-allow * magisk_file fifo_file *
-allow * magisk_file chr_file *
-allow * magisk_file lnk_file *
-allow * magisk_file sock_file *
+allow zygote magisk lnk_file read
+allow zygote unlabeled file {read open}
+allow zygote zygote capability sys_chroot
+allow zygote su dir search
+allow zygote su {lnk_file file} read
 
+allow zygote adb_data_file dir search
+allow zygote adb_data_file file *
+allow zygote proc file {read open}
+allow zygote zygote process execmem
 allow system_server system_server process execmem
-allow zygote mnt_vendor_file dir search
-allow zygote system_file dir mounton
-allow zygote labeledfs filesystem mount
+allow zygote tmpfs file *
+allow zygote appdomain_tmpfs file *

module/src/service.sh

@@ -8,22 +8,16 @@ if [ "$ZYGISK_ENABLED" ]; then
 fi
 
 cd "$MODDIR"
-export NATIVE_BRIDGE=$(cat /dev/.native_bridge)
-rm /dev/.native_bridge
 
 if [ "$(which magisk)" ]; then
   for file in ../*; do
     if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then
       if [ -f "$file/service.sh" ]; then
         cd "$file"
-        log -p i -t "zygisksu" "Manually trigger service.sh for $file"
-        sh "$(realpath ./service.sh)"
+        log -p i -t "zygisk-sh" "Manually trigger service.sh for $file"
+        sh "$(realpath ./service.sh)" &
         cd "$MODDIR"
       fi
     fi
   done
 fi
-
-log -p i -t "zygisksu" "Start watchdog"
-[ "$DEBUG" = true ] && export RUST_BACKTRACE=1
-exec "bin/zygiskwd" "watchdog" >/dev/null 2>&1

module/src/uninstall.sh

@@ -0,0 +1,5 @@
+#!/system/bin/sh
+
+export TMP_PATH=/data/adb/rezygisk
+
+rm -rf $TMP_PATH

settings.gradle.kts

@@ -6,10 +6,6 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-    plugins {
-        id("com.android.library") version "7.4.1"
-        id("com.android.application") version "7.4.1"
-    }
 }
 
 dependencyResolutionManagement {
@@ -20,7 +16,7 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "ZygiskOnKernelSU"
+rootProject.name = "ReZygisk"
 include(
     ":loader",
     ":module",

webroot/LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

webroot/assets/action.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M240-160q-33 0-56.5-23.5T160-240q0-33 23.5-56.5T240-320q33 0 56.5 23.5T320-240q0 33-23.5 56.5T240-160Zm240 0q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm240 0q-33 0-56.5-23.5T640-240q0-33 23.5-56.5T720-320q33 0 56.5 23.5T800-240q0 33-23.5 56.5T720-160ZM240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400ZM240-640q-33 0-56.5-23.5T160-720q0-33 23.5-56.5T240-800q33 0 56.5 23.5T320-720q0 33-23.5 56.5T240-640Zm240 0q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Zm240 0q-33 0-56.5-23.5T640-720q0-33 23.5-56.5T720-800q33 0 56.5 23.5T800-720q0 33-23.5 56.5T720-640Z"/></svg>

webroot/assets/back.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="36px" viewBox="0 -960 960 960" width="36px" fill="#e8eaed"><path d="m287-446.67 240 240L480-160 160-480l320-320 47 46.67-240 240h513v66.66H287Z"/></svg>

webroot/assets/close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#e8eaed"><path d="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z"/></svg>

webroot/assets/content.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#e8eaed"><path d="M320-213.33q-27 0-46.83-19.84Q253.33-253 253.33-280v-533.33q0-27 19.84-46.84Q293-880 320-880h413.33q27 0 46.84 19.83Q800-840.33 800-813.33V-280q0 27-19.83 46.83-19.84 19.84-46.84 19.84H320Zm0-66.67h413.33v-533.33H320V-280ZM186.67-80q-27 0-46.84-19.83Q120-119.67 120-146.67v-600h66.67v600h480V-80h-480ZM320-280v-533.33V-280Z"/></svg>

webroot/assets/delete.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#e8eaed"><path d="M267.33-120q-27.5 0-47.08-19.58-19.58-19.59-19.58-47.09V-740H160v-66.67h192V-840h256v33.33h192V-740h-40.67v553.33q0 27-19.83 46.84Q719.67-120 692.67-120H267.33Zm425.34-620H267.33v553.33h425.34V-740Zm-328 469.33h66.66v-386h-66.66v386Zm164 0h66.66v-386h-66.66v386ZM267.33-740v553.33V-740Z"/></svg>

webroot/assets/ec-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="60px" viewBox="0 -960 960 960" width="60px" fill="#ba1a1a"><path d="M92-120q-9 0-15.65-4.13Q69.7-128.25 66-135q-4.17-6.6-4.58-14.3Q61-157 66-165l388-670q5-8 11.5-11.5T480-850q8 0 14.5 3.5T506-835l388 670q5 8 4.58 15.7-.41 7.7-4.58 14.3-3.7 6.75-10.35 10.87Q877-120 868-120H92Zm392.18-117q12.82 0 21.32-8.68 8.5-8.67 8.5-21.5 0-12.82-8.68-21.32-8.67-8.5-21.5-8.5-12.82 0-21.32 8.68-8.5 8.67-8.5 21.5 0 12.82 8.68 21.32 8.67 8.5 21.5 8.5Zm0-111q12.82 0 21.32-8.63 8.5-8.62 8.5-21.37v-164q0-12.75-8.68-21.38-8.67-8.62-21.5-8.62-12.82 0-21.32 8.62-8.5 8.63-8.5 21.38v164q0 12.75 8.68 21.37 8.67 8.63 21.5 8.63Z"/></svg>

webroot/assets/error.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240Zm40 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>

webroot/assets/expand.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="m480-340 180-180-57-56-123 123-123-123-57 56 180 180Zm0 260q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>

webroot/assets/home.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M240-200h120v-240h240v240h120v-360L480-740 240-560v360Zm-80 80v-480l320-240 320 240v480H520v-240h-80v240H160Zm320-350Z"/></svg>

webroot/assets/mark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q54 0 104-17.5t92-50.5L228-676q-33 42-50.5 92T160-480q0 134 93 227t227 93Zm252-124q33-42 50.5-92T800-480q0-134-93-227t-227-93q-54 0-104 17.5T284-732l448 448Z"/></svg>

webroot/assets/module.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M627-520h133v-160H627v160Zm-214 0h133v-160H413v160Zm-213 0h133v-160H200v160Zm0 240h133v-160H200v160Zm213 0h133v-160H413v160Zm214 0h133v-160H627v160Zm-507 0v-400q0-33 23.5-56.5T200-760h560q33 0 56.5 23.5T840-680v400q0 33-23.5 56.5T760-200H200q-33 0-56.5-23.5T120-280Z"/></svg>

webroot/assets/settings.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z"/></svg>

webroot/assets/tick.svg

@@ -0,0 +1,3 @@
+<svg class="brightc" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+  <path d="m424-296 282-282-56-56-226 226-114-114-56 56 170 170Zm56 216q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/>
+</svg>

webroot/assets/warn.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240Zm40 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>

webroot/assets_light/action.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="M240-160q-33 0-56.5-23.5T160-240q0-33 23.5-56.5T240-320q33 0 56.5 23.5T320-240q0 33-23.5 56.5T240-160Zm240 0q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm240 0q-33 0-56.5-23.5T640-240q0-33 23.5-56.5T720-320q33 0 56.5 23.5T800-240q0 33-23.5 56.5T720-160ZM240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400ZM240-640q-33 0-56.5-23.5T160-720q0-33 23.5-56.5T240-800q33 0 56.5 23.5T320-720q0 33-23.5 56.5T240-640Zm240 0q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Zm240 0q-33 0-56.5-23.5T640-720q0-33 23.5-56.5T720-800q33 0 56.5 23.5T800-720q0 33-23.5 56.5T720-640Z"/>
+</svg>

webroot/assets_light/home.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="M240-200h120v-240h240v240h120v-360L480-740 240-560v360Zm-80 80v-480l320-240 320 240v480H520v-240h-80v240H160Zm320-350Z"/>
+</svg>

webroot/assets_light/module.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="M627-520h133v-160H627v160Zm-214 0h133v-160H413v160Zm-213 0h133v-160H200v160Zm0 240h133v-160H200v160Zm213 0h133v-160H413v160Zm214 0h133v-160H627v160Zm-507 0v-400q0-33 23.5-56.5T200-760h560q33 0 56.5 23.5T840-680v400q0 33-23.5 56.5T760-200H200q-33 0-56.5-23.5T120-280Z"/>
+</svg>

webroot/assets_light/settings.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#2c2c2c">
+  <path d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z"/>
+</svg>

webroot/css/error.css

@@ -0,0 +1,56 @@
+.e-container {
+  background-color: black;
+  z-index: 30;
+  position: fixed;
+  top: 0;
+  bottom: 0; 
+  left: 0; 
+  right: 0; 
+  color: #fff;
+}
+
+.e-main {
+  background-color: black;
+  color: #fff;
+}
+
+.e-wrap {
+  display: flex;
+  align-items: center;
+  overflow: auto;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+} 
+
+.e-bg {
+  background-color: black;
+  color: #fff;
+}
+
+.e-card {
+  margin: 30px;
+  color: #fff;
+}
+
+.e-font {
+  color: #ba1a1a;
+}
+
+.e-button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 120px;
+  height: 40px;
+  border-radius: 30px;
+  background-color: #ba1a1a;
+  color: black;
+  transition: transform 0.1s ease-in-out;
+}
+
+.e-button:active {
+  transform: scale(90%) 
+}