merge from master

frontend/src/views/inspector/FlowList.vue

@@ -462,7 +462,6 @@ export default {
 .flow-list-item-url {
   display: inline-block;
   word-break: keep-all;
-  max-width: 840px;
   width: calc(100% - 50px);
   white-space: nowrap;
   overflow: hidden;

lyrebird/mock/handlers/handler_context.py

@@ -44,6 +44,8 @@ def __init__(self, request):
                 'headers': utils.CaseInsensitiveDict({})
             })
         })
+        self.request_chain = []
+        self.response_chain = []
         self.client_address = None
         self.is_request_edited = False
         self.is_response_edited = False
@@ -83,7 +85,7 @@ def _parse_request(self):
 
         # handle request data
         if self.request.method in ['POST', 'PUT']:
-            DataHelper.origin2flow(self.request, output=_request)
+            DataHelper.origin2flow(self.request, output=_request, chain=self.request_chain)
 
         if self.request.headers.get('Lyrebird-Client-Address'):
             self.client_address = self.request.headers.get('Lyrebird-Client-Address')
@@ -164,15 +166,17 @@ def set_response_source_proxy(self):
 
     def get_request_body(self):
         if self.is_request_edited:
-            self.flow['request']['headers'] = HeadersHelper.flow2origin(self.flow['request'])
-            _data = DataHelper.flow2origin(self.flow['request'])
+            # TODO Repeated calls, remove it
+            self.flow['request']['headers'] = HeadersHelper.flow2origin(self.flow['request'], chain=self.request_chain)
+
+            _data = DataHelper.flow2origin(self.flow['request'], chain=self.request_chain)
         else:
             _data = self.request.data or self.request.form or None
         return _data
 
     def get_request_headers(self):
         if self.is_request_edited:
-            self.flow['request']['headers'] = HeadersHelper.flow2origin(self.flow['request'])
+            self.flow['request']['headers'] = HeadersHelper.flow2origin(self.flow['request'], chain=self.request_chain)
 
         headers = {}
         unproxy_headers = application.config.get('proxy.ignored_headers', {})
@@ -186,7 +190,7 @@ def get_request_headers(self):
 
     def get_response_generator(self):
         if self.is_response_edited:
-            self.flow['response']['headers'] = HeadersHelper.flow2origin(self.flow['response'])
+            self.flow['response']['headers'] = HeadersHelper.flow2origin(self.flow['response'], chain=self.response_chain)
             _generator = self._generator_bytes()
         else:
             _generator = self._generator_stream()
@@ -195,7 +199,7 @@ def get_response_generator(self):
     def _generator_bytes(self):
         def generator():
             try:
-                _resp_data = DataHelper.flow2origin(self.flow['response']) or ''
+                _resp_data = DataHelper.flow2origin(self.flow['response'], chain=self.response_chain) or ''
                 length = len(_resp_data)
                 size = self.response_chunk_size
                 bandwidth = config.bandwidth
@@ -228,7 +232,7 @@ def generator():
                     yield item
             finally:
                 self.response.data = b''.join(buffer)
-                DataHelper.origin2flow(self.response, output=self.flow['response'])
+                DataHelper.origin2flow(self.response, output=self.flow['response'], chain=self.response_chain)
 
                 self.update_client_resp_time()
                 upstream.close()
@@ -242,7 +246,7 @@ def update_response_headers_code2flow(self, output_key='response'):
         HeadersHelper.origin2flow(self.response, output=self.flow[output_key])
 
     def update_response_data2flow(self, output_key='response'):
-        DataHelper.origin2flow(self.response, output=self.flow[output_key])
+        DataHelper.origin2flow(self.response, output=self.flow[output_key], chain=self.response_chain)
 
     def update_client_req_time(self):
         self.client_req_time = time.time()

lyrebird/mock/handlers/http_data_helper/__init__.py

@@ -17,7 +17,7 @@
 class DataHelper:
 
     @staticmethod
-    def origin2flow(origin_obj, output=None):
+    def origin2flow(origin_obj, output=None, chain=None):
         if not origin_obj:
             return
 
