frida-java-bridge 6.2.3 → 6.2.4

package/lib/android.js

@@ -139,7 +139,7 @@ function _getApi () {
 
   const temporaryApi = {
     module: vmModule,
-    flavor: flavor,
+    flavor,
     addLocalReference: null
   };
 
@@ -472,10 +472,10 @@ function _getApi () {
 
     temporaryApi.artClassLinker = {
       address: classLinker,
-      quickResolutionTrampoline: quickResolutionTrampoline,
-      quickImtConflictTrampoline: quickImtConflictTrampoline,
-      quickGenericJniTrampoline: quickGenericJniTrampoline,
-      quickToInterpreterBridgeTrampoline: quickToInterpreterBridgeTrampoline
+      quickResolutionTrampoline,
+      quickImtConflictTrampoline,
+      quickGenericJniTrampoline,
+      quickToInterpreterBridgeTrampoline
     };
 
     const vm = new VM(temporaryApi);
@@ -1020,7 +1020,7 @@ function _getArtMethodSpec (vm) {
     const size = (apiLevel <= 21) ? (quickCodeOffset + 32) : (quickCodeOffset + pointerSize);
 
     spec = {
-      size: size,
+      size,
       offset: {
         jniCode: jniCodeOffset,
         quickCode: quickCodeOffset,
@@ -3525,12 +3525,12 @@ class DalvikMethodMangler {
       vtablePtr.writePointer(shadowVtable);
 
       entry = {
-        classObject: classObject,
-        vtablePtr: vtablePtr,
-        vtableCountPtr: vtableCountPtr,
-        vtable: vtable,
-        vtableCount: vtableCount,
-        shadowVtable: shadowVtable,
+        classObject,
+        vtablePtr,
+        vtableCountPtr,
+        vtable,
+        vtableCount,
+        shadowVtable,
         shadowVtableCount: vtableCount,
         targetMethods: new Map()
       };

package/lib/class-factory.js

@@ -186,39 +186,94 @@ class ClassFactory {
   _make (name, getClassHandle, env) {
     const C = makeClassWrapperConstructor();
     const proto = Object.create(Wrapper.prototype, {
-      $n: {
+      [Symbol.for('n')]: {
         value: name
       },
-      $C: {
+      $n: {
+        get () {
+          return this[Symbol.for('n')];
+        }
+      },
+      [Symbol.for('C')]: {
         value: C
       },
-      $w: {
+      $C: {
+        get () {
+          return this[Symbol.for('C')];
+        }
+      },
+      [Symbol.for('w')]: {
         value: null,
         writable: true
       },
-      $_s: {
+      $w: {
+        get () {
+          return this[Symbol.for('w')];
+        },
+        set (val) {
+          this[Symbol.for('w')] = val;
+        }
+      },
+      [Symbol.for('_s')]: {
         writable: true
       },
-      $c: {
+      $_s: {
+        get () {
+          return this[Symbol.for('_s')];
+        },
+        set (val) {
+          this[Symbol.for('_s')] = val;
+        }
+      },
+      [Symbol.for('c')]: {
         value: [null]
       },
-      $m: {
+      $c: {
+        get () {
+          return this[Symbol.for('c')];
+        }
+      },
+      [Symbol.for('m')]: {
         value: new Map()
       },
-      $l: {
+      $m: {
+        get () {
+          return this[Symbol.for('m')];
+        }
+      },
+      [Symbol.for('l')]: {
         value: null,
         writable: true
       },
-      $gch: {
+      $l: {
+        get () {
+          return this[Symbol.for('l')];
+        },
+        set (val) {
+          this[Symbol.for('l')] = val;
+        }
+      },
+      [Symbol.for('gch')]: {
         value: getClassHandle
       },
-      $f: {
+      $gch: {
+        get () {
+          return this[Symbol.for('gch')];
+        }
+      },
+      [Symbol.for('f')]: {
         value: this
+      },
+      $f: {
+        get () {
+          return this[Symbol.for('f')];
+        }
       }
     });
     C.prototype = proto;
 
     const classWrapper = new C(null);
+    proto[Symbol.for('w')] = classWrapper;
     proto.$w = classWrapper;
 
     const h = classWrapper.$borrowClassHandle(env);
@@ -809,14 +864,20 @@ wrapperHandler = {
 };
 
 Object.defineProperties(Wrapper.prototype, {
-  $new: {
-    enumerable: true,
+  [Symbol.for('new')]: {
+    enumerable: false,
     get () {
       return this.$getCtor('allocAndInit');
     }
   },
-  $alloc: {
+  $new: {
     enumerable: true,
+    get () {
+      return this[Symbol.for('new')];
+    }
+  },
+  [Symbol.for('alloc')]: {
+    enumerable: false,
     value () {
       const env = vm.getEnv();
       const h = this.$borrowClassHandle(env);
@@ -829,14 +890,26 @@ Object.defineProperties(Wrapper.prototype, {
       }
     }
   },
-  $init: {
+  $alloc: {
     enumerable: true,
+    get () {
+      return this[Symbol.for('$alloc')];
+    }
+  },
+  [Symbol.for('init')]: {
+    enumerable: false,
     get () {
       return this.$getCtor('initOnly');
     }
   },
-  $dispose: {
+  $init: {
     enumerable: true,
+    get () {
+      return this[Symbol.for('init')];
+    }
+  },
+  [Symbol.for('dispose')]: {
+    enumerable: false,
     value () {
       const ref = this.$r;
       if (ref !== null) {
@@ -849,14 +922,26 @@ Object.defineProperties(Wrapper.prototype, {
       }
     }
   },
-  $clone: {
+  $dispose: {
+    enumerable: true,
+    get () {
+      return this[Symbol.for('dispose')];
+    }
+  },
+  [Symbol.for('clone')]: {
+    enumerable: false,
     value (env) {
       const C = this.$C;
       return new C(this.$h, this.$t, env);
     }
   },
-  class: {
-    enumerable: true,
+  $clone: {
+    value (env) {
+      return this[Symbol.for('clone')](env);
+    }
+  },
+  [Symbol.for('class')]: {
+    enumerable: false,
     get () {
       const env = vm.getEnv();
       const h = this.$borrowClassHandle(env);
@@ -868,8 +953,14 @@ Object.defineProperties(Wrapper.prototype, {
       }
     }
   },
-  $className: {
+  class: {
     enumerable: true,
+    get () {
+      return this[Symbol.for('class')];
+    }
+  },
+  [Symbol.for('className')]: {
+    enumerable: false,
     get () {
       const handle = this.$h;
       if (handle === null) {
@@ -879,22 +970,41 @@ Object.defineProperties(Wrapper.prototype, {
       return vm.getEnv().getObjectClassName(handle);
     }
   },
-  $ownMembers: {
+  $className: {
     enumerable: true,
+    get () {
+      return this[Symbol.for('className')];
+    }
+  },
+  [Symbol.for('ownMembers')]: {
+    enumerable: false,
     get () {
       const model = this.$l;
       return model.list();
     }
   },
-  $super: {
+  $ownMembers: {
     enumerable: true,
+    get () {
+      return this[Symbol.for('ownMembers')];
+    }
+  },
+  [Symbol.for('super')]: {
+    enumerable: false,
     get () {
       const env = vm.getEnv();
       const C = this.$s.$C;
       return new C(this.$h, STRATEGY_DIRECT, env);
     }
   },
-  $s: {
+  $super: {
+    enumerable: true,
+    get () {
+      return this[Symbol.for('super')];
+    }
+  },
+  [Symbol.for('s')]: {
+    enumerable: false,
     get () {
       const proto = Object.getPrototypeOf(this);
 
@@ -934,13 +1044,25 @@ Object.defineProperties(Wrapper.prototype, {
       return superWrapper;
     }
   },
-  $isSameObject: {
+  $s: {
+    get () {
+      return this[Symbol.for('s')];
+    }
+  },
+  [Symbol.for('isSameObject')]: {
+    enumerable: false,
     value (obj) {
       const env = vm.getEnv();
       return env.isSameObject(obj.$h, this.$h);
     }
   },
-  $getCtor: {
+  $isSameObject: {
+    value (obj) {
+      return this[Symbol.for('isSameObject')](obj);
+    }
+  },
+  [Symbol.for('getCtor')]: {
+    enumerable: false,
     value (type) {
       const slot = this.$c;
 
@@ -959,7 +1081,13 @@ Object.defineProperties(Wrapper.prototype, {
       return ctor[type];
     }
   },
-  $borrowClassHandle: {
+  $getCtor: {
+    value (type) {
+      return this[Symbol.for('getCtor')](type);
+    }
+  },
+  [Symbol.for('borrowClassHandle')]: {
+    enumerable: false,
     value (env) {
       const className = this.$n;
       const classHandles = this.$f._classHandles;
@@ -973,7 +1101,13 @@ Object.defineProperties(Wrapper.prototype, {
       return handle.ref();
     }
   },
-  $copyClassHandle: {
+  $borrowClassHandle: {
+    value (env) {
+      return this[Symbol.for('borrowClassHandle')](env);
+    }
+  },
+  [Symbol.for('copyClassHandle')]: {
+    enumerable: false,
     value (env) {
       const h = this.$borrowClassHandle(env);
       try {
@@ -983,7 +1117,13 @@ Object.defineProperties(Wrapper.prototype, {
       }
     }
   },
-  $getHandle: {
+  $copyClassHandle: {
+    value (env) {
+      return this[Symbol.for('copyClassHandle')](env);
+    }
+  },
+  [Symbol.for('getHandle')]: {
+    enumerable: false,
     value (env) {
       const handle = this.$h;
 
@@ -996,7 +1136,13 @@ Object.defineProperties(Wrapper.prototype, {
       return handle;
     }
   },
-  $list: {
+  $getHandle: {
+    value (env) {
+      return this[Symbol.for('getHandle')](env);
+    }
+  },
+  [Symbol.for('list')]: {
+    enumerable: false,
     value () {
       const superWrapper = this.$s;
       const superMembers = (superWrapper !== null) ? superWrapper.$list() : [];
@@ -1005,7 +1151,13 @@ Object.defineProperties(Wrapper.prototype, {
       return Array.from(new Set(superMembers.concat(model.list())));
     }
   },
-  $has: {
+  $list: {
+    get () {
+      return this[Symbol.for('list')];
+    }
+  },
+  [Symbol.for('has')]: {
+    enumerable: false,
     value (member) {
       const members = this.$m;
       if (members.has(member)) {
@@ -1025,7 +1177,13 @@ Object.defineProperties(Wrapper.prototype, {
       return false;
     }
   },
-  $find: {
+  $has: {
+    value (member) {
+      return this[Symbol.for('has')](member);
+    }
+  },
+  [Symbol.for('find')]: {
+    enumerable: false,
     value (member) {
       const members = this.$m;
 
@@ -1056,7 +1214,13 @@ Object.defineProperties(Wrapper.prototype, {
       return null;
     }
   },
-  toJSON: {
+  $find: {
+    value (member) {
+      return this[Symbol.for('find')](member);
+    }
+  },
+  [Symbol.for('toJSON')]: {
+    enumerable: false,
     value () {
       const wrapperName = this.$n;
 
@@ -1072,6 +1236,11 @@ Object.defineProperties(Wrapper.prototype, {
 
       return `<instance: ${wrapperName}, $className: ${actualName}>`;
     }
+  },
+  toJSON: {
+    get () {
+      return this[Symbol.for('toJSON')];
+    }
   }
 });
 
@@ -1409,6 +1578,10 @@ dispatcherPrototype = Object.create(Function.prototype, {
         return method.apply(receiver, args);
       }
 
+      if (this.methodName === 'toString') {
+        return `<class: ${receiver.$n}>`;
+      }
+
       throwOverloadError(this.methodName, this.overloads, 'argument types do not match any of:');
     }
   }
@@ -1647,6 +1820,12 @@ methodPrototype = Object.create(Function.prototype, {
         env.popLocalFrame(NULL);
       }
     }
+  },
+  toString: {
+    enumerable: true,
+    value () {
+      return `function ${this.methodName}(${this.argumentTypes.map(t => t.className).join(', ')}): ${this.returnType.className}`;
+    }
   }
 });
 
@@ -1972,6 +2151,22 @@ Object.defineProperties(Field.prototype, {
     get () {
       return this._p[2];
     }
+  },
+  toString: {
+    enumerable: true,
+    value () {
+      const inlineString = `Java.Field{holder: ${this.holder}, fieldType: ${this.fieldType}, fieldReturnType: ${this.fieldReturnType}, value: ${this.value}}`;
+      if (inlineString.length < 200) {
+        return inlineString;
+      }
+      const multilineString = `Java.Field{
+\tholder: ${this.holder},
+\tfieldType: ${this.fieldType},
+\tfieldReturnType: ${this.fieldReturnType},
+\tvalue: ${this.value},
+}`;
+      return multilineString.split('\n').map(l => l.length > 200 ? l.slice(0, l.indexOf(' ') + 1) + '...,' : l).join('\n');
+    },
   }
 });
 

package/lib/jvm.js

@@ -765,7 +765,7 @@ function readJvmMethod (method, constMethod, constMethodSize) {
     : NULL;
 
   return {
-    method: method,
+    method,
     methodSize: spec.method.size,
     const: constMethod,
     constSize: constMethodSize,
@@ -844,7 +844,7 @@ function _getJvmMethodSpec () {
     };
 
   return {
-    getAdapterPointer: getAdapterPointer,
+    getAdapterPointer,
     method: {
       size: methodSize,
       constMethodOffset,

package/lib/mkdex.js

@@ -800,7 +800,7 @@ function computeModel (classes) {
     methods: methodItems,
     protos: protoItems,
     parameters: parameterItems,
-    annotationDirectories: annotationDirectories,
+    annotationDirectories,
     annotationSets: annotationSetItems,
     throwsAnnotations: throwsAnnotationItems,
     types: typeItems,

package/lib/result.js

@@ -7,6 +7,6 @@ function checkJniResult (name, result) {
 }
 
 module.exports = {
-  checkJniResult: checkJniResult,
+  checkJniResult,
   JNI_OK: 0
 };

package/lib/types.js

@@ -51,6 +51,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeU8(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   byte: {
@@ -69,6 +72,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeS8(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   char: {
@@ -96,6 +102,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeU16(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   short: {
@@ -114,6 +123,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeS16(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   int: {
@@ -132,6 +144,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeS32(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   long: {
@@ -150,6 +165,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeS64(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   float: {
@@ -168,6 +186,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeFloat(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   double: {
@@ -186,6 +207,9 @@ const primitiveTypes = {
     },
     write (address, value) {
       address.writeDouble(value);
+    },
+    toString () {
+      return this.name;
     }
   },
   void: {
@@ -202,6 +226,9 @@ const primitiveTypes = {
     },
     toJni () {
       return NULL;
+    },
+    toString () {
+      return this.name;
     }
   }
 };
@@ -345,6 +372,9 @@ function getAnyObjectType (typeName, unbox, factory) {
       }
 
       return o.$h;
+    },
+    toString () {
+      return this.name;
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-java-bridge",
-  "version": "6.2.3",
+  "version": "6.2.4",
   "description": "Java runtime interop from Frida",
   "main": "index.js",
   "files": [
@@ -18,42 +18,18 @@
   },
   "homepage": "https://github.com/frida/frida-java-bridge#readme",
   "scripts": {
-    "lint": "semistandard"
+    "lint": "eslint lib",
+    "fix": "eslint --fix lib"
   },
   "dependencies": {
     "jssha": "^3.1.2"
   },
   "devDependencies": {
-    "semistandard": "^16.0.0"
-  },
-  "semistandard": {
-    "globals": [
-      "Arm64Relocator",
-      "Arm64Writer",
-      "CModule",
-      "DebugSymbol",
-      "File",
-      "Instruction",
-      "Int64",
-      "Interceptor",
-      "MatchPattern",
-      "Memory",
-      "Module",
-      "NULL",
-      "NativeCallback",
-      "NativeFunction",
-      "NativePointer",
-      "Process",
-      "Script",
-      "Thread",
-      "ThumbRelocator",
-      "ThumbWriter",
-      "UnixInputStream",
-      "UnixOutputStream",
-      "X86Relocator",
-      "X86Writer",
-      "ptr",
-      "uint64"
-    ]
+    "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"
   }
 }