Load HTTP request str fields

Author: fantix

nginx/http/http.pyx

@@ -1,5 +1,5 @@
 from cpython cimport Py_INCREF, Py_DECREF
-from .nginx_core cimport ngx_log_error, NGX_LOG_CRIT, NGX_AGAIN
+from .nginx_core cimport ngx_log_error, NGX_LOG_CRIT, NGX_AGAIN, from_nginx_str
 from .ngx_http cimport ngx_http_request_t, ngx_http_core_run_phases
 from .ngx_http cimport ngx_http_get_module_ctx, ngx_http_set_ctx
 
@@ -11,6 +11,13 @@ cdef class Request:
         ngx_http_request_t *request
         public Log log
         object future
+        public str request_line
+        public str uri
+        public str args
+        public str extension
+        public str unparsed_uri
+        public str method_name
+        public str http_protocol
 
     def __init__(self, *args):
         raise NotImplementedError
@@ -30,6 +37,18 @@ cdef class Request:
             return self.future.result()
         return NGX_AGAIN
 
+    def __repr__(self):
+        return f'Request({self.method_name} {self.uri})'
+
+    def __str__(self):
+        return f''' request_line: {self.request_line}
+          uri: {self.uri}
+         args: {self.args}
+    extension: {self.extension}
+ unparsed_uri: {self.unparsed_uri}
+  method_name: {self.method_name}
+http_protocol: {self.http_protocol}'''
+
     @staticmethod
     cdef Request from_ptr(ngx_http_request_t *request):
         cdef:
@@ -40,6 +59,15 @@ cdef class Request:
             new_req = Request.__new__(Request)
             new_req.request = request
             new_req.log = Log.from_ptr(request.connection.log)
+
+            new_req.request_line = from_nginx_str(request.request_line)
+            new_req.uri = from_nginx_str(request.uri)
+            new_req.args = from_nginx_str(request.args)
+            new_req.extension = from_nginx_str(request.exten)
+            new_req.unparsed_uri = from_nginx_str(request.unparsed_uri)
+            new_req.method_name = from_nginx_str(request.method_name)
+            new_req.http_protocol = from_nginx_str(request.http_protocol)
+
             ngx_http_set_ctx(request, <void *>new_req, ngx_python_module)
             return new_req
         else:

nginx/http/module.py

@@ -18,7 +18,7 @@ def post_read(self, request):
             log.debug('post_read end')
             return request._result()
         else:
-            log.debug('post_read start')
+            log.debug('post_read request:\n%s', request)
             return request._start(self.loop.create_task(self._handle(request)))
 
     async def _handle(self, request):

nginx/nginx_core.pxd

@@ -1,5 +1,8 @@
+from cpython.bytes cimport PyBytes_FromStringAndSize
+
 from .nginx_config cimport ngx_int_t, ngx_uint_t
 
+
 cdef extern from "ngx_core.h":
     const ngx_int_t NGX_OK
     const ngx_int_t NGX_ERROR
@@ -18,6 +21,10 @@ cdef extern from "ngx_core.h":
     ctypedef int ngx_err_t
     ctypedef int ngx_msec_t
 
+    ctypedef struct ngx_str_t:
+        size_t len
+        char *data
+
     ctypedef struct ngx_module_t:
         pass
 
@@ -37,3 +44,8 @@ cdef extern from "ngx_core.h":
                        ngx_log_t *log,
                        ngx_err_t err,
                        const char *fmt)
+
+
+cdef inline str from_nginx_str(ngx_str_t str):
+    return PyBytes_FromStringAndSize(<char*>str.data,
+                                     str.len).decode('iso-8859-1')

nginx/ngx_http.pxd

@@ -1,4 +1,4 @@
-from .nginx_core cimport ngx_module_t, ngx_log_t
+from .nginx_core cimport ngx_str_t, ngx_module_t, ngx_log_t
 
 
 cdef extern from "ngx_http.h":
@@ -7,6 +7,13 @@ cdef extern from "ngx_http.h":
 
     ctypedef struct ngx_http_request_t:
         ngx_connection_t *connection
+        ngx_str_t request_line
+        ngx_str_t uri
+        ngx_str_t args
+        ngx_str_t exten
+        ngx_str_t unparsed_uri
+        ngx_str_t method_name
+        ngx_str_t http_protocol
 
     void ngx_http_core_run_phases(ngx_http_request_t *request)
     void *ngx_http_get_module_ctx(ngx_http_request_t *request,