@@ -34,22 +34,26 @@ def origin2flow(origin_obj, output=None):
 
         for headers_key, func in origin2flow_handlers.items():
             headers_val = raw_headers.get(headers_key, '')
-            _data = func.origin2flow(headers_val, _data)
+            _data = func.origin2flow(headers_val, _data, chain=chain)
 
         if output:
             output['data'] = _data
         else:
             return _data
 
     @staticmethod
-    def flow2origin(flow_obj, output=None):
+    def flow2origin(flow_obj, output=None, chain=None):
         _data = flow_obj.get('data')
-        if not _data:
+        if _data is None:
             return
 
-        for headers_key, func in flow2origin_handlers.items():
-            headers_val = flow_obj['headers'].get(headers_key, '')
-            _data = func.flow2origin(headers_val, _data)
+        if chain:
+            for func in chain[::-1]:
+                _data = func.flow2origin(_data)
+        else:
+            for headers_key, func in flow2origin_handlers.items():
+                headers_val = flow_obj['headers'].get(headers_key, '')
+                _data = func.flow2origin(headers_val, _data)
 
         if output:
             output.data = _data

lyrebird/mock/handlers/http_data_helper/content_encoding/__init__.py

@@ -13,13 +13,17 @@ def _get_matched_action(content_encoding_name):
         return content_encoding_handlers[content_encoding_name]
     return DefaultHandler
 
-def origin2flow(content_encoding, request_data):
+def origin2flow(content_encoding, request_data, chain=None):
     func = _get_matched_action(content_encoding)
     try:
         _data = func.origin2flow(request_data)
     except Exception as e:
-        _data = DefaultHandler.origin2flow(request_data)
+        func = DefaultHandler
+        _data = func.origin2flow(request_data)
         logger.warning(f'Convert Content-Encoding: {content_encoding} data origin2flow failed! {e}')
+    finally:
+        chain.append(func)
+
     return _data
 
 def flow2origin(content_encoding, flow_data):

lyrebird/mock/handlers/http_data_helper/content_type/__init__.py

@@ -18,13 +18,17 @@ def _get_matched_action(content_type):
             return func
     return DefaultHandler
 
-def origin2flow(content_type, request_data):
+def origin2flow(content_type, request_data, chain=None):
     func = _get_matched_action(content_type)
     try:
         _data = func.origin2flow(request_data)
     except Exception as e:
-        _data = DefaultHandler.origin2flow(request_data)
+        func = DefaultHandler
+        _data = func.origin2flow(request_data)
         logger.warning(f'Convert Content-Type: {content_type} data origin2flow failed! {e}')
+    finally:
+        chain.append(func)
+
     return _data
 
 def flow2origin(content_type, flow_data):

lyrebird/mock/handlers/http_header_helper/__init__.py

@@ -29,13 +29,13 @@ def origin2flow(origin_obj, output=None):
             return _headers
 
     @staticmethod
-    def flow2origin(flow_obj, output=None):
+    def flow2origin(flow_obj, output=None, chain=None):
         _headers = flow_obj.get('headers')
         if not _headers:
             return
 
         for headers_key, func in flow2origin_handlers.items():
-            _headers[headers_key] = func.flow2origin(flow_obj)
+            _headers[headers_key] = func.flow2origin(flow_obj, chain=chain)
 
         if output:
             output.headers = _headers

lyrebird/mock/handlers/http_header_helper/content_length.py

@@ -11,8 +11,8 @@ def origin2flow(origin_obj):
         return str(len(_resp_data))
 
     @staticmethod
-    def flow2origin(flow_obj):
-        _resp_data = DataHelper.flow2origin(flow_obj)
+    def flow2origin(flow_obj, chain=None):
+        _resp_data = DataHelper.flow2origin(flow_obj, chain=chain)
         if not _resp_data:
             return '0'
         return str(len(_resp_data))

lyrebird/utils.py

@@ -147,7 +147,7 @@ def render(data):
     }
 
     try:
-        template_data = Template(data)
+        template_data = Template(data, keep_trailing_newline=True)
         return template_data.render(params)
     except Exception:
         logger.error(f'Format error!\n {traceback.format_exc()}')