Migrate resetprop to Rust

Author: topjohnwu

native/src/Android.mk

@@ -22,7 +22,7 @@ LOCAL_SRC_FILES := \
     core/sqlite.cpp \
     core/thread.cpp \
     core/core-rs.cpp \
-    core/resetprop/resetprop.cpp \
+    core/resetprop/sys.cpp \
     core/su/su.cpp \
     core/zygisk/entry.cpp \
     core/zygisk/module.cpp \
@@ -123,7 +123,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_SRC_FILES := \
     core/applet_stub.cpp \
-    core/resetprop/resetprop.cpp \
+    core/resetprop/sys.cpp \
     core/core-rs.cpp
 
 LOCAL_CFLAGS := -DAPPLET_STUB_MAIN=resetprop_main

native/src/Cargo.lock

@@ -25,3 +25,4 @@ quick-protobuf = { workspace = true }
 bytemuck = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 bit-set = { workspace = true }
+argh = { workspace = true }

native/src/core/Cargo.toml

@@ -1,7 +1,4 @@
-#include <sys/stat.h>
-
-#include <consts.hpp>
-#include <base.hpp>
+#include <core.hpp>
 
 int main(int argc, char *argv[]) {
     if (argc < 1)

native/src/core/applet_stub.cpp

@@ -1,9 +1,7 @@
 #include <libgen.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
-#include <consts.hpp>
-#include <base.hpp>
+#include <core.hpp>
 
 using namespace std;
 

native/src/core/applets.cpp

@@ -2,12 +2,13 @@ use crate::consts::{MAGISK_FULL_VER, MAGISK_PROC_CON, MAIN_CONFIG, ROOTMNT, ROOT
 use crate::db::Sqlite3;
 use crate::ffi::{
     DbEntryKey, ModuleInfo, RequestCode, check_key_combo, exec_common_scripts, exec_module_scripts,
-    get_magisk_tmp, get_prop, initialize_denylist, set_prop, setup_magisk_env,
+    get_magisk_tmp, initialize_denylist, setup_magisk_env,
 };
 use crate::logging::{magisk_logging, setup_logfile, start_log_daemon};
 use crate::module::disable_modules;
 use crate::mount::{clean_mounts, setup_preinit_dir};
 use crate::package::ManagerInfo;
+use crate::resetprop::{get_prop, set_prop};
 use crate::selinux::restore_tmpcon;
 use crate::su::SuInfo;
 use crate::zygisk::ZygiskState;
@@ -121,8 +122,8 @@ impl MagiskD {
             .log()
             .ok();
         let safe_mode = boot_cnt >= 2
-            || get_prop(cstr!("persist.sys.safemode"), true) == "1"
-            || get_prop(cstr!("ro.sys.safemode"), false) == "1"
+            || get_prop(cstr!("persist.sys.safemode")) == "1"
+            || get_prop(cstr!("ro.sys.safemode")) == "1"
             || check_key_combo();
 
         if safe_mode {
@@ -232,9 +233,9 @@ pub fn daemon_entry() {
     magisk_logging();
     info!("Magisk {} daemon started", MAGISK_FULL_VER);
 
-    let is_emulator = get_prop(cstr!("ro.kernel.qemu"), false) == "1"
-        || get_prop(cstr!("ro.boot.qemu"), false) == "1"
-        || get_prop(cstr!("ro.product.device"), false).contains("vsoc");
+    let is_emulator = get_prop(cstr!("ro.kernel.qemu")) == "1"
+        || get_prop(cstr!("ro.boot.qemu")) == "1"
+        || get_prop(cstr!("ro.product.device")).contains("vsoc");
 
     // Load config status
     let magisk_tmp = get_magisk_tmp();
@@ -265,7 +266,7 @@ pub fn daemon_entry() {
     }
     if sdk_int < 0 {
         // In case some devices do not store this info in build.prop, fallback to getprop
-        sdk_int = get_prop(cstr!("ro.build.version.sdk"), false)
+        sdk_int = get_prop(cstr!("ro.build.version.sdk"))
             .parse::<i32>()
             .unwrap_or(-1);
     }
@@ -278,13 +279,13 @@ pub fn daemon_entry() {
     switch_cgroup("/acct", pid);
     switch_cgroup("/dev/cg2_bpf", pid);
     switch_cgroup("/sys/fs/cgroup", pid);
-    if get_prop(cstr!("ro.config.per_app_memcg"), false) != "false" {
+    if get_prop(cstr!("ro.config.per_app_memcg")) != "false" {
         switch_cgroup("/dev/memcg/apps", pid);
     }
 
     // Samsung workaround #7887
     if cstr!("/system_ext/app/mediatek-res/mediatek-res.apk").exists() {
-        set_prop(cstr!("ro.vendor.mtk_model"), cstr!("0"), false);
+        set_prop(cstr!("ro.vendor.mtk_model"), cstr!("0"));
     }
 
     // Cleanup pre-init mounts
@@ -346,14 +347,14 @@ fn check_data() -> bool {
         if !mnt {
             return false;
         }
-        let crypto = get_prop(cstr!("ro.crypto.state"), false);
+        let crypto = get_prop(cstr!("ro.crypto.state"));
         return if !crypto.is_empty() {
             if crypto != "encrypted" {
                 // Unencrypted, we can directly access data
                 true
             } else {
                 // Encrypted, check whether vold is started
-                !get_prop(cstr!("init.svc.vold"), false).is_empty()
+                !get_prop(cstr!("init.svc.vold")).is_empty()
             }
         } else {
             // ro.crypto.state is not set, assume it's unencrypted

native/src/core/daemon.rs

@@ -17,6 +17,11 @@
 #define to_app_id(uid)  (uid % AID_USER_OFFSET)
 #define to_user_id(uid) (uid / AID_USER_OFFSET)
 
+// Multi-call entrypoints
+int magisk_main(int argc, char *argv[]);
+int su_client_main(int argc, char *argv[]);
+int zygisk_main(int argc, char *argv[]);
+
 // Return codes for daemon
 enum class RespondCode : int {
     ERROR = -1,

native/src/core/include/core.hpp

@@ -15,7 +15,7 @@ use derive::Decodable;
 use logging::{android_logging, setup_logfile, zygisk_close_logd, zygisk_get_logd, zygisk_logging};
 use module::remove_modules;
 use mount::{find_preinit_device, revert_unmount};
-use resetprop::{persist_delete_prop, persist_get_prop, persist_get_props, persist_set_prop};
+use resetprop::{get_prop, resetprop_main};
 use selinux::{lgetfilecon, lsetfilecon, restorecon, setfilecon};
 use socket::{recv_fd, recv_fds, send_fd, send_fds};
 use std::fs::File;
@@ -164,19 +164,6 @@ pub mod ffi {
         fn get_text(self: &DbValues, index: i32) -> &str;
         fn bind_text(self: Pin<&mut DbStatement>, index: i32, val: &str) -> i32;
         fn bind_int64(self: Pin<&mut DbStatement>, index: i32, val: i64) -> i32;
-
-        include!("include/resetprop.hpp");
-
-        #[cxx_name = "prop_callback"]
-        type PropCallback;
-        fn exec(self: Pin<&mut PropCallback>, name: Utf8CStrRef, value: Utf8CStrRef);
-
-        #[cxx_name = "get_prop_rs"]
-        fn get_prop(name: Utf8CStrRef, persist: bool) -> String;
-        #[cxx_name = "set_prop_rs"]
-        fn set_prop(name: Utf8CStrRef, value: Utf8CStrRef, skip_svc: bool) -> i32;
-        #[cxx_name = "load_prop_file_rs"]
-        fn load_prop_file(filename: Utf8CStrRef, skip_svc: bool);
     }
 
     extern "Rust" {
@@ -189,10 +176,6 @@ pub mod ffi {
         fn revert_unmount(pid: i32);
         fn remove_modules();
         fn zygisk_should_load_module(flags: u32) -> bool;
-        unsafe fn persist_get_prop(name: Utf8CStrRef, prop_cb: Pin<&mut PropCallback>);
-        unsafe fn persist_get_props(prop_cb: Pin<&mut PropCallback>);
-        unsafe fn persist_delete_prop(name: Utf8CStrRef) -> bool;
-        unsafe fn persist_set_prop(name: Utf8CStrRef, value: Utf8CStrRef) -> bool;
         fn send_fd(socket: i32, fd: i32) -> bool;
         fn send_fds(socket: i32, fds: &[i32]) -> bool;
         fn recv_fd(socket: i32) -> i32;
@@ -206,6 +189,9 @@ pub mod ffi {
         fn setfilecon(path: Utf8CStrRef, con: Utf8CStrRef) -> bool;
         fn lsetfilecon(path: Utf8CStrRef, con: Utf8CStrRef) -> bool;
 
+        fn get_prop(name: Utf8CStrRef) -> String;
+        unsafe fn resetprop_main(argc: i32, argv: *mut *mut c_char) -> i32;
+
         #[namespace = "rust"]
         fn daemon_entry();
     }

native/src/core/include/resetprop.hpp

@@ -1,7 +1,8 @@
 use crate::consts::{MODULEMNT, MODULEROOT, MODULEUPGRADE, WORKERDIR};
 use crate::daemon::MagiskD;
-use crate::ffi::{ModuleInfo, exec_module_scripts, exec_script, get_magisk_tmp, load_prop_file};
+use crate::ffi::{ModuleInfo, exec_module_scripts, exec_script, get_magisk_tmp};
 use crate::mount::setup_module_mount;
+use crate::resetprop::load_prop_file;
 use base::{
     DirEntry, Directory, FsPathBuilder, LibcReturn, LoggedResult, OsResultStatic, ResultExt,
     SilentLogExt, Utf8CStr, Utf8CStrBuf, Utf8CString, WalkResult, clone_attr, cstr, debug, error,
@@ -804,8 +805,7 @@ impl MagiskD {
                 // Read props
                 let prop = module_paths.append("system.prop");
                 if prop.module().exists() {
-                    // Do NOT go through property service as it could cause boot lock
-                    load_prop_file(prop.module(), true);
+                    load_prop_file(prop.module());
                 }
             }
             {