frida-java-bridge 6.3.8 → 7.0.0

package/index.js

@@ -1,5 +1,5 @@
-const getApi = require('./lib/api');
-const {
+import getApi from './lib/api.js';
+import {
   getAndroidVersion,
   withAllArtThreadsSuspended,
   withRunnableArtThread,
@@ -9,13 +9,13 @@ const {
   deoptimizeEverything,
   deoptimizeBootImage,
   deoptimizeMethod
-} = require('./lib/android');
-const ClassFactory = require('./lib/class-factory');
-const ClassModel = require('./lib/class-model');
-const Env = require('./lib/env');
-const Types = require('./lib/types');
-const VM = require('./lib/vm');
-const { checkJniResult } = require('./lib/result');
+} from './lib/android.js';
+import ClassFactory from './lib/class-factory.js';
+import ClassModel from './lib/class-model.js';
+import Env from './lib/env.js';
+import { initialize } from './lib/types.js';
+import VM from './lib/vm.js';
+import { checkJniResult } from './lib/result.js';
 
 const jsizeSize = 4;
 const pointerSize = Process.pointerSize;
@@ -78,7 +78,7 @@ class Runtime {
     const vm = new VM(api);
     this.vm = vm;
 
-    Types.initialize(vm);
+    initialize(vm);
     ClassFactory._initialize(vm, api);
     this.classFactory = new ClassFactory();
 
@@ -594,4 +594,4 @@ function initFactoryFromLoadedApk (factory, apk) {
 const runtime = new Runtime();
 Script.bindWeak(runtime, () => { runtime._dispose(); });
 
-module.exports = runtime;
+export default runtime;

package/lib/alloc.js

@@ -77,8 +77,6 @@ function abs (nptr) {
   return nptr.and(mask);
 }
 
-function makeAllocator (sliceSize) {
+export default function makeAllocator (sliceSize) {
   return new CodeAllocator(sliceSize);
 }
-
-module.exports = makeAllocator;

package/lib/android.js

@@ -1,13 +1,13 @@
-const makeCodeAllocator = require('./alloc');
-const {
+import makeCodeAllocator from './alloc.js';
+import {
   jvmtiVersion,
   jvmtiCapabilities,
   EnvJvmti
-} = require('./jvmti');
-const { parseInstructionsAt } = require('./machine-code');
-const memoize = require('./memoize');
-const { checkJniResult, JNI_OK } = require('./result');
-const VM = require('./vm');
+} from './jvmti.js';
+import { parseInstructionsAt } from './machine-code.js';
+import memoize from './memoize.js';
+import { checkJniResult, JNI_OK } from './result.js';
+import VM from './vm.js';
 
 const jsizeSize = 4;
 const pointerSize = Process.pointerSize;
@@ -46,7 +46,7 @@ const ARM64_ADRP_MAX_DISTANCE = 0xfffff000;
 const ENV_VTABLE_OFFSET_EXCEPTION_CLEAR = 17 * pointerSize;
 const ENV_VTABLE_OFFSET_FATAL_ERROR = 18 * pointerSize;
 
-const DVM_JNI_ENV_OFFSET_SELF = 12;
+export const DVM_JNI_ENV_OFFSET_SELF = 12;
 
 const DVM_CLASS_OBJECT_OFFSET_VTABLE_COUNT = 112;
 const DVM_CLASS_OBJECT_OFFSET_VTABLE = 116;
@@ -81,13 +81,13 @@ const SOCK_STREAM = 1;
 
 const getArtRuntimeSpec = memoize(_getArtRuntimeSpec);
 const getArtInstrumentationSpec = memoize(_getArtInstrumentationSpec);
-const getArtMethodSpec = memoize(_getArtMethodSpec);
-const getArtThreadSpec = memoize(_getArtThreadSpec);
+export const getArtMethodSpec = memoize(_getArtMethodSpec);
+export const getArtThreadSpec = memoize(_getArtThreadSpec);
 const getArtManagedStackSpec = memoize(_getArtManagedStackSpec);
 const getArtThreadStateTransitionImpl = memoize(_getArtThreadStateTransitionImpl);
-const getAndroidVersion = memoize(_getAndroidVersion);
+export const getAndroidVersion = memoize(_getAndroidVersion);
 const getAndroidCodename = memoize(_getAndroidCodename);
-const getAndroidApiLevel = memoize(_getAndroidApiLevel);
+export const getAndroidApiLevel = memoize(_getAndroidApiLevel);
 const getArtQuickFrameInfoGetterThunk = memoize(_getArtQuickFrameInfoGetterThunk);
 
 const makeCxxMethodWrapperReturningPointerByValue =
@@ -118,7 +118,7 @@ let socketpair = null;
 
 let trampolineAllocator = null;
 
-function getApi () {
+export function getApi () {
   if (cachedApi === null) {
     cachedApi = _getApi();
   }
@@ -570,7 +570,7 @@ function tryGetEnvJvmti (vm, runtime) {
   return env;
 }
 
-function ensureClassInitialized (env, classRef) {
+export function ensureClassInitialized (env, classRef) {
   const api = getApi();
   if (api.flavor !== 'art') {
     return;
@@ -957,7 +957,7 @@ function tryGetArtClassLinkerSpec (runtime, runtimeSpec) {
   return spec;
 }
 
-function getArtClassSpec (vm) {
+export function getArtClassSpec (vm) {
   let apiLevel;
   try {
     apiLevel = getAndroidApiLevel();
@@ -1056,7 +1056,7 @@ function _getArtMethodSpec (vm) {
   return spec;
 }
 
-function getArtFieldSpec (vm) {
+export function getArtFieldSpec (vm) {
   const apiLevel = getAndroidApiLevel();
 
   if (apiLevel >= 23) {
@@ -1250,7 +1250,7 @@ function parseArtQuickTrampolineArm64 (insn) {
   return null;
 }
 
-function getArtThreadFromEnv (env) {
+export function getArtThreadFromEnv (env) {
   return env.handle.add(pointerSize).readPointer();
 }
 
@@ -1278,7 +1278,7 @@ function getAndroidSystemProperty (name) {
   return buf.readUtf8String();
 }
 
-function withRunnableArtThread (vm, env, fn) {
+export function withRunnableArtThread (vm, env, fn) {
   const perform = getArtThreadStateTransitionImpl(vm, env);
 
   const id = getArtThreadFromEnv(env).toString();
@@ -1305,7 +1305,7 @@ function onThreadStateTransitionComplete (thread) {
   fn(thread);
 }
 
-function withAllArtThreadsSuspended (fn) {
+export function withAllArtThreadsSuspended (fn) {
   const api = getApi();
 
   const threadList = api.artThreadList;
@@ -1335,7 +1335,7 @@ class ArtClassVisitor {
   }
 }
 
-function makeArtClassVisitor (visit) {
+export function makeArtClassVisitor (visit) {
   const api = getApi();
 
   if (api['art::ClassLinker::VisitClasses'] instanceof NativeFunction) {
@@ -1364,7 +1364,7 @@ class ArtClassLoaderVisitor {
   }
 }
 
-function makeArtClassLoaderVisitor (visit) {
+export function makeArtClassLoaderVisitor (visit) {
   return new ArtClassLoaderVisitor(visit);
 }
 
@@ -1373,7 +1373,7 @@ const WalkKind = {
   'skip-inlined-frames': 1
 };
 
-class ArtStackVisitor {
+export class ArtStackVisitor {
   constructor (thread, context, walkKind, numFrames = 0, checkSuspended = true) {
     const api = getApi();
 
@@ -1452,7 +1452,7 @@ class ArtStackVisitor {
   }
 }
 
-class ArtMethod {
+export class ArtMethod {
   constructor (handle) {
     this.handle = handle;
   }
@@ -1535,17 +1535,17 @@ function _getArtQuickFrameInfoGetterThunk (impl) {
 }
 
 const thunkRelocators = {
-  ia32: global.X86Relocator,
-  x64: global.X86Relocator,
-  arm: global.ThumbRelocator,
-  arm64: global.Arm64Relocator
+  ia32: globalThis.X86Relocator,
+  x64: globalThis.X86Relocator,
+  arm: globalThis.ThumbRelocator,
+  arm64: globalThis.Arm64Relocator
 };
 
 const thunkWriters = {
-  ia32: global.X86Writer,
-  x64: global.X86Writer,
-  arm: global.ThumbWriter,
-  arm64: global.Arm64Writer
+  ia32: globalThis.X86Writer,
+  x64: globalThis.X86Writer,
+  arm: globalThis.ThumbWriter,
+  arm64: globalThis.Arm64Writer
 };
 
 function makeThunk (size, write) {
@@ -2313,15 +2313,15 @@ function instrumentGetOatQuickMethodHeaderInlinedCopyArm64 ({ address, size, val
   });
 }
 
-function makeMethodMangler (methodId) {
+export function makeMethodMangler (methodId) {
   return new MethodMangler(methodId);
 }
 
-function translateMethod (methodId) {
+export function translateMethod (methodId) {
   return artController.replacedMethods.translate(methodId);
 }
 
-function backtrace (vm, options = {}) {
+export function backtrace (vm, options = {}) {
   const { limit = 16 } = options;
 
   const env = vm.getEnv();
@@ -2842,7 +2842,7 @@ class Backtrace {
   }
 }
 
-function revertGlobalPatches () {
+export function revertGlobalPatches () {
   patchedClasses.forEach(entry => {
     entry.vtablePtr.writePointer(entry.vtable);
     entry.vtableCountPtr.writeS32(entry.vtableCount);
@@ -3660,15 +3660,15 @@ function cloneArtMethod (method, vm) {
   return Memory.dup(method, getArtMethodSpec(vm).size);
 }
 
-function deoptimizeMethod (vm, env, method) {
+export function deoptimizeMethod (vm, env, method) {
   requestDeoptimization(vm, env, kSelectiveDeoptimization, method);
 }
 
-function deoptimizeEverything (vm, env) {
+export function deoptimizeEverything (vm, env) {
   requestDeoptimization(vm, env, kFullDeoptimization);
 }
 
-function deoptimizeBootImage (vm, env) {
+export function deoptimizeBootImage (vm, env) {
   const api = getApi();
 
   if (getAndroidApiLevel() < 26) {
@@ -3791,8 +3791,7 @@ class JdwpSession {
     try {
       await output.writeAll(handshakePacket);
       await input.readAll(handshakePacket.length);
-    } catch (e) {
-    }
+    } catch (e) { /* empty */ }
   }
 }
 
@@ -4256,6 +4255,7 @@ function recompileExceptionClearForArm (buffer, pc, exceptionClearImpl, nextFunc
         case 'beq.w':
         case 'beq':
         case 'bne':
+        case 'bne.w':
         case 'bgt':
           branchTarget = ptr(insn.operands[0].value);
           break;
@@ -4351,6 +4351,10 @@ function recompileExceptionClearForArm (buffer, pc, exceptionClearImpl, nextFunc
           writer.putBCondLabelWide('eq', branchLabelFromOperand(insn.operands[0]));
           keep = false;
           break;
+        case 'bne.w':
+          writer.putBCondLabelWide('ne', branchLabelFromOperand(insn.operands[0]));
+          keep = false;
+          break;
         case 'beq':
         case 'bne':
         case 'bgt':
@@ -4859,7 +4863,7 @@ class StdVector {
   }
 }
 
-class HandleVector extends StdVector {
+export class HandleVector extends StdVector {
   static $new () {
     const vector = new HandleVector(getApi().$new(STD_VECTOR_SIZE));
     vector.init();
@@ -4932,7 +4936,7 @@ const VSHS_OFFSET_SELF = alignPointerOffset(BHS_SIZE);
 const VSHS_OFFSET_CURRENT_SCOPE = VSHS_OFFSET_SELF + pointerSize;
 const VSHS_SIZE = VSHS_OFFSET_CURRENT_SCOPE + pointerSize;
 
-class VariableSizedHandleScope extends BaseHandleScope {
+export class VariableSizedHandleScope extends BaseHandleScope {
   static $new (thread, vm) {
     const scope = new VariableSizedHandleScope(getApi().$new(VSHS_SIZE));
     scope.init(thread, vm);
@@ -5124,7 +5128,7 @@ const objectVisitorPredicateFactories = {
   }
 };
 
-function makeObjectVisitorPredicate (needle, onMatch) {
+export function makeObjectVisitorPredicate (needle, onMatch) {
   const factory = objectVisitorPredicateFactories[Process.arch] || makeGenericObjectVisitorPredicate;
   return factory(needle, onMatch);
 }
@@ -5145,32 +5149,3 @@ function alignPointerOffset (offset) {
   }
   return offset;
 }
-
-module.exports = {
-  getApi,
-  ensureClassInitialized,
-  getAndroidVersion,
-  getAndroidApiLevel,
-  getArtClassSpec,
-  getArtMethodSpec,
-  getArtFieldSpec,
-  getArtThreadSpec,
-  getArtThreadFromEnv,
-  withRunnableArtThread,
-  withAllArtThreadsSuspended,
-  makeArtClassVisitor,
-  makeArtClassLoaderVisitor,
-  ArtStackVisitor,
-  ArtMethod,
-  makeMethodMangler,
-  translateMethod,
-  backtrace,
-  revertGlobalPatches,
-  deoptimizeEverything,
-  deoptimizeBootImage,
-  deoptimizeMethod,
-  HandleVector,
-  VariableSizedHandleScope,
-  makeObjectVisitorPredicate,
-  DVM_JNI_ENV_OFFSET_SELF
-};

package/lib/api.js

@@ -1,7 +1,9 @@
-let { getApi, getAndroidVersion } = require('./android');
+import { getApi as androidGetApi, getAndroidVersion } from './android.js';
+import { getApi as jvmGetApi } from './jvm.js';
+let getApi = androidGetApi;
 try {
   getAndroidVersion();
 } catch (e) {
-  getApi = require('./jvm').getApi;
+  getApi = jvmGetApi;
 }
-module.exports = getApi;
+export default getApi;

package/lib/class-factory.js

@@ -1,20 +1,20 @@
-const Env = require('./env');
-const android = require('./android');
-const jvm = require('./jvm');
+import Env from './env.js';
+import * as android from './android.js';
+import { ensureClassInitialized as jvmEnsureClassInitialized, makeMethodMangler as jvmMakeMethodMangler } from './jvm.js';
+import ClassModel from './class-model.js';
+import LRU from './lru.js';
+import mkdex from './mkdex.js';
+import {
+  getType,
+  getPrimitiveType,
+  getArrayType,
+  makeJniObjectTypeName
+} from './types.js';
 const jsizeSize = 4;
 let {
   ensureClassInitialized,
   makeMethodMangler
 } = android;
-const ClassModel = require('./class-model');
-const LRU = require('./lru');
-const mkdex = require('./mkdex');
-const {
-  getType,
-  getPrimitiveType,
-  getArrayType,
-  makeJniObjectTypeName
-} = require('./types');
 
 const kAccStatic = 0x0008;
 
@@ -58,14 +58,14 @@ let cachedLoaderMethod = null;
 
 const ignoredThreads = new Map();
 
-class ClassFactory {
+export default class ClassFactory {
   static _initialize (_vm, _api) {
     vm = _vm;
     api = _api;
     isArtVm = _api.flavor === 'art';
     if (_api.flavor === 'jvm') {
-      ensureClassInitialized = jvm.ensureClassInitialized;
-      makeMethodMangler = jvm.makeMethodMangler;
+      ensureClassInitialized = jvmEnsureClassInitialized;
+      makeMethodMangler = jvmMakeMethodMangler;
     }
   }
 
@@ -2357,5 +2357,3 @@ function makeSourceFileName (className) {
   const tokens = className.split('.');
   return tokens[tokens.length - 1] + '.java';
 }
-
-module.exports = ClassFactory;

package/lib/class-model.js

@@ -1,3 +1,5 @@
+import { withRunnableArtThread, getArtClassSpec, getArtMethodSpec, getArtFieldSpec, getApi } from './android.js';
+
 const code = `#include <json-glib/json-glib.h>
 #include <string.h>
 
@@ -1161,14 +1163,12 @@ std_string_c_str (StdString * self)
 }
 `;
 
-const android = require('./android');
-
 const methodQueryPattern = /(.+)!([^/]+)\/?([isu]+)?/;
 
 let cm = null;
 let unwrap = null;
 
-class Model {
+export default class Model {
   static build (handle, env) {
     ensureInitialized(env);
 
@@ -1215,7 +1215,7 @@ class Model {
         cm.dealloc(json);
       }
     } else {
-      android.withRunnableArtThread(env.vm, env, thread => {
+      withRunnableArtThread(env.vm, env, thread => {
         const json = cm.enumerateMethodsArt(classQuery, methodQuery,
           boolToNative(includeSignature), boolToNative(ignoreCase), boolToNative(skipSystemClasses));
         try {
@@ -1296,11 +1296,11 @@ function compileModule (env) {
 
   const artApi = javaApi.add(javaApiSize);
   const { vm } = env;
-  const artClass = android.getArtClassSpec(vm);
+  const artClass = getArtClassSpec(vm);
   if (artClass !== null) {
     const c = artClass.offset;
-    const m = android.getArtMethodSpec(vm);
-    const f = android.getArtFieldSpec(vm);
+    const m = getArtMethodSpec(vm);
+    const f = getArtFieldSpec(vm);
 
     let s = artApi;
     [
@@ -1314,7 +1314,7 @@ function compileModule (env) {
         s = s.writeUInt(value).add(4);
       });
 
-    const api = android.getApi();
+    const api = getApi();
     [
       api.artClassLinker.address,
       api['art::ClassLinker::VisitClasses'],
@@ -1360,8 +1360,7 @@ function makeHandleUnwrapper (cm, vm) {
     return nullUnwrap;
   }
 
-  const { withRunnableArtThread } = android;
-  const decodeGlobal = android.getApi()['art::JavaVMExt::DecodeGlobal'];
+  const decodeGlobal = getApi()['art::JavaVMExt::DecodeGlobal'];
 
   return function (handle, env, fn) {
     let result;
@@ -1382,5 +1381,3 @@ function nullUnwrap (handle, env, fn) {
 function boolToNative (val) {
   return val ? 1 : 0;
 }
-
-module.exports = Model;

package/lib/env.js

@@ -1,4 +1,4 @@
-function Env (handle, vm) {
+export default function Env (handle, vm) {
   this.handle = handle;
   this.vm = vm;
 }
@@ -947,5 +947,3 @@ Env.prototype.stringFromJni = function (str) {
     this.releaseStringChars(str, utf);
   }
 };
-
-module.exports = Env;

package/lib/jvm.js

@@ -1,12 +1,12 @@
-const {
+import {
   jvmtiVersion,
   jvmtiCapabilities,
   EnvJvmti
-} = require('./jvmti');
-const { parseInstructionsAt } = require('./machine-code');
-const memoize = require('./memoize');
-const { checkJniResult } = require('./result');
-const VM = require('./vm');
+} from './jvmti.js';
+import { parseInstructionsAt } from './machine-code.js';
+import memoize from './memoize.js';
+import { checkJniResult } from './result.js';
+import VM from './vm.js';
 
 const jsizeSize = 4;
 const { pointerSize } = Process;
@@ -31,7 +31,7 @@ let manglersScheduled = false;
 const replaceManglers = new Map();
 const revertManglers = new Map();
 
-function getApi () {
+export function getApi () {
   if (cachedApi === null) {
     cachedApi = _getApi();
   }
@@ -105,6 +105,7 @@ function _getApi () {
           _ZN6Method24restore_unshareable_infoEP10JavaThread: ['Method::restore_unshareable_info', 'void', ['pointer', 'pointer']],
           // JDK < 17
           _ZN6Method24restore_unshareable_infoEP6Thread: ['Method::restore_unshareable_info', 'void', ['pointer', 'pointer']],
+          _ZN6Method11link_methodERK12methodHandleP10JavaThread: ['Method::link_method', 'void', ['pointer', 'pointer', 'pointer']],
           _ZN6Method10jmethod_idEv: ['Method::jmethod_id', 'pointer', ['pointer']],
           _ZN6Method10clear_codeEv: function (address) {
             const clearCode = new NativeFunction(address, 'void', ['pointer'], nativeFunctionOptions);
@@ -236,6 +237,7 @@ function _getApi () {
         optionals: [
           '_ZN6Method24restore_unshareable_infoEP10JavaThread',
           '_ZN6Method24restore_unshareable_infoEP6Thread',
+          '_ZN6Method11link_methodERK12methodHandleP10JavaThread',
           '_ZN6Method10clear_codeEv',
           '_ZN6Method10clear_codeEb',
 
@@ -398,7 +400,7 @@ function makeThreadFromJniHelper (api) {
   if (tryParse !== undefined) {
     const vm = new VM(api);
     const findClassImpl = vm.perform(env => env.handle.readPointer().add(6 * pointerSize).readPointer());
-    offset = parseInstructionsAt(findClassImpl, tryParse, { limit: 10 });
+    offset = parseInstructionsAt(findClassImpl, tryParse, { limit: 11 });
   }
 
   if (offset === null) {
@@ -425,7 +427,7 @@ function parseX64ThreadOffset (insn) {
   return disp;
 }
 
-function ensureClassInitialized (env, classRef) {
+export function ensureClassInitialized (env, classRef) {
 }
 
 class JvmMethodMangler {
@@ -663,7 +665,7 @@ function _getJvmThreadSpec () {
   };
 }
 
-function makeMethodMangler (methodId) {
+export function makeMethodMangler (methodId) {
   return new JvmMethodMangler(methodId);
 }
 
@@ -758,6 +760,15 @@ function nativeJvmMethod (method, impl, thread) {
 
   api['Method::restore_unshareable_info'](newMethod.method, thread);
 
+  if (api.version >= 17) {
+    // Only certain JDK versions of restore_unshareable_info() call
+    // link_method(). Manually call if necessary.
+    const methodHandle = Memory.alloc(2 * pointerSize);
+    methodHandle.writePointer(newMethod.method);
+    methodHandle.add(pointerSize).writePointer(thread);
+    api['Method::link_method'](newMethod.method, methodHandle, thread);
+  }
+
   return newMethod;
 }
 
@@ -974,12 +985,5 @@ function parseX64VTableOffset (insn) {
   return defaultVtableIndicesOffset + 16;
 }
 
-function deoptimizeEverything (vm, env) {
+export function deoptimizeEverything (vm, env) {
 }
-
-module.exports = {
-  getApi,
-  ensureClassInitialized,
-  makeMethodMangler,
-  deoptimizeEverything
-};

package/lib/jvmti.js

@@ -1,11 +1,11 @@
-const { checkJniResult } = require('./result');
+import { checkJniResult } from './result.js';
 
-const jvmtiVersion = {
+export const jvmtiVersion = {
   v1_0: 0x30010000,
   v1_2: 0x30010200
 };
 
-const jvmtiCapabilities = {
+export const jvmtiCapabilities = {
   canTagObjects: 1
 };
 
@@ -14,7 +14,7 @@ const nativeFunctionOptions = {
   exceptions: 'propagate'
 };
 
-function EnvJvmti (handle, vm) {
+export function EnvJvmti (handle, vm) {
   this.handle = handle;
   this.vm = vm;
   this.vtable = handle.readPointer();
@@ -54,9 +54,3 @@ function proxy (offset, retType, argTypes, wrapper) {
     return wrapper.apply(this, args);
   };
 }
-
-module.exports = {
-  jvmtiVersion,
-  jvmtiCapabilities,
-  EnvJvmti
-};

package/lib/lru.js

@@ -1,6 +1,6 @@
 // Based on https://stackoverflow.com/a/46432113
 
-class LRU {
+export default class LRU {
   constructor (capacity, destroy) {
     this.items = new Map();
     this.capacity = capacity;
@@ -42,5 +42,3 @@ class LRU {
     items.set(key, val);
   }
 }
-
-module.exports = LRU;

package/lib/machine-code.js

@@ -1,4 +1,4 @@
-function parseInstructionsAt (address, tryParse, { limit }) {
+export function parseInstructionsAt (address, tryParse, { limit }) {
   let cursor = address;
   let prevInsn = null;
 
@@ -16,7 +16,3 @@ function parseInstructionsAt (address, tryParse, { limit }) {
 
   return null;
 }
-
-module.exports = {
-  parseInstructionsAt
-};

package/lib/memoize.js

@@ -1,4 +1,4 @@
-function memoize (compute) {
+export default function memoize (compute) {
   let value = null;
   let computed = false;
 
@@ -11,5 +11,3 @@ function memoize (compute) {
     return value;
   };
 }
-
-module.exports = memoize;