parse_pcap_klap: use request_uri for matching the response (python-kasa#1136)

rytilahti · web-flow · commit 130e1b6023f5 · 2024-09-28T20:20:47.000+02:00
tshark 4.4.0 does not have response_for_uri, this fixes response
detection by using request_uri, too.
diff --git a/devtools/parse_pcap_klap.py b/devtools/parse_pcap_klap.py
@@ -29,6 +29,24 @@
 from kasa.protocol import DEFAULT_CREDENTIALS, get_default_credentials
 
 
+def _is_http_response_for_packet(response, packet):
+    """Return True if the *response* contains a response for request in *packet*.
+
+    Different tshark versions use different field for the information.
+    """
+    if not hasattr(response, "http"):
+        return False
+    if hasattr(response.http, "response_for_uri") and (
+        response.http.response_for_uri == packet.http.request_full_uri
+    ):
+        return True
+    # tshark 4.4.0
+    if response.http.request_uri == packet.http.request_uri:
+        return True
+
+    return False
+
+
 class MyEncryptionSession(KlapEncryptionSession):
     """A custom KlapEncryptionSession class that allows for decryption."""
 
@@ -222,7 +240,7 @@ def main(
     while True:
         try:
             packet = capture.next()
-            # packet_number = capture._current_packet
+            packet_number = capture._current_packet
             # we only care about http packets
             if hasattr(
                 packet, "http"
@@ -267,18 +285,16 @@ def main(
                         message = bytes.fromhex(data)
                         operator.local_seed = message
                         response = None
+                        print(
+                            f"got handshake1 in {packet_number}, "
+                            f"looking for the response"
+                        )
                         while (
                             True
                         ):  # we are going to now look for the response to this request
                             response = capture.next()
-                            if (
-                                hasattr(response, "http")
-                                and hasattr(response.http, "response_for_uri")
-                                and (
-                                    response.http.response_for_uri
-                                    == packet.http.request_full_uri
-                                )
-                            ):
+                            if _is_http_response_for_packet(response, packet):
+                                print(f"found response in {packet_number}")
                                 break
                         data = response.http.get_field_value("file_data", raw=True)
                         message = bytes.fromhex(data)
