frida-java-bridge 6.3.9 → 7.0.1

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();
   }
@@ -53,7 +53,7 @@ function _getApi () {
 
   const pending = Process.platform === 'windows'
     ? [{
-        module: vmModule.path,
+        module: vmModule,
         functions: {
           JNI_GetCreatedJavaVMs: ['JNI_GetCreatedJavaVMs', 'int', ['pointer', 'int', 'pointer']],
           JVM_Sleep: ['JVM_Sleep', 'void', ['pointer', 'pointer', 'long']],
@@ -94,7 +94,7 @@ function _getApi () {
       }]
   // If platform is not Windows
     : [{
-        module: vmModule.path,
+        module: vmModule,
         functions: {
           JNI_GetCreatedJavaVMs: ['JNI_GetCreatedJavaVMs', 'int', ['pointer', 'int', 'pointer']],
 
@@ -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',
 
@@ -275,19 +277,18 @@ function _getApi () {
   const missing = [];
 
   pending.forEach(function (api) {
+    const module = api.module;
     const functions = api.functions || {};
     const variables = api.variables || {};
     const optionals = new Set(api.optionals || []);
 
-    const tmp = Module
-      .enumerateExports(api.module)
+    const tmp = module.enumerateExports()
       .reduce(function (result, exp) {
         result[exp.name] = exp;
         return result;
       }, {});
 
-    const exportByName = Module
-      .enumerateSymbols(api.module)
+    const exportByName = module.enumerateSymbols()
       .reduce(function (result, exp) {
         result[exp.name] = exp;
         return result;
@@ -348,7 +349,7 @@ function _getApi () {
       };
 
   for (const [name, [rawName, retType, argTypes]] of Object.entries(allocatorFunctions)) {
-    let address = Module.findExportByName(null, rawName);
+    let address = Module.findGlobalExportByName(rawName);
     if (address === null) {
       address = DebugSymbol.fromName(rawName).address;
       if (address.isNull()) {
@@ -398,7 +399,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 +426,7 @@ function parseX64ThreadOffset (insn) {
   return disp;
 }
 
-function ensureClassInitialized (env, classRef) {
+export function ensureClassInitialized (env, classRef) {
 }
 
 class JvmMethodMangler {
@@ -663,7 +664,7 @@ function _getJvmThreadSpec () {
   };
 }
 
-function makeMethodMangler (methodId) {
+export function makeMethodMangler (methodId) {
   return new JvmMethodMangler(methodId);
 }
 
@@ -758,6 +759,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 +984,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;

package/lib/mkdex.js

@@ -1,4 +1,4 @@
-const SHA1 = require('jssha/dist/sha1');
+import { Buffer } from 'buffer';
 
 const kAccPublic = 0x0001;
 const kAccNative = 0x0100;
@@ -430,9 +430,9 @@ class DexBuilder {
       dex.writeUInt32LE(offset, itemOffset + 8);
     });
 
-    const hash = new SHA1('SHA-1', 'ARRAYBUFFER');
+    const hash = new Checksum('sha1');
     hash.update(dex.slice(signatureOffset + signatureSize));
-    Buffer.from(hash.getHash('ARRAYBUFFER')).copy(dex, signatureOffset);
+    Buffer.from(hash.getDigest()).copy(dex, signatureOffset);
 
     dex.writeUInt32LE(adler32(dex, signatureOffset), checksumOffset);
 
@@ -930,4 +930,4 @@ function adler32 (buffer, offset) {
   return ((b << 16) | a) >>> 0;
 }
 
-module.exports = mkdex;
+export default mkdex;

package/lib/result.js

@@ -1,12 +1,7 @@
-const JNI_OK = 0;
+export const JNI_OK = 0;
 
-function checkJniResult (name, result) {
+export function checkJniResult (name, result) {
   if (result !== JNI_OK) {
     throw new Error(name + ' failed: ' + result);
   }
 }
-
-module.exports = {
-  checkJniResult,
-  JNI_OK: 0
-};

package/lib/types.js

@@ -1,4 +1,4 @@
-const Env = require('./env');
+import Env from './env.js';
 
 const JNILocalRefType = 1;
 
@@ -6,7 +6,7 @@ let vm = null;
 
 let primitiveArrayHandler = null;
 
-function initialize (_vm) {
+export function initialize (_vm) {
   vm = _vm;
 }
 
@@ -14,7 +14,7 @@ function initialize (_vm) {
  * http://docs.oracle.com/javase/6/docs/technotes/guides/jni/spec/types.html#wp9502
  * http://www.liaohuqiu.net/posts/android-object-size-dalvik/
  */
-function getType (typeName, unbox, factory) {
+export function getType (typeName, unbox, factory) {
   let type = getPrimitiveType(typeName);
   if (type === null) {
     if (typeName.indexOf('[') === 0) {
@@ -235,7 +235,7 @@ const primitiveTypes = {
 
 const primitiveTypesNames = new Set(Object.values(primitiveTypes).map(t => t.name));
 
-function getPrimitiveType (name) {
+export function getPrimitiveType (name) {
   const result = primitiveTypes[name];
   return (result !== undefined) ? result : null;
 }
@@ -425,7 +425,7 @@ function makePrimitiveArrayType (shorty, name) {
   };
 }
 
-function getArrayType (typeName, unbox, factory) {
+export function getArrayType (typeName, unbox, factory) {
   const primitiveType = primitiveArrayTypes[typeName];
   if (primitiveType !== undefined) {
     return primitiveType;
@@ -789,7 +789,7 @@ Object.defineProperties(PrimitiveArray.prototype, {
   }
 });
 
-function makeJniObjectTypeName (typeName) {
+export function makeJniObjectTypeName (typeName) {
   return 'L' + typeName.replace(/\./g, '/') + ';';
 }
 
@@ -800,11 +800,3 @@ function toTitleCase (str) {
 function identity (value) {
   return value;
 }
-
-module.exports = {
-  initialize,
-  getType,
-  getPrimitiveType,
-  getArrayType,
-  makeJniObjectTypeName
-};

package/lib/vm.js

@@ -1,5 +1,5 @@
-const Env = require('./env');
-const { JNI_OK, checkJniResult } = require('./result');
+import Env from './env.js';
+import { JNI_OK, checkJniResult } from './result.js';
 
 const JNI_VERSION_1_6 = 0x00010006;
 
@@ -9,7 +9,7 @@ const jsThreadID = Process.getCurrentThreadId();
 const attachedThreads = new Map();
 const activeEnvs = new Map();
 
-function VM (api) {
+export default function VM (api) {
   const handle = api.vm;
   let attachCurrentThread = null;
   let detachCurrentThread = null;
@@ -166,7 +166,3 @@ VM.dispose = function (vm) {
     vm.detachCurrentThread();
   }
 };
-
-module.exports = VM;
-
-/* global Memory, NativeFunction, NULL, Process */

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "frida-java-bridge",
-  "version": "6.3.9",
+  "version": "7.0.1",
   "description": "Java runtime interop from Frida",
+  "type": "module",
   "main": "index.js",
   "files": [
     "/index.js",
+    "/index.d.ts",
     "/lib/**/*.js",
     "/lib/**/*.d.ts"
   ],
@@ -21,15 +23,11 @@
     "lint": "eslint lib",
     "fix": "eslint --fix lib"
   },
-  "dependencies": {
-    "jssha": "^3.1.2"
-  },
   "devDependencies": {
-    "eslint": "^8.33.0",
-    "eslint-config-semistandard": "^17.0.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.6.1",
-    "eslint-plugin-promise": "^6.1.1"
+    "@types/frida-gum": "^18.7.2",
+    "frida-compile": "^16.4.1",
+    "@eslint/js": "^9.20.0",
+    "eslint": "^9.20.0",
+    "neostandard": "^0.12.1"
   }
 }