trueseeing 2.2.6__tar.gz → 2.2.7__tar.gz

{trueseeing-2.2.6 → trueseeing-2.2.7}/Dockerfile

@@ -3,16 +3,23 @@ run pip install flit
 copy . /tmp/build/
 run (cd /tmp/build && flit build)
 
+from python:3.13-slim
+run apt-get update -y && apt-get install -y git
+run (cd /opt && git clone https://github.com/AloneMonkey/frida-ios-dump.git && cd frida-ios-dump && python3 -m venv .venv && .venv/bin/pip install -r ./requirements.txt)
+
 from python:3.13-slim
 run apt-get update -y && apt-get install -y openjdk-17-jre-headless zip adb
 run install -d -m 777 /data /ext /cache /out && ln -sfn /cache /root/.local
+copy --from=1 /opt/frida-ios-dump /opt/frida-ios-dump
 copy --from=0 /tmp/build/dist/*.whl /tmp/dist/
 run pip install /tmp/dist/*.whl && rm -rf /tmp/dist /tmp/ext
-env PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+env PATH=/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin
 env TS2_IN_DOCKER=1
 env TS2_CACHEDIR=/cache
 env TS2_HOME=/data
 env TS2_EXTDIR=/ext
+env TS2_FRIDA_IOS_DUMP_PATH=/opt/frida-ios-dump/dump.py
+env TS2_FRIDA_IOS_DUMP_INTERP=/opt/frida-ios-dump/.venv/bin/python3
 env TS2_SWIFT_DEMANGLER_URL=http://ts2-swift-demangle
 workdir /out
 entrypoint ["trueseeing"]

{trueseeing-2.2.6 → trueseeing-2.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: trueseeing
-Version: 2.2.6
+Version: 2.2.7
 Summary: Trueseeing is a non-decompiling iOS/Android application vulnerability scanner.
 Keywords: ios,android,security,pentest,hacking
 Author-email: Takahiro Yoshimura <alterakey@protonmail.com>
@@ -13,6 +13,7 @@ Classifier: Operating System :: POSIX :: BSD
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Android
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+License-File: COPYING
 Requires-Dist: lxml~=5.0
 Requires-Dist: pyyaml~=6.0
 Requires-Dist: jinja2~=3.1
@@ -90,7 +91,7 @@ Alternatively, you can install our package with pip as follows. This form of ins
 You can interactively scan/analyze/patch/etc. apps -- making it the ideal choice for manual analysis:
 
     $ trueseeing target.apk
-    [+] trueseeing 2.2.6
+    [+] trueseeing 2.2.7
     ts[target.apk]> ?
     ...
     ts[target.apk]> i                      # show generic information
@@ -323,7 +324,7 @@ class APKFileFormatHandler(FileFormatHandler):
     return APKFileFormatHandler()
 
   def get_formats(self) -> FormatMap:
-    return {'apk2':dict(e=self._handle, r=r'\.apk$', d='sample file format')}
+    return {'apk2':dict(e=self._handle, r=r'\.apk$', d='sample file format', t=None)}  # if this handler can suggest device context type, advertise at t
 
   def get_configs(self) -> ConfigMap:
     return dict()

{trueseeing-2.2.6 → trueseeing-2.2.7}/README.md

@@ -55,7 +55,7 @@ Alternatively, you can install our package with pip as follows. This form of ins
 You can interactively scan/analyze/patch/etc. apps -- making it the ideal choice for manual analysis:
 
     $ trueseeing target.apk
-    [+] trueseeing 2.2.6
+    [+] trueseeing 2.2.7
     ts[target.apk]> ?
     ...
     ts[target.apk]> i                      # show generic information
@@ -288,7 +288,7 @@ class APKFileFormatHandler(FileFormatHandler):
     return APKFileFormatHandler()
 
   def get_formats(self) -> FormatMap:
-    return {'apk2':dict(e=self._handle, r=r'\.apk$', d='sample file format')}
+    return {'apk2':dict(e=self._handle, r=r'\.apk$', d='sample file format', t=None)}  # if this handler can suggest device context type, advertise at t
 
   def get_configs(self) -> ConfigMap:
     return dict()

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/__init__.py

@@ -1,2 +1,2 @@
 """Trueseeing is a non-decompiling iOS/Android application vulnerability scanner."""
-__version__ = '2.2.6'
+__version__ = '2.2.7'

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/api.py

@@ -54,6 +54,7 @@ if TYPE_CHECKING:
     e: FormatHandlerEntrypoint
     r: str
     d: str
+    t: Optional[Set[ContextType]]
 
   CommandMap = Mapping[str, CommandEntry]
   CommandPatternMap = Mapping[str, CommandPatternEntry]

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/app/cmd/ios/engage.py

@@ -24,6 +24,8 @@ class EngageCommand(CommandMixin):
   def get_commands(self) -> CommandMap:
     return {
       '!!!':dict(e=self._run_frida_shell, n='!!!', d='attach frida to the foreground process', t={'ipa'}),
+      'xg':dict(e=self._engage_grab_package, n='xg[!] package [output.ipa]', d='engage: grab package', t={'ipa'}),
+      'xg!':dict(e=self._engage_grab_package, t={'ipa'}),
       'xs':dict(e=self._engage_frida_attach, n='xs[!] [config]', d='engage: attach frida scripts (!: force)', t={'ipa'}),
       'xs!':dict(e=self._engage_frida_attach, t={'ipa'}),
       'xst':dict(e=self._engage_frida_trace_call, n='xst[!] [init.js]', d='engage: trace calls (!: force)', t={'ipa'}),
@@ -139,6 +141,60 @@ class EngageCommand(CommandMixin):
 
     ui.success("done ({t:.2f} sec.)".format(t=time() - at))
 
+  async def _engage_grab_package(self, args: deque[str]) -> None:
+    cmd = args.popleft()
+
+    import os
+    if not args:
+      ui.fatal('need the package name')
+
+    pkg = args.popleft()
+
+    if args:
+      outfn = args.popleft()
+    else:
+      outfn = f'{pkg}.ipa'
+
+    if os.path.exists(outfn):
+      if not cmd.endswith('!'):
+        ui.fatal('output file exists; force (!) to overwrite')
+      else:
+        os.remove(outfn)
+
+    from time import time
+    from tempfile import TemporaryDirectory
+    from trueseeing.core.ios.device import IOSDevice
+
+    dev = IOSDevice()
+    at = time()
+    outfn = os.path.realpath(outfn)
+
+    ui.info(f'grabbing package: {pkg} -> {outfn}')
+
+    with TemporaryDirectory() as td:
+      from os import chdir, getcwd
+      from trueseeing.core.env import get_frida_ios_dump_interp, get_frida_ios_dump_path
+      from shlex import quote
+      cd = getcwd()
+      try:
+        chdir(td)
+        from subprocess import CalledProcessError
+        try:
+          await dev.invoke_frida_passthru("{interp} {dump} -o t.ipa {name}".format(
+            interp=get_frida_ios_dump_interp(),
+            dump=get_frida_ios_dump_path(),
+            name=quote(pkg),
+          ))
+        except CalledProcessError:
+          ui.fatal('cannot attach to process')
+
+        from shutil import copy2
+        copy2('t.ipa', outfn)
+
+        ui.success('done ({t:.02f} sec)'.format(t=time() - at))
+      finally:
+        chdir(cd)
+
   def _get_context(self) -> IPAContext:
     return self._helper.get_context().require_type('ipa')  # type:ignore[return-value]
 

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/app/inspect.py

@@ -452,7 +452,10 @@ class CommandHelperImpl:
     from trueseeing.core.exc import InvalidFileFormatError
     t = self.get_target()
     if not t:
-      return None
+      try:
+        return self._opener.get_device_context_type()
+      except InvalidFileFormatError:
+        raise ui.fatal('invalid file type for device (try "apk" or "ipa", or not at all)')
     try:
       return self._opener.get_context(t).type
     except InvalidFileFormatError:

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/app/shell.py

@@ -46,8 +46,8 @@ class Shell:
     parser.add_argument('--quiet', action='store_true', help='Be less verbose')
     parser.add_argument('-d', '--debug', action='store_true', help='Debug mode')
     parser.add_argument('-e', '--abort-on-errors', action='store_true', help='Abort on errors')
-    parser.add_argument('-F', dest='force_opener', help='Open target as specified format')
-    parser.add_argument('-n', dest='no_target', action='store_true', help='Run without target')
+    parser.add_argument('-F', dest='force_opener', metavar='FORMAT', help='Set file format')
+    parser.add_argument('-n', dest='no_target', action='store_true', help='Run without target (use -F for assuming device type)')
     args_mut0.add_argument('-i', dest='scriptfn', metavar='FILE', help='Run script file before prompt')
     args_mut0.add_argument('-c', dest='inline_cmd', metavar='COMMAND', help='Run commands before prompt')
     args_mut1.add_argument('-q', dest='mode', action='store_const', const='batch', help='Batch mode; quit instead of giving prompt')

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/core/context.py

@@ -53,6 +53,16 @@ class FileOpener:
           return c
       raise InvalidFileFormatError()
 
+  def get_device_context_type(self) -> Optional[Set[ContextType]]:
+    from trueseeing.core.exc import InvalidFileFormatError
+    if self._force_opener is None:
+      return None
+    if self._force_opener in self._formats:
+      t = self._formats[self._force_opener]['t']
+      if t is not None:
+        return t
+    raise InvalidFileFormatError()
+
   def get_formats(self) -> Iterator[Mapping[str, str]]:
     for k,v in self._formats.items():
       yield dict(n=k, d=v['d'])
@@ -61,9 +71,9 @@ class FileOpener:
     from trueseeing.core.ext import Extension
 
     self._formats.update({
-      'apk':dict(e=self._handle_apk, r=r'\.apk$', d='Android application package'),
-      'xapk':dict(e=self._handle_xapk, r=r'\.xapk$', d='Android appllication bundle'),
-      'ipa': dict(e=self._handle_ipa, r=r'\.ipa$', d='iOS application archive'),
+      'apk':dict(e=self._handle_apk, r=r'\.apk$', d='Android application package', t={'apk','file'}),
+      'xapk':dict(e=self._handle_xapk, r=r'\.xapk$', d='Android appllication bundle', t=None),
+      'ipa': dict(e=self._handle_ipa, r=r'\.ipa$', d='iOS application archive', t={'ipa', 'file'}),
     })
 
     for clazz in Extension.get().get_fileformathandlers():

{trueseeing-2.2.6 → trueseeing-2.2.7}/trueseeing/core/env.py

@@ -80,6 +80,19 @@ def get_device_frida_dir(package_name: str) -> str:
 def get_swift_demangler_url() -> str:
   return os.environ.get('TS2_SWIFT_DEMANGLER_URL', 'http://127.0.0.1:8000')
 
+@cache
+def get_frida_ios_dump_interp() -> str:
+  from sys import executable
+  return os.environ.get('TS2_FRIDA_IOS_DUMP_INTERP', executable) # XXX
+
+@cache
+def get_frida_ios_dump_path() -> str:
+  try:
+    return os.environ['TS2_FRIDA_IOS_DUMP_PATH']
+  except KeyError:
+    from trueseeing.core.ui import ui
+    ui.fatal('need frida-ios-dump (try setting TS2_FRIDA_IOS_DUMP_PATH to the path to its dump.py)') # XXX
+
 @cache
 def get_cpu_count() -> int:
   from os import cpu_count