fixed detaching bug

fkie-cad · Oct 21, 2022 · 82317c2 · 82317c2
1 parent 3944dcb
commit 82317c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/create_standalone_release/friTap_release_template.py b/create_standalone_release/friTap_release_template.py
@@ -105,6 +105,8 @@ def ssl_log(app, pcap_name=None, verbose=False, spawn=False, keylog=False, enabl
     debug = debug_mode
 
     def on_detach(reason):
+        if reason == "application-requested":
+            return
         print(f"\n[*] Target process stopped: {reason}\n")
         cleanup(live,socket_trace,full_capture,debug)
 
@@ -225,7 +227,6 @@ def instrument(process):
             script.enable_debugger(debug_port)
         script.on("message", on_message)
         script.load()
-        script.on('detached', on_detach)
 
     # Main code
     global pcap_obj
@@ -308,6 +309,8 @@ def instrument(process):
     if keylog:
         print(f'[*] Logging keylog file to {keylog}')
 
+    process.on('detached', on_detach)
+
 
     if spawn:
         device.resume(pid)

diff --git a/friTap/__init__.py b/friTap/__init__.py
@@ -2,5 +2,5 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Daniel Baier, Francois Egner, Max Ufer"
-__version__ = "1.0.7.0"
+__version__ = "1.0.7.1"
 debug = False # are we running in debug mode?
diff --git a/friTap/friTap.py b/friTap/friTap.py
@@ -96,6 +96,8 @@ def ssl_log(app, pcap_name=None, verbose=False, spawn=False, keylog=False, enabl
     debug = debug_mode
 
     def on_detach(reason):
+        if reason == "application-requested":
+            return
         print(f"\n[*] Target process stopped: {reason}\n")
         cleanup(live,socket_trace,full_capture,debug)
 
@@ -216,7 +218,6 @@ def instrument(process):
             script.enable_debugger(debug_port)
         script.on("message", on_message)
         script.load()
-        script.on('detached', on_detach)
 
     # Main code
     global pcap_obj
@@ -299,6 +300,8 @@ def instrument(process):
     if keylog:
         print(f'[*] Logging keylog file to {keylog}')
 
+    process.on('detached', on_detach)
+
 
     if spawn:
         device.resume(pid)