httpdbg 0.7.1__tar.gz → 0.7.3__tar.gz

{httpdbg-0.7.1 → httpdbg-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: httpdbg
-Version: 0.7.1
+Version: 0.7.3
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -86,8 +86,8 @@ pyhttpdbg -m pip install httpdbg --upgrade
 |------------|-------------|-------------------------------------------------------------------|
 | requests   | supported   | -                                                                 |
 | urllib3    | supported   | -                                                                 |
-| httpx      | supported   | Async HTTPS requests not intercepted                              |
-| aiohttp    | supported   | HTTP requests not intercepted on Windows                          |
+| httpx      | supported   | Async HTTP requests not intercepted on Windows (HTTPS OK)         |
+| aiohttp    | supported   | Async HTTP requests not intercepted on Windows (HTTPS OK)         |
 
 ## configuration
 

{httpdbg-0.7.1 → httpdbg-0.7.3}/README.md

@@ -66,8 +66,8 @@ pyhttpdbg -m pip install httpdbg --upgrade
 |------------|-------------|-------------------------------------------------------------------|
 | requests   | supported   | -                                                                 |
 | urllib3    | supported   | -                                                                 |
-| httpx      | supported   | Async HTTPS requests not intercepted                              |
-| aiohttp    | supported   | HTTP requests not intercepted on Windows                          |
+| httpx      | supported   | Async HTTP requests not intercepted on Windows (HTTPS OK)         |
+| aiohttp    | supported   | Async HTTP requests not intercepted on Windows (HTTPS OK)         |
 
 ## configuration
 

{httpdbg-0.7.1 → httpdbg-0.7.3}/httpdbg/__init__.py

@@ -2,6 +2,6 @@
 from httpdbg.hooks.all import httpdbg
 from httpdbg.utils import logger
 
-VERSION = "0.7.1"
+VERSION = "0.7.3"
 
 __all__ = ["httpdbg", "logger"]

{httpdbg-0.7.1 → httpdbg-0.7.3}/httpdbg/hooks/socket.py

@@ -32,7 +32,9 @@ def set_hook_for_socket_connect(records, method):
         try:
             r = method(self, address)
         except Exception as ex:
-            if not isinstance(ex, BlockingIOError):  # for async
+            if not isinstance(
+                ex, (BlockingIOError, OSError)
+            ):  # BlockingIOError for async, OSError for ipv6
                 record = HTTPRecord()
                 record.initiator = get_initiator(records._initiators)
 
@@ -61,11 +63,13 @@ def set_hook_for_ssl_wrap_socket(records, method):
 
             raise
 
+        logger.info(
+            f"WRAP_SOCKET - {type(sock)}={id(sock)} {type(sslsocket)}={id(sslsocket)}"
+        )
+
         socketdata = records.move_socket_data(sslsocket, sock)
         if socketdata:
-            logger.info(
-                f"WRAP_SOCKET - sock={sock} sockid={id(sock)} sslsocket={sslsocket} sslsocketid={id(sslsocket)} socketdata={socketdata}"
-            )
+            logger.info(f"WRAP_SOCKET * - socketdata={socketdata}")
 
         return sslsocket
 
@@ -86,11 +90,13 @@ def set_hook_for_sslcontext_wrap_socket(records, method):
 
             raise
 
+        logger.info(
+            f"WRAP_SOCKET (SSLContext) - {type(self)}={id(self)}  {type(sock)}={id(sock)} {type(sslsocket)}={id(sslsocket)}"
+        )
+
         socketdata = records.move_socket_data(sslsocket, sock)
         if socketdata:
-            logger.info(
-                f"WRAP_SOCKET (SSLContext) - socket={sock} socketid={id(sock)} sslsocket={sslsocket} sslsocketid={id(sslsocket)} socketdata={socketdata}"
-            )
+            logger.info(f"WRAP_SOCKET (SSLContext) * - socketdata={socketdata}")
 
         return sslsocket
 
@@ -111,11 +117,13 @@ def set_hook_for_socket_wrap_bio(records, method):
 
             raise
 
-        socketdata = records.move_socket_data(sslobject, self)
+        logger.info(
+            f"WRAP_SOCKET_BIO - {type(self)}={id(self)} {type(sslobject)}={id(sslobject)}"
+        )
+
+        socketdata = records.get_socket_data(sslobject, self)
         if socketdata:
-            logger.info(
-                f"WRAP_SOCKET_BIO - sock={self} sockid={id(self)} sslobject={sslobject} sslobjectid={id(sslobject)} socketdata={socketdata}"
-            )
+            logger.info(f"WRAP_SOCKET_BIO * - socketdata={socketdata}")
 
         return sslobject
 
@@ -171,7 +179,7 @@ def set_hook_for_socket_recv(records, method):
 
 def set_hook_for_socket_sendall(records, method):
     def hook(self, bytes, *args, **kwargs):
-        socketdata = records.get_socket_data(self)
+        socketdata = records.get_socket_data(self, request=True)
         if socketdata:
             logger.info(
                 f"SENDALL - self={self} id={id(self)} socketdata={socketdata} bytes={(b''+bytes)[:20]} type={type(bytes)} len={len(bytes)} args={args} kwargs={kwargs}"
@@ -206,7 +214,7 @@ def set_hook_for_socket_sendall(records, method):
 
 def set_hook_for_socket_send(records, method):
     def hook(self, bytes, *args, **kwargs):
-        socketdata = records.get_socket_data(self)
+        socketdata = records.get_socket_data(self, request=True)
         if socketdata:
             logger.info(
                 f"SEND - self={self} id={id(self)} socketdata={socketdata} bytes={(b''+bytes)[:20]} args={args} kwargs={kwargs}"
@@ -264,11 +272,10 @@ def set_hook_for_asyncio_create_connection(records, method):
 
 def set_hook_for_sslobject_write(records, method):
     def hook(self, buf, *args, **kwargs):
-        socketdata = records.get_socket_data(self)
+        logger.info(f"WRITE - {type(self)}={id(self)} buf={(b'' + buf)[:20]}")
+        socketdata = records.get_socket_data(self, request=True)
         if socketdata:
-            logger.info(
-                f"WRITE - self={self} id={id(self)} socketdata={socketdata} buf={(b'' + buf)[:20]} args={args} kwargs={kwargs}"
-            )
+            logger.info(f"WRITE * - socketdata={socketdata}")
 
         try:
             size = method(self, buf, *args, **kwargs)
@@ -299,11 +306,10 @@ def set_hook_for_sslobject_write(records, method):
 
 def set_hook_for_sslobject_read(records, method):
     def hook(self, *args, **kwargs):
+        logger.info(f"READ - {type(self)}={id(self)}")
         socketdata = records.get_socket_data(self)
         if socketdata:
-            logger.info(
-                f"READ - self={self} id={id(self)} socketdata={socketdata} args={args} kwargs={kwargs}"
-            )
+            logger.info(f"READ * - socketdata={socketdata}")
 
         try:
             r = method(self, *args, **kwargs)

{httpdbg-0.7.1 → httpdbg-0.7.3}/httpdbg/records.py

@@ -64,14 +64,25 @@ class HTTPRecords:
     def __len__(self):
         return len(self.requests)
 
-    def get_socket_data(self, obj, extra_sock=None, force_new=False):
-        socket_data = None
+    def get_socket_data(self, obj, extra_sock=None, force_new=False, request=None):
+        socketdata = None
 
         if force_new:
             self.del_socket_data(obj)
 
         if id(obj) in self._sockets:
-            socket_data = self._sockets[id(obj)]
+            socketdata = self._sockets[id(obj)]
+            if request:
+                if (
+                    socketdata
+                    and socketdata.record
+                    and socketdata.record.response.rawdata
+                ):
+                    # the socket is reused for a new request
+                    self._sockets[id(obj)] = SocketRawData(
+                        id(obj), socketdata.address, socketdata.ssl
+                    )
+                    socketdata = self._sockets[id(obj)]
         else:
             if isinstance(obj, socket.socket):
                 try:
@@ -79,33 +90,37 @@ class HTTPRecords:
                     self._sockets[id(obj)] = SocketRawData(
                         id(obj), address, isinstance(obj, ssl.SSLSocket)
                     )
-                    socket_data = self._sockets[id(obj)]
+                    socketdata = self._sockets[id(obj)]
                 except OSError:
                     # OSError: [WinError 10022] An invalid argument was supplied
                     pass
             else:
                 if extra_sock:
                     try:
-                        address = extra_sock.getsockname()
+                        address = (
+                            extra_sock.getsockname()
+                            if hasattr(extra_sock, "getsockname")
+                            else ("", 0)  # wrap_bio
+                        )
                         self._sockets[id(obj)] = SocketRawData(
                             id(obj),
                             address,
                             isinstance(obj, (ssl.SSLObject, ssl.SSLSocket)),
                         )
-                        socket_data = self._sockets[id(obj)]
+                        socketdata = self._sockets[id(obj)]
                     except OSError:
                         # OSError: [WinError 10022] An invalid argument was supplied
                         pass
 
-        return socket_data
+        return socketdata
 
     def move_socket_data(self, dest, ori):
         if id(ori) in self._sockets:
-            socket_data = self.get_socket_data(ori)
-            if socket_data:
-                self._sockets[id(dest)] = socket_data
+            socketdata = self.get_socket_data(ori)
+            if socketdata:
+                self._sockets[id(dest)] = socketdata
                 if isinstance(dest, (ssl.SSLSocket, ssl.SSLObject)):
-                    socket_data.ssl = True
+                    socketdata.ssl = True
                 self.del_socket_data(ori)
 
     def del_socket_data(self, obj):

{httpdbg-0.7.1 → httpdbg-0.7.3}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: httpdbg
-Version: 0.7.1
+Version: 0.7.3
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0
@@ -86,8 +86,8 @@ pyhttpdbg -m pip install httpdbg --upgrade
 |------------|-------------|-------------------------------------------------------------------|
 | requests   | supported   | -                                                                 |
 | urllib3    | supported   | -                                                                 |
-| httpx      | supported   | Async HTTPS requests not intercepted                              |
-| aiohttp    | supported   | HTTP requests not intercepted on Windows                          |
+| httpx      | supported   | Async HTTP requests not intercepted on Windows (HTTPS OK)         |
+| aiohttp    | supported   | Async HTTP requests not intercepted on Windows (HTTPS OK)         |
 
 ## configuration
 

{httpdbg-0.7.1 → httpdbg-0.7.3}/tests/test_hook_aiohttp.py

@@ -321,7 +321,7 @@ async def test_aiohttp_exception_asyncclient():
     platform.system().lower() == "windows",
     reason="Async HTTP requests not intercepted on Windows",
 )
-async def test_aiohttp_get_empty_request_content(httpbin_both):
+async def test_aiohttp_get_empty_request_content_asyncclient(httpbin_both):
     with httpdbg() as records:
         async with aiohttp.ClientSession(
             connector=aiohttp.TCPConnector(verify_ssl=False)
@@ -333,3 +333,29 @@ async def test_aiohttp_get_empty_request_content(httpbin_both):
 
     assert http_record.url == f"{httpbin_both.url}/get"
     assert http_record.request.content == b""
+
+
+@pytest.mark.aiohttp
+@pytest.mark.asyncio
+@pytest.mark.xfail(
+    platform.system().lower() == "windows",
+    reason="Async HTTP requests not intercepted on Windows",
+)
+async def test_aiohttp_many_requests_session_asyncclient():
+    with httpdbg() as records:
+        async with aiohttp.ClientSession() as session:
+            await session.get("https://httpbin.org/get")
+            await session.get("https://httpbin.org/get/abc")
+            await session.post("https://httpbin.org/post", data="abc")
+            await session.get("https://httpbin.org/get")
+
+    assert len(records) == 4
+
+    assert records[0].url == "https://httpbin.org/get"
+    assert records[0].request.content == b""
+    assert records[1].url == "https://httpbin.org/get/abc"
+    assert records[1].request.content == b""
+    assert records[2].url == "https://httpbin.org/post"
+    assert records[2].request.content == b"abc"
+    assert records[3].url == "https://httpbin.org/get"
+    assert records[3].request.content == b""

{httpdbg-0.7.1 → httpdbg-0.7.3}/tests/test_hook_httpx.py

@@ -232,15 +232,53 @@ def test_httpx_get_empty_request_content(httpbin_both):
     assert http_record.request.content == b""
 
 
+@pytest.mark.httpx
+def test_httpx_many_requests():
+    with httpdbg() as records:
+        httpx.get("https://httpbin.org/get")
+        httpx.get("https://httpbin.org/get/abc")
+        httpx.post("https://httpbin.org/post", data="abc")
+        httpx.get("https://httpbin.org/get")
+
+    assert len(records) == 4
+
+    assert records[0].url == "https://httpbin.org/get"
+    assert records[0].request.content == b""
+    assert records[1].url == "https://httpbin.org/get/abc"
+    assert records[1].request.content == b""
+    assert records[2].url == "https://httpbin.org/post"
+    assert records[2].request.content == b"abc"
+    assert records[3].url == "https://httpbin.org/get"
+    assert records[3].request.content == b""
+
+
+@pytest.mark.httpx
+def test_httpx_many_requests_session():
+    with httpdbg() as records:
+        with httpx.Client() as session:
+            session.get("https://httpbin.org/get")
+            session.get("https://httpbin.org/get/abc")
+            session.post("https://httpbin.org/post", data="abc")
+            session.get("https://httpbin.org/get")
+
+    assert len(records) == 4
+
+    assert records[0].url == "https://httpbin.org/get"
+    assert records[0].request.content == b""
+    assert records[1].url == "https://httpbin.org/get/abc"
+    assert records[1].request.content == b""
+    assert records[2].url == "https://httpbin.org/post"
+    assert records[2].request.content == b"abc"
+    assert records[3].url == "https://httpbin.org/get"
+    assert records[3].request.content == b""
+
+
 @pytest.mark.httpx
 @pytest.mark.asyncio
 @pytest.mark.xfail(
     platform.system().lower() == "windows",
     reason="Async HTTP requests not intercepted on Windows",
 )
-@pytest.mark.xfail(
-    reason="Async HTTPS requests not intercepted",
-)
 async def test_httpx_asyncclient(httpbin_both):
     with httpdbg() as records:
         async with httpx.AsyncClient(verify=False) as client:
@@ -285,9 +323,6 @@ async def test_httpx_initiator_asyncclient(httpbin):
     platform.system().lower() == "windows",
     reason="Async HTTP requests not intercepted on Windows",
 )
-@pytest.mark.xfail(
-    reason="Async HTTPS requests not intercepted",
-)
 async def test_httpx_request_asyncclient(httpbin_both):
     with httpdbg() as records:
         async with httpx.AsyncClient(verify=False) as client:
@@ -310,9 +345,6 @@ async def test_httpx_request_asyncclient(httpbin_both):
     platform.system().lower() == "windows",
     reason="Async HTTP requests not intercepted on Windows",
 )
-@pytest.mark.xfail(
-    reason="Async HTTPS requests not intercepted",
-)
 async def test_httpx_response_asyncclient(httpbin_both):
     with httpdbg() as records:
         async with httpx.AsyncClient(verify=False) as client:
@@ -370,9 +402,6 @@ async def test_httpx_cookies_asyncclient(httpbin):
     platform.system().lower() == "windows",
     reason="Async HTTP requests not intercepted on Windows",
 )
