get kitty pid and sigterm instead of close-window

Author: k4lizen

pwnlib/util/misc.py

@@ -1,5 +1,6 @@
 from __future__ import division
 
+import json
 import base64
 import errno
 import os
@@ -468,15 +469,23 @@ def run_in_new_terminal(command, terminal=None, args=None, kill_at_exit=True, pr
                                'org.kde.konsole.Session.processId'), stdout=subprocess.PIPE) as proc:
             pid = int(proc.communicate()[0].decode())
     elif terminal in ('kitty', 'kitten'):
-        pid = p.pid
-        
+        pid = None
         out, _ = p.communicate()
         try:
             kittyid = int(out)
         except ValueError:
             kittyid = None
         if kittyid is None:
             log.error("Could not parse kitty window ID from output (%r)", out)
+        else:
+            lsout, _ = subprocess.Popen(["kitten", "@", "ls", "--match", "id:%d" % kittyid], stdin=stdin, stdout=stdout, stderr=stderr).communicate()
+            try:
+                lsj = json.loads(lsout)
+                pid = int(lsj[0]["tabs"][0]["windows"][0]["pid"])
+            except json.JSONDecodeError as e:
+                pid = None
+                log.error("Json decode failed while parsing 'kitten @ ls' output (%r) (error: %r)", lsout, e)
+            
     elif terminal == 'cmd.exe':
         # p.pid is cmd.exe's pid instead of the WSL process we want to start eventually.
         # I don't know how to trace the execution through Windows and back into the WSL2 VM.
@@ -501,8 +510,6 @@ def kill():
             try:
                 if terminal == 'qdbus':
                     os.kill(pid, signal.SIGHUP)
-                elif terminal in ('kitty', 'kitten'):
-                    subprocess.Popen(["kitten", "@", "close-window", "--match", "id:{}".format(kittyid)], stderr=stderr)
                 else:
                     os.kill(pid, signal.SIGTERM)
             except OSError: