feature: HttpFullRequest and HttpFullResponse implementation

Author: domysh

fgex-lib/README.md

@@ -50,7 +50,7 @@ def my_filter(raw_packet: RawPacket): #Logging filter
 
 ## Data handlers
 
-### RawPacket 
+### RawPacket
 ```python
 from firegex.nfproxy import RawPacket
 ```
@@ -111,6 +111,12 @@ from firegex.nfproxy import HttpRequestHeader
 ```
 This handler will be called only when the request headers are complete. It will receive a HttpRequestHeader object with the same properties as HttpRequest.
 
+### HttpFullRequest
+```python
+from firegex.nfproxy import HttpFullRequest
+```
+This handler will be called only when the request is complete. It will receive a HttpFullRequest object with the same properties as HttpRequest.
+
 ### HttpResponse
 ```python
 from firegex.nfproxy import HttpResponse
@@ -138,3 +144,8 @@ from firegex.nfproxy import HttpResponseHeader
 ```
 This handler will be called only when the response headers are complete. It will receive a HttpResponseHeader object with the same properties as HttpResponse.
 
+### HttpFullResponse
+```python
+from firegex.nfproxy import HttpFullResponse
+```
+This handler will be called only when the response is complete. It will receive a HttpFullResponse object with the same properties as HttpResponse.

fgex-lib/firegex/nfproxy/models/__init__.py

@@ -1,5 +1,17 @@
-from firegex.nfproxy.models.tcp import TCPInputStream, TCPOutputStream, TCPClientStream, TCPServerStream
-from firegex.nfproxy.models.http import HttpRequest, HttpResponse, HttpRequestHeader, HttpResponseHeader
+from firegex.nfproxy.models.tcp import (
+    TCPInputStream,
+    TCPOutputStream,
+    TCPClientStream,
+    TCPServerStream,
+)
+from firegex.nfproxy.models.http import (
+    HttpRequest,
+    HttpResponse,
+    HttpRequestHeader,
+    HttpResponseHeader,
+    HttpFullRequest,
+    HttpFullResponse,
+)
 from firegex.nfproxy.internals.data import RawPacket
 from enum import Enum
 
@@ -17,15 +29,28 @@
         HttpResponse: HttpResponse._fetch_packet,
         HttpRequestHeader: HttpRequestHeader._fetch_packet,
         HttpResponseHeader: HttpResponseHeader._fetch_packet,
-    }
+        HttpFullRequest: HttpFullRequest._fetch_packet,
+        HttpFullResponse: HttpFullResponse._fetch_packet,
+    },
 }
 
+
 class Protocols(Enum):
     TCP = "tcp"
     HTTP = "http"
 
+
 __all__ = [
     "RawPacket",
-    "TCPInputStream", "TCPOutputStream", "TCPClientStream", "TCPServerStream",
-    "HttpRequest", "HttpResponse", "HttpRequestHeader", "HttpResponseHeader", "Protocols"
-]
+    "TCPInputStream",
+    "TCPOutputStream",
+    "TCPClientStream",
+    "TCPServerStream",
+    "HttpRequest",
+    "HttpResponse",
+    "HttpRequestHeader",
+    "HttpResponseHeader",
+    "HttpFullRequest",
+    "HttpFullResponse",
+    "Protocols",
+]

fgex-lib/firegex/nfproxy/models/http.py

@@ -73,6 +73,7 @@ class InternalCallbackHandler:
     messages: deque[InternalHTTPMessage] = deque()
     _ws_extentions = None
     _ws_raised_error = False
+    release_message_headers = True
 
     def reset_data(self):
         self.msg = InternalHTTPMessage()
@@ -604,6 +605,7 @@ def _fetch_packet(cls, internal_data: DataStreamCtx):
         if (
             not internal_data.call_mem["headers_were_set"]
             and parser.msg.headers_complete
+            and parser.release_message_headers
         ):
             messages_tosend.append(
                 parser.msg
@@ -641,7 +643,7 @@ def method(self) -> bytes:
 
     @staticmethod
     def _parser_class() -> str:
-        return "full_http"
+        return "http_module"
 
     def __repr__(self):
         return f"<HttpRequest method={self.method} url={self.url} headers={self.headers} body=[{0 if not self.body else len(self.body)} bytes] http_version={self.http_version} keep_alive={self.keep_alive} should_upgrade={self.should_upgrade} headers_complete={self.headers_complete} message_complete={self.message_complete} content_length={self.content_length} stream={self.stream} ws_stream={self.ws_stream}>"
@@ -664,12 +666,46 @@ def status_code(self) -> int:
 
     @staticmethod
     def _parser_class() -> str:
-        return "full_http"
+        return "http_module"
 
     def __repr__(self):
         return f"<HttpResponse status_code={self.status_code} url={self.url} headers={self.headers} body=[{0 if not self.body else len(self.body)} bytes] http_version={self.http_version} keep_alive={self.keep_alive} should_upgrade={self.should_upgrade} headers_complete={self.headers_complete} message_complete={self.message_complete} content_length={self.content_length} stream={self.stream} ws_stream={self.ws_stream}>"
 
 
+class HttpFullRequest(HttpRequest):
+    """
+    HTTP Request handler
+    This data handler will be called when the request data is complete
+    """
+
+    def _contructor_hook(self):
+        self._parser.release_message_headers = False
+
+    @staticmethod
+    def _parser_class() -> str:
+        return "http_full"
+
+    def __repr__(self):
+        return f"<HttpFullRequest method={self.method} url={self.url} headers={self.headers} body=[{0 if not self.body else len(self.body)} bytes] http_version={self.http_version} keep_alive={self.keep_alive} should_upgrade={self.should_upgrade} headers_complete={self.headers_complete} message_complete={self.message_complete} content_length={self.content_length} stream={self.stream} ws_stream={self.ws_stream}>"
+
+
+class HttpFullResponse(HttpResponse):
+    """
+    HTTP Response handler
+    This data handler will be called when the response data is complete
+    """
+
+    def _contructor_hook(self):
+        self._parser.release_message_headers = False
+
+    @staticmethod
+    def _parser_class() -> str:
+        return "http_full"
+
+    def __repr__(self):
+        return f"<HttpFullResponse status_code={self.status_code} url={self.url} headers={self.headers} body=[{0 if not self.body else len(self.body)} bytes] http_version={self.http_version} keep_alive={self.keep_alive} should_upgrade={self.should_upgrade} headers_complete={self.headers_complete} message_complete={self.message_complete} content_length={self.content_length} stream={self.stream} ws_stream={self.ws_stream}>"
+
+
 class HttpRequestHeader(HttpRequest):
     """
     HTTP Request Header handler
@@ -681,7 +717,7 @@ def _contructor_hook(self):
 
     @staticmethod
     def _parser_class() -> str:
-        return "header_http"
+        return "http_header"
 
 
 class HttpResponseHeader(HttpResponse):
@@ -695,4 +731,4 @@ def _contructor_hook(self):
 
     @staticmethod
     def _parser_class() -> str:
-        return "header_http"
+        return "http_header"