WeiguangTWK
/
GKMSPatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix signature bypass

This commit is contained in:
Nullptr 2021-09-12 02:57:03 +08:00
parent 58b6677ece
commit fa4f4cecff
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
appstub/src/main/java/org/lsposed/lspatch/appstub/LSPAppComponentFactoryStub.java
View File

@ -21,7 +21,7 @@ import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
import dalvik.system.PathClassLoader; import dalvik.system.DelegateLastClassLoader;
@SuppressLint("NewApi") @SuppressLint("NewApi")
public class LSPAppComponentFactoryStub extends AppComponentFactory { public class LSPAppComponentFactoryStub extends AppComponentFactory {
@ -29,7 +29,6 @@ public class LSPAppComponentFactoryStub extends AppComponentFactory {
private static final String PROXY_APPLICATION = "org.lsposed.lspatch.appstub.LSPApplicationStub"; private static final String PROXY_APPLICATION = "org.lsposed.lspatch.appstub.LSPApplicationStub";
private ClassLoader appClassLoader = null; private ClassLoader appClassLoader = null;
private ClassLoader lspClassLoader = null;
private ClassLoader baseClassLoader = null; private ClassLoader baseClassLoader = null;
private AppComponentFactory originalAppComponentFactory = null; private AppComponentFactory originalAppComponentFactory = null;
@ -56,7 +55,7 @@ public class LSPAppComponentFactoryStub extends AppComponentFactory {
} }
} }
appClassLoader = new PathClassLoader(cacheApkPath, aInfo.nativeLibraryDir, baseClassLoader.getParent()); appClassLoader = new DelegateLastClassLoader(cacheApkPath, aInfo.nativeLibraryDir, baseClassLoader);
try { try {
originalAppComponentFactory = (AppComponentFactory) appClassLoader.loadClass(originalAppComponentFactoryClass).newInstance(); originalAppComponentFactory = (AppComponentFactory) appClassLoader.loadClass(originalAppComponentFactoryClass).newInstance();
@ -75,9 +74,6 @@ public class LSPAppComponentFactoryStub extends AppComponentFactory {
@Override @Override
public ClassLoader instantiateClassLoader(ClassLoader cl, ApplicationInfo aInfo) { public ClassLoader instantiateClassLoader(ClassLoader cl, ApplicationInfo aInfo) {
baseClassLoader = cl; baseClassLoader = cl;
var apkPath = baseClassLoader.getResource("AndroidManifest.xml").getPath();
apkPath = apkPath.substring(5, apkPath.lastIndexOf('!'));
lspClassLoader = new PathClassLoader(apkPath, null, null);
initOriginalAppComponentFactory(aInfo); initOriginalAppComponentFactory(aInfo);
Log.d(TAG, "baseClassLoader is " + baseClassLoader); Log.d(TAG, "baseClassLoader is " + baseClassLoader);
Log.d(TAG, "appClassLoader is " + appClassLoader); Log.d(TAG, "appClassLoader is " + appClassLoader);
@ -86,7 +82,7 @@ public class LSPAppComponentFactoryStub extends AppComponentFactory {
@Override @Override
public Application instantiateApplication(ClassLoader cl, String className) throws IllegalAccessException, InstantiationException, ClassNotFoundException { public Application instantiateApplication(ClassLoader cl, String className) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
lspClassLoader.loadClass(PROXY_APPLICATION).newInstance(); baseClassLoader.loadClass(PROXY_APPLICATION).newInstance();
Log.i(TAG, "lspd initialized, instantiate original application"); Log.i(TAG, "lspd initialized, instantiate original application");
return originalAppComponentFactory.instantiateApplication(cl, className); return originalAppComponentFactory.instantiateApplication(cl, className);
} }

2
core

@ -1 +1 @@
Subproject commit 415f8e03c849cff89c66d258879e079587349418 Subproject commit d76db3cb82d52c648aed4c8e798eb0385936589c