TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-23 18:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use AppComponentFactory to replace ClassLoader

Browse Source
This commit is contained in:
topjohnwu 2022-02-01 22:43:44 -08:00
parent 7f65f7d3ca
commit 355341f0ab
7 changed files with 139 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/shared/src/main/java/com/topjohnwu/magisk/DynAPK.java
View File

@ -3,6 +3,7 @@ package com.topjohnwu.magisk;
import static android.os.Build.VERSION.SDK_INT;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.res.AssetManager;
import java.io.File;
@ -16,24 +17,35 @@ public class DynAPK {
private static File dynDir;
private static Method addAssetPath;
private static File getDynDir(Context c) {
private static File getDynDir(ApplicationInfo info) {
if (dynDir == null) {
final String dataDir;
if (SDK_INT >= 24) {
// Use protected context to allow directBootAware
c = c.createDeviceProtectedStorageContext();
// Use device protected path to allow directBootAware
dataDir = info.deviceProtectedDataDir;
} else {
dataDir = info.dataDir;
}
dynDir = new File(c.getFilesDir().getParent(), "dyn");
dynDir.mkdir();
dynDir = new File(dataDir, "dyn");
dynDir.mkdirs();
}
return dynDir;
}
public static File current(Context c) {
return new File(getDynDir(c), "current.apk");
return new File(getDynDir(c.getApplicationInfo()), "current.apk");
}
public static File current(ApplicationInfo info) {
return new File(getDynDir(info), "current.apk");
}
public static File update(Context c) {
return new File(getDynDir(c), "update.apk");
return new File(getDynDir(c.getApplicationInfo()), "update.apk");
}
public static File update(ApplicationInfo info) {
return new File(getDynDir(info), "update.apk");
}
public static void addAssetPath(AssetManager asset, String path) {

12
stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java
View File

@ -30,3 +30,15 @@ class RedirectClassLoader extends ClassLoader {
return clz == null ? super.loadClass(name, resolve) : clz;
}
}
class DelegateClassLoader extends ClassLoader {
DelegateClassLoader() {
super(null);
}
@Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
return DynLoad.loader.loadClass(name);
}
}

12
stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java
View File

@ -2,11 +2,8 @@ package com.topjohnwu.magisk;
import android.app.Application;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.res.Configuration;
import java.lang.reflect.Method;
import io.michaelrocks.paranoid.Obfuscate;
@Obfuscate
@ -17,14 +14,7 @@ public class DelegateApplication extends Application {
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
receiver = DynLoad.setup(this);
if (receiver != null) try {
// Call attachBaseContext without ContextImpl to show it is being wrapped
Method m = ContextWrapper.class.getDeclaredMethod("attachBaseContext", Context.class);
m.setAccessible(true);
m.invoke(receiver, this);
} catch (Exception ignored) { /* Impossible */ }
receiver = DynLoad.createAndSetupApp(this);
}
@Override

19
stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java
View File

@ -8,20 +8,25 @@ import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.ContentProvider;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@SuppressLint("NewApi")
public class DelegateComponentFactory extends AppComponentFactory {
ClassLoader loader;
AppComponentFactory receiver;
public DelegateComponentFactory() {
DynLoad.componentFactory = this;
}
@Override
public ClassLoader instantiateClassLoader(ClassLoader cl, ApplicationInfo info) {
DynLoad.loadAPK(info);
return new DelegateClassLoader();
}
@Override
public Application instantiateApplication(ClassLoader cl, String className) {
if (loader == null) loader = cl;
return new DelegateApplication();
}
@ -29,7 +34,7 @@ public class DelegateComponentFactory extends AppComponentFactory {
public Activity instantiateActivity(ClassLoader cl, String className, Intent intent)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
if (receiver != null)
return receiver.instantiateActivity(loader, className, intent);
return receiver.instantiateActivity(DynLoad.loader, className, intent);
return create(className);
}
@ -37,7 +42,7 @@ public class DelegateComponentFactory extends AppComponentFactory {
public BroadcastReceiver instantiateReceiver(ClassLoader cl, String className, Intent intent)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
if (receiver != null)
return receiver.instantiateReceiver(loader, className, intent);
return receiver.instantiateReceiver(DynLoad.loader, className, intent);
return create(className);
}
@ -45,7 +50,7 @@ public class DelegateComponentFactory extends AppComponentFactory {
public Service instantiateService(ClassLoader cl, String className, Intent intent)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
if (receiver != null)
return receiver.instantiateService(loader, className, intent);
return receiver.instantiateService(DynLoad.loader, className, intent);
return create(className);
}
@ -53,13 +58,13 @@ public class DelegateComponentFactory extends AppComponentFactory {
public ContentProvider instantiateProvider(ClassLoader cl, String className)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
if (receiver != null)
return receiver.instantiateProvider(loader, className);
return receiver.instantiateProvider(DynLoad.loader, className);
return create(className);
}
private <T> T create(String name)
throws ClassNotFoundException, IllegalAccessException, InstantiationException{
return (T) loader.loadClass(name).newInstance();
return (T) DynLoad.loader.loadClass(name).newInstance();
}
}

7
stub/src/main/java/com/topjohnwu/magisk/DelegateRootService.java
View File

@ -5,7 +5,6 @@ import android.content.ContextWrapper;
import android.util.Log;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import io.michaelrocks.paranoid.Obfuscate;
@ -18,7 +17,7 @@ public class DelegateRootService extends ContextWrapper {
@Override
protected void attachBaseContext(Context base) {
if (DynLoad.inject(base) == null)
if (DynLoad.createApp(base) == null)
return;
// Create the actual RootService and call its attachBaseContext
@ -26,9 +25,7 @@ public class DelegateRootService extends ContextWrapper {
Constructor<?> ctor = DynLoad.apkData.getRootService().getConstructor(Object.class);
ctor.setAccessible(true);
Object service = ctor.newInstance(this);
Method m = ContextWrapper.class.getDeclaredMethod("attachBaseContext", Context.class);
m.setAccessible(true);
m.invoke(service, base);
DynLoad.attachContext(service, base);
} catch (Exception e) {
Log.e(DelegateRootService.class.getSimpleName(), "", e);
}

3
stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
View File

@ -118,8 +118,7 @@ public class DownloadActivity extends Activity {
File apk = dynLoad ? DynAPK.current(this) : new File(getCacheDir(), "manager.apk");
request(apkLink).setExecutor(AsyncTask.THREAD_POOL_EXECUTOR).getAsFile(apk, file -> {
if (dynLoad) {
DynLoad.setup(this);
runOnUiThread(onSuccess);
// TODO
} else {
var receiver = APKInstall.register(this, BuildConfig.APPLICATION_ID, onSuccess);
APKInstall.installapk(this, file);

127
stub/src/main/java/com/topjohnwu/magisk/DynLoad.java
View File

@ -2,7 +2,6 @@ package com.topjohnwu.magisk;
import android.app.AppComponentFactory;
import android.app.Application;
import android.content.ContentResolver;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
@ -10,6 +9,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.util.Log;
import com.topjohnwu.magisk.utils.APKInstall;
@ -20,6 +20,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import io.michaelrocks.paranoid.Obfuscate;
@ -27,23 +28,52 @@ import io.michaelrocks.paranoid.Obfuscate;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class DynLoad {
// The current active classloader
static ClassLoader loader = new RedirectClassLoader();
static Object componentFactory;
static final DynAPK.Data apkData = createApkData();
// Dynamically load APK, inject ClassLoader into ContextImpl, then
// create the actual Application instance from the loaded APK
static Application inject(Context context) {
File apk = DynAPK.current(context);
File update = DynAPK.update(context);
private static boolean loadedApk = false;
static void attachContext(Object o, Context context) {
if (!(o instanceof ContextWrapper))
return;
try {
Method m = ContextWrapper.class.getDeclaredMethod("attachBaseContext", Context.class);
m.setAccessible(true);
m.invoke(o, context);
} catch (Exception ignored) { /* Impossible */ }
}
// Dynamically load APK from internal or external storage
static void loadAPK(ApplicationInfo info) {
if (loadedApk)
return;
loadedApk = true;
File apk = DynAPK.current(info);
File update = DynAPK.update(info);
if (update.exists()) {
// Rename from update
update.renameTo(apk);
}
if (BuildConfig.DEBUG) {
// Copy from external for easier development
File external = new File(context.getExternalFilesDir(null), "magisk.apk");
if (BuildConfig.DEBUG) copy_from_ext: {
final File dir;
try {
var dirs = (File[]) Environment.class
.getMethod("buildExternalStorageAppFilesDirs", String.class)
.invoke(null, info.packageName);
if (dirs == null)
break copy_from_ext;
dir = dirs[0];
} catch (ReflectiveOperationException e) {
Log.e(DynLoad.class.getSimpleName(), "", e);
break copy_from_ext;
}
File external = new File(dir, "magisk.apk");
if (external.exists()) {
try {
var in = new FileInputStream(external);
@ -60,19 +90,33 @@ public class DynLoad {
}
}
if (!apk.exists() && !context.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
// Copy from previous app
if (apk.exists()) {
loader = new InjectedClassLoader(apk);
}
}
// Dynamically load APK, inject ClassLoader into ContextImpl, then
// create the non-stub Application instance from the loaded APK
static Application createApp(Context context) {
File apk = DynAPK.current(context);
loadAPK(context.getApplicationInfo());
// Trigger folder creation
context.getExternalFilesDir(null);
// If no APK to load, attempt to copy from previous app
if (!isDynLoader() && !context.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
Uri uri = new Uri.Builder().scheme("content")
.authority("com.topjohnwu.magisk.provider")
.encodedPath("apk_file").build();
ContentResolver resolver = context.getContentResolver();
try {
InputStream src = resolver.openInputStream(uri);
InputStream src = context.getContentResolver().openInputStream(uri);
if (src != null) {
var out = new FileOutputStream(apk);
try (src; out) {
APKInstall.transfer(src, out);
}
loader = new InjectedClassLoader(apk);
}
} catch (IOException e) {
Log.e(DynLoad.class.getSimpleName(), "", e);
@ -80,12 +124,11 @@ public class DynLoad {
}
}
if (apk.exists()) {
ClassLoader cl = new InjectedClassLoader(apk);
if (isDynLoader()) {
PackageManager pm = context.getPackageManager();
PackageInfo pkgInfo = pm.getPackageArchiveInfo(apk.getPath(), 0);
try {
return createApp(context, cl, pkgInfo.applicationInfo);
return newApp(pkgInfo.applicationInfo);
} catch (ReflectiveOperationException e) {
Log.e(DynLoad.class.getSimpleName(), "", e);
apk.delete();
@ -95,65 +138,63 @@ public class DynLoad {
return null;
}
// Inject and create Application, or setup redirections for the current app
static Application setup(Context context) {
Application app = inject(context);
// Stub app setup entry
static Application createAndSetupApp(Application context) {
// On API >= 29, AppComponentFactory will replace the ClassLoader
if (Build.VERSION.SDK_INT < 29)
replaceClassLoader(context);
Application app = createApp(context);
if (app != null) {
// Send real application to attachBaseContext
attachContext(app, context);
}
return app;
}
ClassLoader cl = new RedirectClassLoader();
try {
setClassLoader(context, cl);
if (Build.VERSION.SDK_INT >= 28) {
((DelegateComponentFactory) componentFactory).loader = cl;
}
} catch (Exception e) {
Log.e(DynLoad.class.getSimpleName(), "", e);
private static boolean isDynLoader() {
return loader instanceof InjectedClassLoader;
}
return null;
}
private static Application createApp(Context context, ClassLoader cl, ApplicationInfo info)
throws ReflectiveOperationException {
private static Application newApp(ApplicationInfo info) throws ReflectiveOperationException {
// Create the receiver Application
Object app = cl.loadClass(info.className)
var app = (Application) loader.loadClass(info.className)
.getConstructor(Object.class)
.newInstance(apkData.getObject());
// Create the receiver component factory
if (Build.VERSION.SDK_INT >= 28 && componentFactory != null) {
Object factory = cl.loadClass(info.appComponentFactory).newInstance();
DelegateComponentFactory delegate = (DelegateComponentFactory) componentFactory;
delegate.loader = cl;
Object factory = loader.loadClass(info.appComponentFactory).newInstance();
var delegate = (DelegateComponentFactory) componentFactory;
delegate.receiver = (AppComponentFactory) factory;
}
setClassLoader(context, cl);
return (Application) app;
return app;
}
// Replace LoadedApk mClassLoader
private static void setClassLoader(Context context, ClassLoader cl)
throws NoSuchFieldException, IllegalAccessException {
private static void replaceClassLoader(Context context) {
// Get ContextImpl
while (context instanceof ContextWrapper) {
context = ((ContextWrapper) context).getBaseContext();
}
try {
Field mInfo = context.getClass().getDeclaredField("mPackageInfo");
mInfo.setAccessible(true);
Object loadedApk = mInfo.get(context);
assert loadedApk != null;
Field mcl = loadedApk.getClass().getDeclaredField("mClassLoader");
mcl.setAccessible(true);
mcl.set(loadedApk, cl);
mcl.set(loadedApk, new DelegateClassLoader());
} catch (Exception e) {
// Actually impossible as this method is only called on API < 29,
// and API 21 - 28 do not restrict access to these methods/fields.
Log.e(DynLoad.class.getSimpleName(), "", e);
}
}
private static DynAPK.Data createApkData() {
DynAPK.Data data = new DynAPK.Data();
var data = new DynAPK.Data();
data.setVersion(BuildConfig.STUB_VERSION);
data.setClassToComponent(Mapping.inverseMap);
data.setRootService(DelegateRootService.class);