(fix) Android --uid flag fix. Fix frida-fs types.

agent/src/ios/binary.ts

@@ -31,6 +31,9 @@ export const info = (): IBinaryModuleDictionary => {
 
     const imports: Set<string> = new Set(a.enumerateImports().map((i) => i.name));
     const fb = iosfilesystem.readFile(a.path);
+    if (typeof(fb) == 'string') {
+      return;
+    }
 
     try {
       const exe = macho.parse(fb);

agent/src/rpc/ios.ts

@@ -40,7 +40,7 @@ export const ios = {
   // ios filesystem
   iosFileCwd: (): string => iosfilesystem.pwd(),
   iosFileDelete: (path: string): boolean => iosfilesystem.deleteFile(path),
-  iosFileDownload: (path: string): Buffer => iosfilesystem.readFile(path),
+  iosFileDownload: (path: string): string | Buffer => iosfilesystem.readFile(path),
   iosFileExists: (path: string): boolean => iosfilesystem.exists(path),
   iosFileLs: (path: string): IIosFileSystem => iosfilesystem.ls(path),
   iosFilePathIsFile: (path: string): boolean => iosfilesystem.pathIsFile(path),

objection/utils/agent.py

@@ -216,6 +216,8 @@ def set_target_pid(self):
 
         elif self.config.spawn:
             if self.config.uid is not None:
+                if self.device.query_system_parameters()['os']['id'] != 'android':
+                    raise Exception('--uid flag can only be used on Android.')
                 self.pid = self.device.spawn(self.config.name, uid=int(self.config.uid))
             else:
                 self.pid = self.device.spawn(self.config.name)
@@ -245,9 +247,10 @@ def attach(self):
             raise Exception('A PID needs to be set before attach()')
 
         if self.config.uid is None:
+            debug_print(f'Attaching to PID: {self.pid}')
             self.session = self.device.attach(self.pid)
         else:
-            self.session = self.device.attach(self.pid, uid=self.config.uid)
+            self.session = self.device.attach(self.pid)
 
         self.session.on('detached', self.handlers.session_on_detached)
 

requirements.txt

@@ -9,3 +9,4 @@ requests
 Flask>=3.0.0
 Pygments>=2.0.0
 litecli>=1.3.0
+setuptools>=70.0.0