friTap 2.2.2__tar.gz → 2.2.4__tar.gz

{fritap-2.2.2/friTap.egg-info → fritap-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: friTap
-Version: 2.2.2
+Version: 2.2.4
 Summary: Simplifies (SSL/TLS) traffic analysis and key extraction using Frida across major platforms.
 Home-page: https://github.com/fkie-cad/friTap
 Author: Daniel Baier, Julian Lengersdorff, Francois Egner, Max Ufer
@@ -66,7 +66,7 @@ Dynamic: summary
 </div>
 
 # friTap
-![version](https://img.shields.io/badge/version-2.2.2-blue) [![PyPI version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&r=r&ts=1683906897&type=6e&v=2.2.2&x2=0)](https://badge.fury.io/py/friTap) [![CI](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml)
+![version](https://img.shields.io/badge/version-2.2.4-blue) [![PyPI version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&r=r&ts=1683906897&type=6e&v=2.2.4&x2=0)](https://badge.fury.io/py/friTap) [![CI](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml)
 [![Ruff](https://github.com/fkie-cad/friTap/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/lint.yml)
 [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml)
 

{fritap-2.2.2 → fritap-2.2.4}/README.md

@@ -4,7 +4,7 @@
 </div>
 
 # friTap
-![version](https://img.shields.io/badge/version-2.2.2-blue) [![PyPI version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&r=r&ts=1683906897&type=6e&v=2.2.2&x2=0)](https://badge.fury.io/py/friTap) [![CI](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml)
+![version](https://img.shields.io/badge/version-2.2.4-blue) [![PyPI version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&r=r&ts=1683906897&type=6e&v=2.2.4&x2=0)](https://badge.fury.io/py/friTap) [![CI](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/ci.yml)
 [![Ruff](https://github.com/fkie-cad/friTap/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/lint.yml)
 [![Publish status](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/fkie-cad/friTap/actions/workflows/publish.yml)
 

{fritap-2.2.2 → fritap-2.2.4}/friTap/about.py

@@ -2,5 +2,5 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Daniel Baier, Julian Lengersdorff, Francois Egner, Max Ufer"
-__version__ = "2.2.2"
+__version__ = "2.2.4"
 debug = False # are we running in debug mode?

{fritap-2.2.2 → fritap-2.2.4}/friTap/config.py

@@ -158,6 +158,12 @@ class FriTapConfig:
         )
     """
     target: str
+    # Original argv tokens for spawn mode (e.g. ["wine", "/p/My Game/app.exe"]).
+    # Kept separate from `target` (which stays a single string for attach-by-name
+    # / display) so spawn passes the real argv to device.spawn() instead of
+    # re-splitting the joined string on spaces — which corrupts paths containing
+    # spaces (issue #66 follow-up). None for attach mode / programmatic configs.
+    target_argv: Optional[List[str]] = None
     device: DeviceConfig = field(default_factory=DeviceConfig)
     output: OutputConfig = field(default_factory=OutputConfig)
     hooking: HookingConfig = field(default_factory=HookingConfig)
@@ -209,6 +215,7 @@ class FriTapConfig:
         cls,
         app: str,
         pcap_name: Optional[str] = None,
+        spawn_argv: Optional[List[str]] = None,
         verbose: bool = False,
         spawn: bool = False,
         keylog: bool | str = False,
@@ -264,6 +271,7 @@ class FriTapConfig:
         """
         return cls(
             target=app,
+            target_argv=spawn_argv,
             device=DeviceConfig(
                 mobile=mobile,
                 host=host if host else None,

{fritap-2.2.2 → fritap-2.2.4}/friTap/friTap.py

@@ -294,7 +294,7 @@ Offline (read / analyze .tap):
     args.add_argument("--debug-log", metavar="<path>", required=False, default=None, dest="debug_log",
                       help="Write the friTap debug log to <path> (default: ./fritap_debug_<ts>_<pid>.log). "
                            "Capture session-level errors, warnings, and uncaught exceptions even in non-TUI mode.")
-    args.add_argument("-do", "--debugoutput", required=False, action="store_const", const=True,
+    args.add_argument("-do", "--debug-output", required=False, action="store_const", const=True,
                       help="Activate the debug output only.")
     args.add_argument("-ar", "--anti_root", required=False, action="store_const", const=True, default=False, help="Activate anti root hooks for Android")
     args.add_argument("-ed", "--enable_default_fd", required=False, action="store_const", const=True, default=False, help="Activate the fallback socket information (127.0.0.1:1234-127.0.0.1:2345) whenever the file descriptor (FD) of the socket cannot be determined")
@@ -363,8 +363,10 @@ Offline (read / analyze .tap):
                       help="Catch ALL newly spawned processes without filtering (use with caution)")
     args.add_argument("--enable_child_gating", required=False, action="store_const", const=True,
                       help="Intercept child processes spawned by the target application")
-    args.add_argument("exec", metavar="<executable/app name/pid>",
-                      help="executable/app whose SSL calls to log")
+    args.add_argument("exec", metavar="<executable/app name/pid>", nargs="+",
+                      help="executable/app whose SSL calls to log. Accepts a "
+                           "command with arguments for spawn mode, e.g. "
+                           "'wine /path/to/application.exe' (issue #66).")
     args.add_argument("--offsets", required=False, metavar="<offsets.json>",
                       help="Provide custom offsets for all hooked functions inside a JSON file or a json string containing all offsets. For more details see our example json (offsets_example.json)")
     args.add_argument("--patterns", required=False, metavar="<pattern.json>",
@@ -506,18 +508,30 @@ Offline (read / analyze .tap):
                            "By default loopback traffic is filtered out to reduce noise.")
     parsed = parser.parse_args()
 
+    # The target positional now captures one-or-more tokens (nargs="+") so a
+    # spawn command with arguments parses, e.g. `wine /path/app.exe` (issue #66).
+    # Keep the original token list as parsed.exec_argv so spawn can pass the real
+    # argv to device.spawn() (preserving paths that contain spaces, e.g.
+    # ".../Program Files/app.exe"), and collapse parsed.exec to the single
+    # space-joined string the rest of friTap expects for attach-by-name/display.
+    if isinstance(parsed.exec, list):
+        parsed.exec_argv = list(parsed.exec)
+        parsed.exec = " ".join(parsed.exec)
+    else:
+        parsed.exec_argv = None
+
     # Configure logging after parsing arguments to respect debug flags
     logger, special_logger = setup_fritap_logging(
-        debug=parsed.debug, debug_output=parsed.debugoutput
+        debug=parsed.debug, debug_output=parsed.debug_output
     )
 
     # Bring up the debug-log file subsystem when the user asked for one,
-    # either explicitly via --debug-log or implicitly via --debugoutput.
+    # either explicitly via --debug-log or implicitly via --debug-output.
     # Done immediately after console-logging is configured so init-time
     # errors below this line land in the file. The TUI entry point
     # (run_tui) calls prime_debug_log too — both call sites are idempotent.
     debug_log_path_override = getattr(parsed, "debug_log", None)
-    if debug_log_path_override or parsed.debugoutput:
+    if debug_log_path_override or parsed.debug_output:
         from .fritap_utility import prime_debug_log
         opened = prime_debug_log(debug_log_path_override)
         if opened:
@@ -530,7 +544,7 @@ Offline (read / analyze .tap):
             logger.info("LSASS hooking is disabled. Proceeding without LSASS.")
         else:
             logger.info("Hooking LSASS process for SSL/TLS traffic decryption.")
-            hook_lsass(parsed.pcap, parsed.verbose, parsed.keylog, parsed.live, parsed.debug, parsed.host, parsed.debugoutput, parsed.enable_default_fd, parsed.patterns, parsed.custom_script, parsed.json)
+            hook_lsass(parsed.pcap, parsed.verbose, parsed.keylog, parsed.live, parsed.debug, parsed.host, parsed.debug_output, parsed.enable_default_fd, parsed.patterns, parsed.custom_script, parsed.json)
             atexit.register(cleanup_lsass_hook)
 
     install_lsass_hook = False
@@ -540,7 +554,7 @@ Offline (read / analyze .tap):
             app=parsed.exec, verbose=parsed.verbose, spawn=parsed.spawn,
             mobile=parsed.mobile, environment_file=parsed.environment,
             debug_mode=parsed.debug, host=parsed.host, offsets=parsed.offsets,
-            debug_output=parsed.debugoutput, experimental=parsed.experimental,
+            debug_output=parsed.debug_output, experimental=parsed.experimental,
             anti_root=parsed.anti_root, enable_default_fd=parsed.enable_default_fd,
             patterns=parsed.patterns, custom_hook_script=parsed.custom_script,
             backend=parsed.backend,
@@ -708,6 +722,7 @@ Offline (read / analyze .tap):
         special_logger.info("Press Ctrl+C to stop logging")
         config = FriTapConfig.from_legacy_params(
             app=parsed.exec,
+            spawn_argv=getattr(parsed, "exec_argv", None),
             pcap_name=parsed.pcap,
             verbose=parsed.verbose,
             spawn=parsed.spawn,
@@ -723,7 +738,7 @@ Offline (read / analyze .tap):
             socket_trace=parsed.socket_tracing,
             host=parsed.host,
             offsets=parsed.offsets,
-            debug_output=parsed.debugoutput,
+            debug_output=parsed.debug_output,
             experimental=parsed.experimental,
             anti_root=parsed.anti_root,
             payload_modification=parsed.payload_modification,
@@ -834,7 +849,7 @@ Offline (read / analyze .tap):
             for trace in trace_back
         ]
         
-        if parsed.debug or parsed.debugoutput:
+        if parsed.debug or parsed.debug_output:
             if "NotSupportedError" in ex_type.__name__:
                 logger.error("Backend error:")
             logger.error("Exception type : %s " % ex_type.__name__)
@@ -864,7 +879,7 @@ Offline (read / analyze .tap):
     finally:
         if 'ssl_log' in locals() and isinstance(ssl_log, SSL_Logger):
             ssl_log.pcap_cleanup(parsed.full_capture,parsed.mobile,parsed.pcap)
-            ssl_log.cleanup(parsed.live,parsed.socket_tracing,parsed.full_capture,parsed.debug,parsed.debugoutput)
+            ssl_log.cleanup(parsed.live,parsed.socket_tracing,parsed.full_capture,parsed.debug,parsed.debug_output)
     
     # only reached when error
     raise Failure