From 6cfdab8af013c27f96ec2207bbfedb6528228bfd Mon Sep 17 00:00:00 2001
From: JJTech0130 <jjtech@jjtech.dev>
Date: Fri, 7 Apr 2023 12:19:44 -0400
Subject: [PATCH] print ROOT for root connection

---
 printer.py     | 17 ++++++++++++++++-
 proxy/proxy.py |  5 +++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/printer.py b/printer.py
index 48740cd..7ceb0d3 100644
--- a/printer.py
+++ b/printer.py
@@ -113,16 +113,31 @@ def pretty_print_payload(prefix, payload: tuple[int, list[tuple[int, bytes]]]) -
             print(f" {bcolors.WARNING}Token{bcolors.ENDC}: {b64encode(_get_field(payload[1], 1)).decode()}", end="")
         if _get_field(payload[1], 0x0c):
             print(f" {bcolors.OKBLUE}SIGNED{bcolors.ENDC}", end="")
+        if _get_field(payload[1], 0x5) and int.from_bytes(_get_field(payload[1], 0x5)) & 0x4:
+            print(f" {bcolors.FAIL}ROOT{bcolors.ENDC}", end="")
         print()
+
+        #for field in payload[1]:
+        #    print(f"Field ID: {field[0]}")
+        #    print(f"Field Value: {field[1]}")
+
+            # 65 (user) or 69 (root)
         
         for i in range(len(payload[1])):
+            #if payload[1][i][0] == 5:
+                #if payload[1][i][1] == b'\x00\x00\x00A': # user
+                #    payload[1][i][1] = b'\x00\x00\x00E'
+                #elif payload[1][i][1] == b'\x00\x00\x00E': # root
+                #    payload[1][i][1] = b'\x00\x00\x00A'
+                #else:
+                #    print("Unknown field value: ", payload[1][i][1])
             if payload[1][i][0] == 1:
                 pass
                 #payload[1][i] = (None, None)
                 #payload[1][i] = (1, b64decode("D3MtN3e18QE8rve3n92wp+CwK7u/bWk/5WjQUOBN640="))
 
         out = apns._serialize_payload(payload[0], payload[1])
-        return out
+        #return out
     elif id == 0xc:
         print(f"{bcolors.OKGREEN}{prefix}{bcolors.ENDC}: {bcolors.OKCYAN}Keep Alive{bcolors.ENDC}")
     elif id == 0xd:
diff --git a/proxy/proxy.py b/proxy/proxy.py
index 4852188..7e7d5c6 100644
--- a/proxy/proxy.py
+++ b/proxy/proxy.py
@@ -54,8 +54,9 @@ def proxy(conn1: tlslite.TLSConnection, conn2: tlslite.TLSConnection, prefix: st
             #print(prefix, data)
             # Write the data to the second connection
             conn2.write(data)
-    except Exception as e:
-        pass # Probably a connection closed error
+    except OSError as e:
+        if e.errno == 9:
+            pass # Probably a connection closed error
     print("Connection closed")
     # Close the connections
     conn1.close()