fixed "Too much data for declared Content-Length" message (#63)

* fixed "Too much data for declared Content-Length" message

* lint

* .

CHANGELOG.md

@@ -4,6 +4,8 @@
 * sending unknown context features in a query is no longer an error
 * httpx is now a dev-dependency
 * Docker container now runs with a limited user
+### Fixed
+* returning 304 no longer logs an error "Too much data for declared Content-Length"
 ## 0.5.1
 ### Added
 * Added a generic handler for unhandled errors

heksher/main.py

@@ -1,7 +1,10 @@
 from logging import getLogger
 
+from fastapi import HTTPException
 from fastapi.exception_handlers import http_exception_handler
-from starlette.responses import JSONResponse
+from starlette.datastructures import MutableHeaders
+from starlette.requests import Request
+from starlette.responses import JSONResponse, Response
 
 from heksher._version import __version__
 from heksher.api.v1 import router as v1_router
@@ -42,6 +45,27 @@ async def handle_exception(request, exc):
     return await http_exception_handler(request, exc)
 
 
+@app.exception_handler(HTTPException)
+async def ret(request: Request, exc: HTTPException) -> Response:
+    # fastapi's default event handler is bugged (https://github.com/tiangolo/fastapi/issues/4946)
+    headers = getattr(exc, "headers", None)
+    if headers:
+        headers = MutableHeaders(headers)
+        del headers['content-length']
+        del headers['content-type']
+    if exc.status_code in {204, 304}:
+        if headers:
+            return Response(status_code=exc.status_code, headers=headers)
+        else:
+            return Response(status_code=exc.status_code)
+    if headers:
+        return JSONResponse(
+            {"detail": exc.detail}, status_code=exc.status_code, headers=headers
+        )
+    else:
+        return JSONResponse({"detail": exc.detail}, status_code=exc.status_code)
+
+
 def main():
     import uvicorn
 

tests/blackbox/app/test_v1api_rules.py

@@ -247,7 +247,7 @@ async def test_query_etag(app_client, setup_rules, metadata):
 
     assert repeat_resp.status_code == 304
     assert repeat_resp.headers['ETag'] == etag
-    assert repeat_resp.content == b'{"detail":"Not Modified"}'
+    assert not repeat_resp.content
 
 
 @mark.asyncio
@@ -284,7 +284,7 @@ async def test_query_etag_wildcard(app_client, setup_rules, metadata):
     }, headers={'If-None-Match': '*'})
 
     assert repeat_resp.status_code == 304
-    assert repeat_resp.content == b'{"detail":"Not Modified"}'
+    assert not repeat_resp.content
 
 
 @mark.asyncio