WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable hidden API policy on Android Pie

This commit is contained in:
solohsu 2019-02-15 14:37:36 +08:00
parent 5bf945f79d
commit 68cf907041
1 changed files with 74 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Core/jni/main/native_hook/native_hook.cpp
View File

@ -10,7 +10,7 @@ static const char *(*getDesc)(void *, std::string *);
static bool (*isInSamePackageBackup)(void *, void *) = nullptr; static bool (*isInSamePackageBackup)(void *, void *) = nullptr;
bool onIsInSamePackageCalled(void *thiz, void *that) { static bool onIsInSamePackageCalled(void *thiz, void *that) {
std::string storage1, storage2; std::string storage1, storage2;
const char *thisDesc = (*getDesc)(thiz, &storage1); const char *thisDesc = (*getDesc)(thiz, &storage1);
const char *thatDesc = (*getDesc)(that, &storage2); const char *thatDesc = (*getDesc)(that, &storage2);
@ -24,6 +24,72 @@ bool onIsInSamePackageCalled(void *thiz, void *that) {
return (*isInSamePackageBackup)(thiz, that); return (*isInSamePackageBackup)(thiz, that);
} }
static bool onInvokeHiddenAPI() {
return false;
}
/**
* NOTICE:
* After Android Q(10.0), GetMemberActionImpl has been renamed to ShouldDenyAccessToMemberImpl,
* But we don't know the symbols until it's published.
* @author asLody
*/
static bool disable_HiddenAPIPolicyImpl(int api_level, void *artHandle,
void (*hookFun)(void *, void *, void **)) {
if (api_level < ANDROID_P) {
return true;
}
void *symbol = nullptr;
// Android P : Preview 1 ~ 4 version
symbol = dlsym(artHandle,
"_ZN3art9hiddenapi25ShouldBlockAccessToMemberINS_8ArtFieldEEEbPT_PNS_6ThreadENSt3__18functionIFbS6_EEENS0_12AccessMethodE");
if (symbol) {
hookFun(symbol, reinterpret_cast<void *>(onInvokeHiddenAPI), nullptr);
}
symbol = dlsym(artHandle,
"_ZN3art9hiddenapi25ShouldBlockAccessToMemberINS_9ArtMethodEEEbPT_PNS_6ThreadENSt3__18functionIFbS6_EEENS0_12AccessMethodE"
);
if (symbol) {
hookFun(symbol, reinterpret_cast<void *>(onInvokeHiddenAPI), nullptr);
return true;
}
// Android P : Release version
symbol = dlsym(artHandle,
"_ZN3art9hiddenapi6detail19GetMemberActionImplINS_8ArtFieldEEENS0_6ActionEPT_NS_20HiddenApiAccessFlags7ApiListES4_NS0_12AccessMethodE"
);
if (symbol) {
hookFun(symbol, reinterpret_cast<void *>(onInvokeHiddenAPI), nullptr);
}
symbol = dlsym(artHandle,
"_ZN3art9hiddenapi6detail19GetMemberActionImplINS_9ArtMethodEEENS0_6ActionEPT_NS_20HiddenApiAccessFlags7ApiListES4_NS0_12AccessMethodE"
);
if (symbol) {
hookFun(symbol, reinterpret_cast<void *>(onInvokeHiddenAPI), nullptr);
}
return symbol != nullptr;
}
static void hook_IsInSamePackage(int api_level, void *artHandle,
void (*hookFun)(void *, void *, void **)) {
// 5.0 - 7.1
const char *isInSamePackageSym = "_ZN3art6mirror5Class15IsInSamePackageEPS1_";
const char *getDescriptorSym = "_ZN3art6mirror5Class13GetDescriptorEPNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE";
if (api_level >= ANDROID_O) {
// 8.0 and later
isInSamePackageSym = "_ZN3art6mirror5Class15IsInSamePackageENS_6ObjPtrIS1_EE";
}
void *original = dlsym(artHandle, isInSamePackageSym);
getDesc = reinterpret_cast<const char *(*)(void *, std::string *)>(dlsym(artHandle,
getDescriptorSym));
if (!original) {
LOGE("can't get isInSamePackageSym");
return;
}
(*hookFun)(original, reinterpret_cast<void *>(onIsInSamePackageCalled),
reinterpret_cast<void **>(&isInSamePackageBackup));
}
void install_inline_hooks() { void install_inline_hooks() {
int api_level = GetAndroidApiLevel(); int api_level = GetAndroidApiLevel();
if (api_level < ANDROID_LOLLIPOP) { if (api_level < ANDROID_LOLLIPOP) {
@ -46,20 +112,11 @@ void install_inline_hooks() {
LOGE("can't open libart"); LOGE("can't open libart");
return; return;
} }
// 5.0 - 7.1 hook_IsInSamePackage(api_level, artHandle, hookFun);
const char *isInSamePackageSym = "_ZN3art6mirror5Class15IsInSamePackageEPS1_"; if (disable_HiddenAPIPolicyImpl(api_level, artHandle, hookFun)) {
const char *getDescriptorSym = "_ZN3art6mirror5Class13GetDescriptorEPNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE"; LOGI("disable_HiddenAPIPolicyImpl done.");
if (api_level >= ANDROID_O) { } else {
// 8.0 and later LOGE("disable_HiddenAPIPolicyImpl failed.");
isInSamePackageSym = "_ZN3art6mirror5Class15IsInSamePackageENS_6ObjPtrIS1_EE";
} }
void *original = dlsym(artHandle, isInSamePackageSym);
getDesc = reinterpret_cast<const char *(*)(void *, std::string *)>(dlsym(artHandle,
getDescriptorSym));
if (!original) {
LOGE("can't get isInSamePackageSym");
return;
}
(*hookFun)(original, reinterpret_cast<void *>(onIsInSamePackageCalled),
reinterpret_cast<void **>(&isInSamePackageBackup));
} }