-@pytest.mark.xfail(
-    reason="Async HTTPS requests not intercepted",
-)
 async def test_httpx_cookies_asyncclient_secure(httpbin_secure):
     with httpdbg() as records:
         async with httpx.AsyncClient(verify=False) as client:
@@ -426,9 +455,6 @@ async def test_httpx_exception_asyncclient():
     platform.system().lower() == "windows",
     reason="Async HTTP requests not intercepted on Windows",
 )
-@pytest.mark.xfail(
-    reason="Async HTTPS requests not intercepted",
-)
 async def test_httpx_get_empty_request_content_asyncclient(httpbin_both):
     with httpdbg() as records:
         async with httpx.AsyncClient(verify=False) as client:
@@ -439,3 +465,29 @@ async def test_httpx_get_empty_request_content_asyncclient(httpbin_both):
 
     assert http_record.url == f"{httpbin_both.url}/get"
     assert http_record.request.content == b""
+
+
+@pytest.mark.httpx
+@pytest.mark.asyncio
+@pytest.mark.xfail(
+    platform.system().lower() == "windows",
+    reason="Async HTTP requests not intercepted on Windows",
+)
+async def test_httpx_many_requests_session_asyncclient():
+    with httpdbg() as records:
+        async with httpx.AsyncClient() as session:
+            await session.get("https://httpbin.org/get")
+            await session.get("https://httpbin.org/get/abc")
+            await session.post("https://httpbin.org/post", data="abc")
+            await session.get("https://httpbin.org/get")
+
+    assert len(records) == 4
+
+    assert records[0].url == "https://httpbin.org/get"
+    assert records[0].request.content == b""
+    assert records[1].url == "https://httpbin.org/get/abc"
+    assert records[1].request.content == b""
+    assert records[2].url == "https://httpbin.org/post"
+    assert records[2].request.content == b"abc"
+    assert records[3].url == "https://httpbin.org/get"
+    assert records[3].request.content == b""

