(fix) move to macho-ts and frida-screenshot ts

sensepost · Jun 7, 2024 · d9c989d · d9c989d
1 parent e6db48b
commit d9c989d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 40 deletions.
diff --git a/agent/package-lock.json b/agent/package-lock.json
diff --git a/agent/package.json b/agent/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "description": "Runtime Mobile Exploration",
   "private": true,
+  "type": "module",
   "main": "src/index.ts",
   "scripts": {
     "prepare": "npm run build",
@@ -31,7 +32,7 @@
     "frida-java-bridge": "^6",
     "frida-objc-bridge": "^7",
     "frida-screenshot": "^5",
-    "macho": "^1"
+    "macho-ts": "^0.1.0"
   },
   "devDependencies": {
     "@types/frida-gum": "^18",

diff --git a/agent/src/ios/binary.ts b/agent/src/ios/binary.ts
@@ -1,5 +1,5 @@
-// tslint:disable-next-line:no-var-requires
-const macho = require("macho");
+import macho from "macho-ts";
+
 import * as iosfilesystem from "./filesystem.js";
 import { IBinaryModuleDictionary } from "./lib/interfaces.js";
 

diff --git a/agent/src/ios/userinterface.ts b/agent/src/ios/userinterface.ts
@@ -1,14 +1,14 @@
 // tslint:disable-next-line:no-var-requires
-const sc = require("frida-screenshot");
+import screenshot from "frida-screenshot";
 import { colors as c } from "../lib/color.js";
 import { IJob } from "../lib/interfaces.js";
 import * as jobs from "../lib/jobs.js";
 
 
-export const screenshot = (): any => {
+export const take = (): any => {
   // heavy lifting thanks to frida-screenshot!
   // https://github.com/nowsecure/frida-screenshot
-  return sc();
+  return screenshot(null);
 };
 
 export const dump = (): string => {
@@ -131,7 +131,7 @@ export const biometricsBypass = (): void => {
   if (policyJob.invocations) {
     policyJob.invocations.push(lacontext1);
   } else {
-    policyJob.invocations = [ lacontext1 ];
+    policyJob.invocations = [lacontext1];
   }
   jobs.add(policyJob);
 
@@ -193,7 +193,7 @@ export const biometricsBypass = (): void => {
   if (accessControlJob.invocations) {
     accessControlJob.invocations.push(lacontext2);
   } else {
-    accessControlJob.invocations = [ lacontext2 ];
+    accessControlJob.invocations = [lacontext2];
   }
   jobs.add(accessControlJob);
 };
diff --git a/agent/src/rpc/ios.ts b/agent/src/rpc/ios.ts
@@ -80,7 +80,7 @@ export const ios = {
   // ios user interface
   iosUiAlert: (message: string): void => userinterface.alert(message),
   iosUiBiometricsBypass: (): void => userinterface.biometricsBypass(),
-  iosUiScreenshot: (): any => userinterface.screenshot(),
+  iosUiScreenshot: (): any => userinterface.take(),
   iosUiWindowDump: (): string => userinterface.dump(),
 
   // ios ssl pinning
@@ -97,8 +97,8 @@ export const ios = {
   iosKeychainAdd: (account: string, service: string, data: string): boolean =>
     ioskeychain.add(account, service, data),
   iosKeychainRemove: (account: string, service: string): void => ioskeychain.remove(account, service),
-  iosKeychainUpdate: (account: string, service: string, newData: string): void => 
-    ioskeychain.update(account, service, newData),    
+  iosKeychainUpdate: (account: string, service: string, newData: string): void =>
+    ioskeychain.update(account, service, newData),
   iosKeychainEmpty: (): void => ioskeychain.empty(),
   iosKeychainList: (smartDecode: boolean = false): IKeychainItem[] => ioskeychain.list(smartDecode),
   iosKeychainListRaw: (): void => ioskeychain.listRaw(),