drop Transfer-Encoding header from proxies response

Author: whummer

aws-replicator/aws_replicator/client/auth_proxy.py

@@ -16,7 +16,6 @@
 from botocore.model import OperationModel
 from localstack import config
 from localstack import config as localstack_config
-from localstack.aws.api import HttpRequest
 from localstack.aws.chain import HandlerChain
 from localstack.aws.chain import RequestContext as AwsRequestContext
 from localstack.aws.gateway import Gateway
@@ -45,8 +44,6 @@
 from aws_replicator.config import HANDLER_PATH_PROXIES
 from aws_replicator.shared.models import AddProxyRequest, ProxyConfig
 
-from .http2_server import run_server
-
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.INFO)
 if config.DEBUG:
@@ -218,7 +215,7 @@ def _adjust_request_dict(self, service_name: str, request_dict: Dict):
                 req_json["QueueOwnerAWSAccountId"] = account_id
                 request_dict["body"] = to_bytes(json.dumps(req_json))
 
-    def _fix_headers(self, request: HttpRequest, service_name: str):
+    def _fix_headers(self, request: Request, service_name: str):
         if service_name == "s3":
             # fix the Host header, to avoid bucket addressing issues
             host = request.headers.get("Host") or ""
@@ -543,8 +540,7 @@ def start_aws_auth_proxy_in_container(
     command = [
         "bash",
         "-c",
-        # TODO: manually installing quart/h11/hypercorn as a dirty quick fix for now. To be fixed!
-        f"{venv_activate}; pip install h11 hypercorn quart; pip install --upgrade --no-deps '{CLI_PIP_PACKAGE}'",
+        f"{venv_activate}; pip install --upgrade --no-deps '{CLI_PIP_PACKAGE}'",
     ]
     DOCKER_CLIENT.exec_in_container(container_name, command=command)
 

aws-replicator/aws_replicator/server/aws_request_forwarder.py

@@ -43,15 +43,12 @@ def __call__(self, chain: HandlerChain, context: RequestContext, response: Respo
         if response_ is None:
             return
 
-        response.update_from(response_)
-        chain.stop()
+        # Remove `Transfer-Encoding` header (which could be set to 'chunked'), to prevent client timeouts
+        response_.headers.pop("Transfer-Encoding", None)
 
         # set response details, then stop handler chain to return response
-        # chain.response.data = response.raw_content
-        # chain.response.status_code = response.status_code
-        # chain.response.headers.update(dict(response.headers))
-        # chain.stop()
-        # chain.respond(response.status_code, response.raw_content, dict(response.headers))
+        response.update_from(response_)
+        chain.stop()
 
     def select_proxy(self, context: RequestContext) -> Optional[ProxyInstance]:
         """select a proxy responsible to forward a request to real AWS"""
@@ -141,7 +138,7 @@ def forward_request(self, context: RequestContext, proxy: ProxyInstance) -> requ
                 response.headers,
                 response.data,
             )
-        except Exception as e:
+        except Exception:
             LOG.exception("Exception while forwarding request")
             raise
 
@@ -177,7 +174,7 @@ def forward_request(self, context: RequestContext, proxy: ProxyInstance) -> requ
                 dict(result.headers),
                 truncate(result.raw_content, max_length=500),
             )
-        except requests.exceptions.ConnectionError as e:
+        except requests.exceptions.ConnectionError:
             # remove unreachable proxy
             LOG.exception("Removing unreachable AWS forward proxy due to connection issue: %s", url)
             self.PROXY_INSTANCES.pop(port, None)