Skip to content

manager: drop truncate su, now kernel authorizes manager directly #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Prslc wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −50
Draft

manager: drop truncate su, now kernel authorizes manager directly #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/src/main/java/me/bmax/apatch/APatchApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package me.bmax.apatch

import android.app.Application
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.os.Build
Expand Down Expand Up @@ -50,7 +49,6 @@ class APApplication : Application(), Thread.UncaughtExceptionHandler {

@Deprecated("No more KPatch ELF from 0.11.0-dev")
const val KPATCH_PATH = "/data/adb/kpatch"
const val SUPERCMD = "/system/bin/truncate"
const val APATCH_FOLDER = "/data/adb/ap/"
private const val APATCH_BIN_FOLDER = APATCH_FOLDER + "bin/"
private const val APATCH_LOG_FOLDER = APATCH_FOLDER + "log/"
Expand Down Expand Up @@ -267,7 +265,7 @@ class APApplication : Application(), Thread.UncaughtExceptionHandler {
// TODO: We can't totally protect superkey from be stolen by root or LSPosed-like injection tools in user space, the only way is don't use superkey,
// TODO: 1. make me root by kernel
// TODO: 2. remove all usage of superkey
sharedPreferences = getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
sharedPreferences = getSharedPreferences(SP_NAME, MODE_PRIVATE)
superKey = "su"

okhttpClient =
Expand Down
84 changes: 37 additions & 47 deletions app/src/main/java/me/bmax/apatch/util/APatchCli.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import com.topjohnwu.superuser.ShellUtils
import com.topjohnwu.superuser.internal.MainShell
import com.topjohnwu.superuser.io.SuFile
import me.bmax.apatch.APApplication
import me.bmax.apatch.APApplication.Companion.SUPERCMD
import me.bmax.apatch.BuildConfig
import me.bmax.apatch.apApp
import me.bmax.apatch.ui.screen.MODULE_TYPE
Expand All @@ -42,64 +41,58 @@ class RootShellInitializer : Shell.Initializer() {

fun createRootShell(globalMnt: Boolean = false): Shell {
Shell.enableVerboseLogging = BuildConfig.DEBUG
val builder = Shell.Builder.create().setInitializers(RootShellInitializer::class.java)
val builder = Shell.Builder.create()
.setInitializers(RootShellInitializer::class.java)
return try {
builder.build(
SUPERCMD, APApplication.superKey, "-Z", APApplication.MAGISK_SCONTEXT
)
if (globalMnt) {
builder.setCommands("su -M")
} else {
builder.setCommands("su")
}
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "su failed: ", e)
return try {
Log.e(TAG, "retry compat kpatch su")
if (globalMnt) {
builder.build(
getKPatchPath(), APApplication.superKey, "su", "-Z", APApplication.MAGISK_SCONTEXT, "--mount-master"
builder.setCommands(
getKPatchPath(), APApplication.superKey, "su", "-Z",
APApplication.MAGISK_SCONTEXT, "--mount-master"
)
}else{
builder.build(
getKPatchPath(), APApplication.superKey, "su", "-Z", APApplication.MAGISK_SCONTEXT
} else {
builder.setCommands(
getKPatchPath(), APApplication.superKey, "su", "-Z",
APApplication.MAGISK_SCONTEXT
)
}
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "retry kpatch su failed: ", e)
return try {
Log.e(TAG, "retry su: ", e)
if (globalMnt) {
builder.build("su","-mm")
}else{
builder.build("su")
}
} catch (e: Throwable) {
Log.e(TAG, "retry su failed: ", e)
return builder.build("sh")
}
builder.setCommands("sh")
return builder.build()
}
}
}

private fun createMainRootShell() : Shell {
private fun createMainRootShell(): Shell {
val builder = Shell.Builder.create()
.setInitializers(RootShellInitializer::class.java)
val shell = try {
builder.build(SUPERCMD, APApplication.superKey, "-Z", APApplication.MAGISK_SCONTEXT)
builder.setCommands("su")
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "su failed: ", e)
builder.setCommands(getKPatchPath(), APApplication.superKey, "su", "-Z", APApplication.MAGISK_SCONTEXT)
builder.setCommands(
getKPatchPath(), APApplication.superKey, "su", "-Z",
APApplication.MAGISK_SCONTEXT
)
try {
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "retry kpatch su failed: ", e)
builder.setCommands("su")
try {
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "retry su failed: ", e)
builder.setCommands("sh")
builder.build()
}
builder.setCommands("sh")
builder.build()
}
}

MainShell.setBuilder(builder)
return shell
}
Expand Down Expand Up @@ -158,26 +151,23 @@ fun rootAvailable(): Boolean {
fun tryGetRootShell(): Shell {
Shell.enableVerboseLogging = BuildConfig.DEBUG
val builder = Shell.Builder.create()
.setInitializers(RootShellInitializer::class.java)
return try {
builder.build(
SUPERCMD, APApplication.superKey, "-Z", APApplication.MAGISK_SCONTEXT
)
builder.setCommands("su")
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "su failed: ", e)
return try {
Log.e(TAG, "retry compat kpatch su")
builder.build(
getKPatchPath(), APApplication.superKey, "su", "-Z", APApplication.MAGISK_SCONTEXT
builder.setCommands(
getKPatchPath(), APApplication.superKey, "su", "-Z",
APApplication.MAGISK_SCONTEXT
)
builder.build()
} catch (e: Throwable) {
Log.e(TAG, "retry kpatch su failed: ", e)
return try {
Log.e(TAG, "retry su: ", e)
builder.build("su")
} catch (e: Throwable) {
Log.e(TAG, "retry su failed: ", e)
builder.build("sh")
}
builder.setCommands("sh")
return builder.build()
}
}
}
Expand Down Expand Up @@ -321,7 +311,7 @@ fun runAPModuleAction(
}
}

val result = withNewRootShell{
val result = withNewRootShell{
newJob().add("${APApplication.APD_PATH} module action $moduleId")
.to(stdoutCallback, stderrCallback).exec()
}
Expand Down
Loading