TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-24 19:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip cert check on debug builds

Browse Source
This commit is contained in:
topjohnwu 2022-05-24 05:39:16 -07:00
parent 2a252d13b8
commit 8dfb30fefe
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/jni/core/package.cpp
View File

@ -103,6 +103,7 @@ int get_manager(int user_id, string *pkg, bool install) {
default_new(mgr_cert); default_new(mgr_cert);
auto check_dyn = [&](int u) -> bool { auto check_dyn = [&](int u) -> bool {
#if ENFORCE_SIGNATURE
snprintf(app_path, sizeof(app_path), snprintf(app_path, sizeof(app_path),
"%s/%d/%s/dyn/current.apk", APP_DATA_DIR, u, mgr_pkg->data()); "%s/%d/%s/dyn/current.apk", APP_DATA_DIR, u, mgr_pkg->data());
int dyn = open(app_path, O_RDONLY | O_CLOEXEC); int dyn = open(app_path, O_RDONLY | O_CLOEXEC);
@ -112,11 +113,10 @@ int get_manager(int user_id, string *pkg, bool install) {
close(dyn); close(dyn);
if (mismatch) { if (mismatch) {
LOGE("pkg: dyn APK signature mismatch: %s\n", app_path); LOGE("pkg: dyn APK signature mismatch: %s\n", app_path);
#if ENFORCE_SIGNATURE
clear_pkg(mgr_pkg->data(), u); clear_pkg(mgr_pkg->data(), u);
return false; return false;
#endif
} }
#endif
return true; return true;
}; };
@ -227,22 +227,20 @@ int get_manager(int user_id, string *pkg, bool install) {
auto check_pkg = [&](int u) -> bool { auto check_pkg = [&](int u) -> bool {
snprintf(app_path, sizeof(app_path), "%s/%d/" JAVA_PACKAGE_NAME, APP_DATA_DIR, u); snprintf(app_path, sizeof(app_path), "%s/%d/" JAVA_PACKAGE_NAME, APP_DATA_DIR, u);
if (stat(app_path, &st) == 0) { if (stat(app_path, &st) == 0) {
#if ENFORCE_SIGNATURE
string apk = find_apk_path(JAVA_PACKAGE_NAME); string apk = find_apk_path(JAVA_PACKAGE_NAME);
int fd = xopen(apk.data(), O_RDONLY | O_CLOEXEC); int fd = xopen(apk.data(), O_RDONLY | O_CLOEXEC);
string cert = read_certificate(fd); string cert = read_certificate(fd);
close(fd); close(fd);
if (default_cert && cert != *default_cert) { if (default_cert && cert != *default_cert) {
// Found APK with invalid signature, force replace with stub // Found APK with invalid signature, force replace with stub
LOGE("pkg: APK signature mismatch: %s\n", apk.data()); LOGE("pkg: APK signature mismatch: %s\n", apk.data());
#if ENFORCE_SIGNATURE
uninstall_pkg(JAVA_PACKAGE_NAME); uninstall_pkg(JAVA_PACKAGE_NAME);
invalid = true; invalid = true;
install = true; install = true;
return false; return false;
#endif
} }
#endif
mgr_pkg->clear(); mgr_pkg->clear();
mgr_cert->clear(); mgr_cert->clear();
mgr_app_id = to_app_id(st.st_uid); mgr_app_id = to_app_id(st.st_uid);