{httpdbg-0.7.1 → httpdbg-0.7.3}/tests/test_hook_requests.py

@@ -217,3 +217,44 @@ def test_requests_get_empty_request_content(httpbin_both):
 
     assert http_record.url == f"{httpbin_both.url}/get"
     assert http_record.request.content == b""
+
+
+@pytest.mark.requests
+def test_requests_many_requests():
+    with httpdbg() as records:
+        requests.get("https://httpbin.org/get")
+        requests.get("https://httpbin.org/get/abc")
+        requests.post("https://httpbin.org/post", data="abc")
+        requests.get("https://httpbin.org/get")
+
+    assert len(records) == 4
+
+    assert records[0].url == "https://httpbin.org/get"
+    assert records[0].request.content == b""
+    assert records[1].url == "https://httpbin.org/get/abc"
+    assert records[1].request.content == b""
+    assert records[2].url == "https://httpbin.org/post"
+    assert records[2].request.content == b"abc"
+    assert records[3].url == "https://httpbin.org/get"
+    assert records[3].request.content == b""
+
+
+@pytest.mark.requests
+def test_requests_many_requests_session():
+    with httpdbg() as records:
+        with requests.Session() as session:
+            session.get("https://httpbin.org/get")
+            session.get("https://httpbin.org/get/abc")
+            session.post("https://httpbin.org/post", data="abc")
+            session.get("https://httpbin.org/get")
+
+    assert len(records) == 4
+
+    assert records[0].url == "https://httpbin.org/get"
+    assert records[0].request.content == b""
+    assert records[1].url == "https://httpbin.org/get/abc"
+    assert records[1].request.content == b""
+    assert records[2].url == "https://httpbin.org/post"
+    assert records[2].request.content == b"abc"
+    assert records[3].url == "https://httpbin.org/get"
+    assert records[3].request.content == b""