(fix) frida v17 changes, webserver disabled. (#734)

* (fix) frida v17 changes, webserver disabled.

* (feat) Frida < 17 backwards compatibility.

* (feat) objection backwards compatibility (-g explore). Bump dep versions.

* (chore) deprecated `pkg_resources` replaced with `packaging`.

Author: IPMegladon

agent/package-lock.json

@@ -29,15 +29,15 @@
   },
   "homepage": "https://github.com/sensepost/objection#readme",
   "dependencies": {
-    "frida-java-bridge": "^6",
-    "frida-objc-bridge": "^7",
-    "frida-screenshot": "^5",
+    "frida-java-bridge": "^7",
+    "frida-objc-bridge": "^8",
+    "frida-screenshot": "^6",
     "macho-ts": "^0.1.0"
   },
   "devDependencies": {
-    "@types/frida-gum": "^18",
+    "@types/frida-gum": "^19",
     "@types/node": "^18",
-    "frida-compile": "^16",
+    "frida-compile": "^17",
     "tslint": "^6"
   }
 }

agent/package.json

@@ -1,7 +1,8 @@
 import { colors as c } from "../lib/color.js";
 import {
   getApplicationContext,
-  wrapJavaPerform
+  wrapJavaPerform, 
+  Java
 } from "./lib/libjava.js";
 import { ClipboardManager } from "./lib/types.js";
 

agent/src/android/clipboard.ts

