frida-java-bridge 6.1.3 → 6.2.2

package/index.js

@@ -21,6 +21,19 @@ const jsizeSize = 4;
 const pointerSize = Process.pointerSize;
 
 class Runtime {
+  ACC_PUBLIC       = 0x0001;
+  ACC_PRIVATE      = 0x0002;
+  ACC_PROTECTED    = 0x0004;
+  ACC_STATIC       = 0x0008;
+  ACC_FINAL        = 0x0010;
+  ACC_SYNCHRONIZED = 0x0020;
+  ACC_BRIDGE       = 0x0040;
+  ACC_VARARGS      = 0x0080;
+  ACC_NATIVE       = 0x0100;
+  ACC_ABSTRACT     = 0x0400;
+  ACC_STRICT       = 0x0800;
+  ACC_SYNTHETIC    = 0x1000;
+
   constructor () {
     this.classFactory = null;
     this.ClassFactory = ClassFactory;

package/lib/android.js

@@ -242,6 +242,9 @@ function _getApi () {
           _ZN3art6mirror5Class13GetDescriptorEPNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE: function (address) {
             this['art::mirror::Class::GetDescriptor'] = address;
           },
+          _ZN3art6mirror5Class11GetLocationEv: function (address) {
+            this['art::mirror::Class::GetLocation'] = makeCxxMethodWrapperReturningStdStringByValue(address, ['pointer']);
+          },
 
           _ZN3art9ArtMethod12PrettyMethodEb: function (address) {
             this['art::ArtMethod::PrettyMethod'] = makeCxxMethodWrapperReturningStdStringByValue(address, ['pointer', 'bool']);
@@ -332,6 +335,7 @@ function _getApi () {
           '_ZNK3art12StackVisitor24GetCurrentQuickFrameInfoEv',
           '_ZN3art6Thread18GetLongJumpContextEv',
           '_ZN3art6mirror5Class13GetDescriptorEPNSt3__112basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEE',
+          '_ZN3art6mirror5Class11GetLocationEv',
           '_ZN3art9ArtMethod12PrettyMethodEb',
           '_ZN3art12PrettyMethodEPNS_9ArtMethodEb',
           '_ZN3art3Dbg13ConfigureJdwpERKNS_4JDWP11JdwpOptionsE',
@@ -430,6 +434,18 @@ function _getApi () {
   temporaryApi.vm = vms.readPointer();
 
   if (isArt) {
+    const apiLevel = getAndroidApiLevel();
+
+    let kAccCompileDontBother;
+    if (apiLevel >= 27) {
+      kAccCompileDontBother = 0x02000000;
+    } else if (apiLevel >= 24) {
+      kAccCompileDontBother = 0x01000000;
+    } else {
+      kAccCompileDontBother = 0;
+    }
+    temporaryApi.kAccCompileDontBother = kAccCompileDontBother;
+
     const artRuntime = temporaryApi.vm.add(pointerSize).readPointer();
     temporaryApi.artRuntime = artRuntime;
     const runtimeOffset = getArtRuntimeSpec(temporaryApi).offset;
@@ -2270,6 +2286,7 @@ typedef struct _ArtStackFrame ArtStackFrame;
 typedef struct _ArtStackVisitor ArtStackVisitor;
 typedef struct _ArtStackVisitorVTable ArtStackVisitorVTable;
 
+typedef struct _ArtClass ArtClass;
 typedef struct _ArtMethod ArtMethod;
 typedef struct _ArtThread ArtThread;
 typedef struct _ArtContext ArtContext;
@@ -2340,6 +2357,12 @@ struct _ArtStackVisitor
   ArtBacktrace * backtrace;
 };
 
+struct _ArtMethod
+{
+  guint32 declaring_class;
+  guint32 access_flags;
+};
+
 extern GumTlsKey current_backtrace;
 
 extern void (* perform_art_thread_state_transition) (JNIEnv * env);
@@ -2353,6 +2376,7 @@ extern ArtMethod * art_stack_visitor_get_method (ArtStackVisitor * visitor);
 extern void art_stack_visitor_describe_location (StdString * description, ArtStackVisitor * visitor);
 extern ArtMethod * translate_method (ArtMethod * method);
 extern void translate_location (ArtMethod * method, guint32 pc, const gchar ** source_file, gint32 * line_number);
+extern void get_class_location (StdString * result, ArtClass * klass);
 extern void cxx_delete (void * mem);
 extern unsigned long strtoul (const char * str, char ** endptr, int base);
 
@@ -2495,6 +2519,7 @@ _get_frames (ArtBacktrace * backtrace)
     GString * signature;
     gchar * cursor;
     ArtMethod * translated_method;
+    StdString location;
     gsize dexpc;
     const gchar * source_file;
     gint32 line_number;
@@ -2559,6 +2584,8 @@ _get_frames (ArtBacktrace * backtrace)
     translated_method = translate_method (frame->method);
     dexpc = (translated_method == frame->method) ? frame->dexpc : 0;
 
+    get_class_location (&location, GSIZE_TO_POINTER (translated_method->declaring_class));
+
     translate_location (translated_method, dexpc, &source_file, &line_number);
 
     json_builder_begin_object (b);
@@ -2566,12 +2593,18 @@ _get_frames (ArtBacktrace * backtrace)
     json_builder_set_member_name (b, "signature");
     json_builder_add_string_value (b, signature->str);
 
+    json_builder_set_member_name (b, "origin");
+    json_builder_add_string_value (b, std_string_get_data (&location));
+
     json_builder_set_member_name (b, "className");
     json_builder_add_string_value (b, class_name);
 
     json_builder_set_member_name (b, "methodName");
     json_builder_add_string_value (b, method_name);
 
+    json_builder_set_member_name (b, "methodFlags");
+    json_builder_add_int_value (b, translated_method->access_flags);
+
     json_builder_set_member_name (b, "fileName");
     json_builder_add_string_value (b, source_file);
 
@@ -2580,6 +2613,7 @@ _get_frames (ArtBacktrace * backtrace)
 
     json_builder_end_object (b);
 
+    std_string_destroy (&location);
     g_string_free (signature, TRUE);
   }
 
@@ -2691,6 +2725,7 @@ std_string_get_data (StdString * str)
     art_stack_visitor_describe_location: api['art::StackVisitor::DescribeLocation'],
     translate_method: artController.replacedMethods.translate,
     translate_location: api['art::Monitor::TranslateLocation'],
+    get_class_location: api['art::mirror::Class::GetLocation'],
     cxx_delete: api.$delete,
     strtoul: Module.getExportByName('libc.so', 'strtoul')
   });
@@ -3290,6 +3325,8 @@ class ArtMethodMangler {
   }
 
   replace (impl, isInstanceMethod, argTypes, vm, api) {
+    const { kAccCompileDontBother, artNterpEntryPoint } = api;
+
     this.originalMethod = fetchArtMethod(this.methodId, vm);
 
     const originalFlags = this.originalMethod.accessFlags;
@@ -3307,7 +3344,7 @@ class ArtMethodMangler {
 
     patchArtMethod(replacementMethodId, {
       jniCode: impl,
-      accessFlags: ((originalFlags & ~(kAccCriticalNative | kAccFastNative | kAccNterpEntryPointFastPathFlag)) | kAccNative) >>> 0,
+      accessFlags: ((originalFlags & ~(kAccCriticalNative | kAccFastNative | kAccNterpEntryPointFastPathFlag)) | kAccNative | kAccCompileDontBother) >>> 0,
       quickCode: api.artClassLinker.quickGenericJniTrampoline,
       interpreterCode: api.artInterpreterToCompiledCodeBridge
     }, vm);
@@ -3320,15 +3357,13 @@ class ArtMethodMangler {
     }
 
     patchArtMethod(hookedMethodId, {
-      accessFlags: (originalFlags & ~(hookedMethodRemovedFlags)) >>> 0
+      accessFlags: ((originalFlags & ~(hookedMethodRemovedFlags)) | kAccCompileDontBother) >>> 0
     }, vm);
 
     const quickCode = this.originalMethod.quickCode;
 
     // Replace Nterp quick entrypoints with art_quick_to_interpreter_bridge to force stepping out
     // of ART's next-generation interpreter and use the quick stub instead.
-    const { artNterpEntryPoint } = api;
-
     if (artNterpEntryPoint !== undefined && quickCode.equals(artNterpEntryPoint)) {
       patchArtMethod(hookedMethodId, {
         quickCode: api.artQuickToInterpreterBridge

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-java-bridge",
-  "version": "6.1.3",
+  "version": "6.2.2",
   "description": "Java runtime interop from Frida",
   "main": "index.js",
   "files": [