More logging

Co-authored-by: chiteroman <98092901+chiteroman@users.noreply.github.com>
This commit is contained in:
osm0sis
2024-01-19 14:44:03 -04:00
parent 5901844ce3
commit e2cb4e1523
3 changed files with 12 additions and 7 deletions

View File

@@ -31,7 +31,7 @@ static void modify_callback(void *cookie, const char *name, const char *value, u
// Spoof specific property values // Spoof specific property values
if (prop == "sys.usb.state") { if (prop == "sys.usb.state") {
value = "mtp"; value = "mtp"; // Hide USB Debugging
} }
if (jsonProps.count(prop)) { if (jsonProps.count(prop)) {
@@ -121,14 +121,14 @@ public:
if (dexSize < 1) { if (dexSize < 1) {
close(fd); close(fd);
LOGD("Couldn't read classes.dex"); LOGD("Couldn't read dex file");
api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY); api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
return; return;
} }
if (jsonSize < 1) { if (jsonSize < 1) {
close(fd); close(fd);
LOGD("Couldn't read pif.json"); LOGD("Couldn't read json file");
api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY); api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
return; return;
} }
@@ -141,8 +141,8 @@ public:
close(fd); close(fd);
LOGD("Read from file descriptor file 'classes.dex' -> %ld bytes", dexSize); LOGD("Read from file descriptor for 'dex' -> %ld bytes", dexSize);
LOGD("Read from file descriptor file 'pif.json' -> %ld bytes", jsonSize); LOGD("Read from file descriptor for 'json' -> %ld bytes", jsonSize);
std::string data(jsonVector.cbegin(), jsonVector.cend()); std::string data(jsonVector.cbegin(), jsonVector.cend());
json = nlohmann::json::parse(data, nullptr, false, true); json = nlohmann::json::parse(data, nullptr, false, true);
@@ -216,13 +216,13 @@ private:
auto getSystemClassLoader = env->GetStaticMethodID(clClass, "getSystemClassLoader", "()Ljava/lang/ClassLoader;"); auto getSystemClassLoader = env->GetStaticMethodID(clClass, "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
auto systemClassLoader = env->CallStaticObjectMethod(clClass, getSystemClassLoader); auto systemClassLoader = env->CallStaticObjectMethod(clClass, getSystemClassLoader);
LOGD("JNI: Creating class loader"); LOGD("JNI: Creating module classloader");
auto dexClClass = env->FindClass("dalvik/system/InMemoryDexClassLoader"); auto dexClClass = env->FindClass("dalvik/system/InMemoryDexClassLoader");
auto dexClInit = env->GetMethodID(dexClClass, "<init>", "(Ljava/nio/ByteBuffer;Ljava/lang/ClassLoader;)V"); auto dexClInit = env->GetMethodID(dexClClass, "<init>", "(Ljava/nio/ByteBuffer;Ljava/lang/ClassLoader;)V");
auto buffer = env->NewDirectByteBuffer(dexVector.data(), static_cast<jlong>(dexVector.size())); auto buffer = env->NewDirectByteBuffer(dexVector.data(), static_cast<jlong>(dexVector.size()));
auto dexCl = env->NewObject(dexClClass, dexClInit, buffer, systemClassLoader); auto dexCl = env->NewObject(dexClClass, dexClInit, buffer, systemClassLoader);
LOGD("JNI: Loading class"); LOGD("JNI: Loading module class");
auto loadClass = env->GetMethodID(clClass, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); auto loadClass = env->GetMethodID(clClass, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
auto entryClassName = env->NewStringUTF("es.chiteroman.playintegrityfix.EntryPoint"); auto entryClassName = env->NewStringUTF("es.chiteroman.playintegrityfix.EntryPoint");
auto entryClassObj = env->CallObjectMethod(dexCl, loadClass, entryClassName); auto entryClassObj = env->CallObjectMethod(dexCl, loadClass, entryClassName);

View File

@@ -12,6 +12,7 @@ public final class CustomProvider extends Provider {
@Override @Override
public synchronized Service getService(String type, String algorithm) { public synchronized Service getService(String type, String algorithm) {
if (EntryPoint.getVerboseLogs() > 2) EntryPoint.LOG(String.format("Service: Caller type '%s' with algorithm '%s'", type, algorithm));
if (type.equals("KeyStore")) EntryPoint.spoofDevice(); if (type.equals("KeyStore")) EntryPoint.spoofDevice();
return super.getService(type, algorithm); return super.getService(type, algorithm);
} }

View File

@@ -20,6 +20,10 @@ public final class EntryPoint {
private static final Map<String, String> map = new HashMap<>(); private static final Map<String, String> map = new HashMap<>();
public static Integer getVerboseLogs() {
return verboseLogs;
}
public static void init(int level) { public static void init(int level) {
verboseLogs = level; verboseLogs = level;
if (verboseLogs > 99) logFields(); if (verboseLogs > 99) logFields();