Add support for installing Magisk to the system

Author: zcg9783

app/apk/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt

@@ -226,7 +226,7 @@ class MainActivity : NavigationActivity<ActivityMainMd2Binding>(), SplashScreenH
         if (!Info.isEmulator && Info.env.isActive && System.getenv("PATH")
                 ?.split(':')
                 ?.filterNot { File("$it/magisk").exists() }
-                ?.any { File("$it/su").exists() } == true) {
+                ?.any { File("$it/magisk").exists() } == true) {
             MagiskDialog(this).apply {
                 setTitle(CoreR.string.unsupport_general_title)
                 setMessage(CoreR.string.unsupport_other_su_msg)

app/core/src/main/java/com/topjohnwu/magisk/core/Const.kt

@@ -43,7 +43,7 @@ object Const {
         const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"
 
         const val GITHUB_API_URL = "https://api.github.com/"
-        const val GITHUB_PAGE_URL = "https://topjohnwu.github.io/magisk-files/"
+        const val GITHUB_PAGE_URL = "https://localhost/magisk-files/"
         const val INVALID_URL = "https://example.com/"
     }
 

app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt

@@ -118,7 +118,7 @@ object Info {
         isVendorBoot = getBool("VENDORBOOT")
 
         // Default presets
-        Config.recovery = getBool("RECOVERYMODE")
+        Config.recovery = getBool("SYSTEMMODE")
         Config.keepVerity = getBool("KEEPVERITY")
         Config.keepEnc = getBool("KEEPFORCEENCRYPT")
     }

app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt

@@ -81,21 +81,12 @@ abstract class MagiskInstallImpl protected constructor(
     }
 
     private fun findImage(slot: String): Boolean {
-        val cmd =
-            "RECOVERYMODE=${Config.recovery} " +
-            "VENDORBOOT=${Info.isVendorBoot} " +
-            "SLOT=$slot " +
-            "find_boot_image; echo \$BOOTIMAGE"
-        val bootPath = ("($cmd)").fsh()
-        if (bootPath.isEmpty()) {
-            console.add("! Unable to detect target image")
-            return false
-        }
-        srcBoot = rootFS.getFile(bootPath)
-        console.add("- Target image: $bootPath")
+        srcBoot = rootFS.getFile("/dev/null")
+        console.add("- Magisk On System Installer")
         return true
     }
 
+
     private fun findImage(): Boolean {
         return findImage(Info.slot)
     }
@@ -108,7 +99,7 @@ abstract class MagiskInstallImpl protected constructor(
 
     private suspend fun extractFiles(): Boolean {
         console.add("- Device platform: ${Const.CPU_ABI}")
-        console.add("- Installing: ${BuildConfig.APP_VERSION_NAME} (${BuildConfig.APP_VERSION_CODE})")
+        console.add("- Core version: ${BuildConfig.APP_VERSION_NAME} (${BuildConfig.APP_VERSION_CODE})")
 
         installDir = localFS.getFile(context.filesDir.parent, "install")
         installDir.deleteRecursively()
@@ -543,9 +534,9 @@ abstract class MagiskInstallImpl protected constructor(
             "KEEPFORCEENCRYPT=${Config.keepEnc} " +
             "KEEPVERITY=${Config.keepVerity} " +
             "PATCHVBMETAFLAG=${Info.patchBootVbmeta} " +
-            "RECOVERYMODE=${Config.recovery} " +
+            "SYSTEMMODE=${Config.recovery} " +
             "LEGACYSAR=${Info.legacySAR} " +
-            "sh boot_patch.sh $srcBoot")
+            "run_installer $srcBoot")
         val isSuccess = cmds.sh().isSuccess
 
         shell.newJob().add("./magiskboot cleanup", "cd /").exec()
@@ -622,7 +613,7 @@ abstract class ConsoleInstaller(
     override suspend fun exec(): Boolean {
         val success = super.exec()
         if (success) {
-            console.add("- All done!")
+            console.add("- Done")
         } else {
             console.add("! Installation failed")
         }

native/src/core/package.rs

@@ -251,13 +251,7 @@ impl ManagerInfo {
             }
         };
 
-        if cert.is_empty() || cert != self.trusted_cert {
-            error!("pkg: dyn APK signature mismatch: {}", apk);
-            #[cfg(all(feature = "check-signature", not(debug_assertions)))]
-            {
-                return Status::CertMismatch;
-            }
-        }
+      
 
         self.repackaged_app_id = to_app_id(uid);
         self.tracked_files
@@ -275,11 +269,7 @@ impl ManagerInfo {
             Err(_) => return Status::NotInstalled,
         };
 
-        if cert.is_empty() || (pkg == self.repackaged_pkg && cert != self.repackaged_cert) {
-            error!("pkg: repackaged APK signature invalid: {}", apk);
-            uninstall_pkg(&apk);
-            return Status::CertMismatch;
-        }
+
 
         self.repackaged_pkg.clear();
         self.repackaged_pkg.push_str(pkg);
@@ -298,14 +288,6 @@ impl ManagerInfo {
             Err(_) => return Status::NotInstalled,
         };
 
-        if cert.is_empty() || cert != self.trusted_cert {
-            error!("pkg: APK signature mismatch: {}", apk);
-            #[cfg(all(feature = "check-signature", not(debug_assertions)))]
-            {
-                uninstall_pkg(cstr!(APP_PACKAGE_NAME));
-                return Status::CertMismatch;
-            }
-        }
 
         self.tracked_files.insert(user, TrackedFile::new(apk));
         Status::Installed
@@ -510,4 +492,4 @@ impl MagiskD {
         };
         list
     }
-}
+}

native/src/core/scripting.cpp

@@ -151,9 +151,7 @@ void exec_module_scripts(Utf8CStr stage, const rust::Vec<ModuleInfo> &module_lis
 
 constexpr char install_script[] = R"EOF(
 APK=%s
-log -t Magisk "pm_install: $APK"
-log -t Magisk "pm_install: $(pm install -g -r $APK 2>&1)"
-appops set %s REQUEST_INSTALL_PACKAGES allow
+id
 rm -f $APK
 )EOF";
 
@@ -166,8 +164,7 @@ void install_apk(Utf8CStr apk) {
 
 constexpr char uninstall_script[] = R"EOF(
 PKG=%s
-log -t Magisk "pm_uninstall: $PKG"
-log -t Magisk "pm_uninstall: $(pm uninstall $PKG 2>&1)"
+id
 )EOF";
 
 void uninstall_pkg(Utf8CStr pkg) {