@@ -4,7 +4,8 @@ import { hexStringToBytes } from "../lib/helpers.js";
 import { IAndroidFilesystem } from "./lib/interfaces.js";
 import {
   getApplicationContext,
-  wrapJavaPerform
+  wrapJavaPerform, 
+  Java
 } from "./lib/libjava.js";
 import {
   File,

agent/src/android/filesystem.ts

@@ -1,4 +1,7 @@
-import { wrapJavaPerform } from "./lib/libjava.js";
+import {
+  wrapJavaPerform,
+  Java
+} from "./lib/libjava.js";
 
 export const deoptimize = (): Promise<void> => {
   return wrapJavaPerform(() => {

agent/src/android/general.ts

@@ -5,11 +5,15 @@ import {
   IJavaField,
   IHeapNormalised
 } from "./lib/interfaces.js";
-import { wrapJavaPerform } from "./lib/libjava.js";
-
+import {
+  wrapJavaPerform,
+  Java
+} from "./lib/libjava.js";
 export let handles: IHeapClassDictionary = {};
+import type { default as JavaTypes } from "frida-java-bridge";
+
 
-const getInstance = (hashcode: number): Java.Wrapper | null => {
+const getInstance = (hashcode: number): JavaTypes.Wrapper | null => {
   const matches: IHeapObject[] = [];
 
   // Search for this handle, and push the results to matches
@@ -112,7 +116,7 @@ export const fields = (handle: number): Promise<IJavaField[]> => {
 
     return clazz.class.getDeclaredFields().map((field: any): IJavaField => {
       const fieldName: string = field.getName();
-      const fieldInstance: Java.Wrapper = clazz.class.getDeclaredField(fieldName);
+      const fieldInstance: JavaTypes.Wrapper = clazz.class.getDeclaredField(fieldName);
       fieldInstance.setAccessible(true);
 
       let fieldValue = fieldInstance.get(clazz);

agent/src/android/heap.ts

@@ -4,7 +4,8 @@ import { ICurrentActivityFragment } from "./lib/interfaces.js";
 import {
   getApplicationContext,
   R,
-  wrapJavaPerform
+  wrapJavaPerform,
+  Java
 } from "./lib/libjava.js";
 import {
   Activity,
@@ -16,6 +17,7 @@ import {
   Throwable,
   JavaMethodsOverloadsResult,
 } from "./lib/types.js";
+import type { default as JavaTypes } from "frida-java-bridge";
 
 enum PatternType {
   Regex = 'regex',
@@ -70,7 +72,7 @@ export const lazyWatchForPattern = (query: string, watch: boolean, dargs: boolea
 
   // This method loops over all enumerate matches and then calls watch
   // with the arguments specified in the parent function
-  const watchMatches = (matches: Java.EnumerateMethodsMatchGroup[]) => {
+  const watchMatches = (matches: JavaTypes.EnumerateMethodsMatchGroup[]) => {
     matches.forEach(match => {
       match.classes.forEach(_class => {
         _class.methods.forEach(_method => {
@@ -114,7 +116,7 @@ export const lazyWatchForPattern = (query: string, watch: boolean, dargs: boolea
   }, 1000 * 5);
 };
 
-export const javaEnumerate = (query: string): Promise<Java.EnumerateMethodsMatchGroup[]> => {
+export const javaEnumerate = (query: string): Promise<JavaTypes.EnumerateMethodsMatchGroup[]> => {
   // If the query is just a classname, strongarm it into a pattern.
   if (getPatternType(query) === PatternType.Klass) {
     query = `*${query}*!*`;
@@ -270,9 +272,9 @@ export const watch = (pattern: string, dargs: boolean, dbt: boolean, dret: boole
   jobs.add(job);
 
   return new Promise((resolve, reject) => {
-    javaEnumerate(pattern).then((matches: Java.EnumerateMethodsMatchGroup[]) => {
-      matches.forEach((match: Java.EnumerateMethodsMatchGroup) => {
-        match.classes.forEach((klass: Java.EnumerateMethodsMatchClass) => {
+    javaEnumerate(pattern).then((matches: JavaTypes.EnumerateMethodsMatchGroup[]) => {
+      matches.forEach((match: JavaTypes.EnumerateMethodsMatchGroup) => {
+        match.classes.forEach((klass: JavaTypes.EnumerateMethodsMatchClass) => {
           klass.methods.forEach(method => {
             // Only watch matched methods
             watchMethod(`${klass.name}.${method}`, job, dargs, dbt, dret);

agent/src/android/hooking.ts

@@ -1,12 +1,13 @@
 import { colors as c } from "../lib/color.js";
 import {
   getApplicationContext,
-  wrapJavaPerform
+  wrapJavaPerform,
+  Java
 } from "./lib/libjava.js";
 import { Intent, FridaOverload } from "./lib/types.js";
 import { analyseIntent } from "./lib/intentUtils.js";
 import * as jobs from "../lib/jobs.js";
-
+import type { default as JavaTypes } from "frida-java-bridge";
 
 // https://developer.android.com/reference/android/content/Intent.html#FLAG_ACTIVITY_NEW_TASK
 const FLAG_ACTIVITY_NEW_TASK = 0x10000000;
@@ -28,7 +29,7 @@ export const startActivity = (activityClass: string): Promise<void> => {
     const androidIntent: Intent = Java.use("android.content.Intent");
 
     // Get the Activity class's .class
-    const newActivity: Java.Wrapper = Java.use(activityClass).class;
+    const newActivity: JavaTypes.Wrapper = Java.use(activityClass).class;
     send(`Starting activity ${c.green(activityClass)}...`);
 
     // Init and launch the intent

agent/src/android/intent.ts

@@ -3,7 +3,10 @@ import {
   IKeyStoreDetail,
   IKeyStoreEntry
 } from "./lib/interfaces.js";
-import { wrapJavaPerform } from "./lib/libjava.js";
+import { 
+  wrapJavaPerform, 
+  Java 
+} from "./lib/libjava.js";
 import {
   KeyFactory,
   KeyInfo,

agent/src/android/keystore.ts

@@ -1,6 +1,7 @@
+import { Java } from "./libjava.js";
 import { colors as c } from "../../lib/color.js";
 
-export const analyseIntent = (methodName: string, intent: Java.Wrapper, backtrace: boolean = false): void => {
+export const analyseIntent = (methodName: string, intent: any, backtrace: boolean = false): void => {
   try {
     send(`\nAnalyzing Intent from: ${c.green(`${methodName}`)}`);