refactor: Small improvement on how content-length and transfer encodi…

…ng are set to the response headers
serverpod · Jan 3, 2025 · 135bea5 · 135bea5
1 parent 5f66712
commit 135bea5
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 17 deletions.
diff --git a/lib/src/extensions/http_response_extension.dart b/lib/src/extensions/http_response_extension.dart
@@ -38,8 +38,6 @@ extension HttpResponseExtension on io.HttpResponse {
         statusCode != 204 &&
         // 304 is not modified
         statusCode != 304 &&
-        // If the content length is not known, chunked encoding is applied.
-        body.contentLength == null &&
         // If the content type is not multipart/byteranges, chunked encoding is applied.
         !isMultipartByteranges;
 
@@ -52,20 +50,21 @@ extension HttpResponseExtension on io.HttpResponse {
       isChunked = true;
     }
 
-    if (isChunked) {
-      // Remove conflicting 'identity' encoding if present.
-      encodings.removeWhere((e) => e.name == TransferEncoding.identity.name);
-
-      // Set Transfer-Encoding header and remove Content-Length as it is not needed for chunked encoding.
-      responseHeaders
-        ..set(
-          Headers.transferEncodingHeader,
-          encodings.map((e) => e.name).toList(),
-        )
-        ..removeAll(Headers.contentLengthHeader);
-    } else {
-      // Set Content-Length if chunked encoding is not enabled.
-      responseHeaders.contentLength = contentLength ?? 0;
+    if (!isChunked) {
+      // Set Content-Length to 0 if chunked encoding is not enabled.
+      responseHeaders.contentLength = 0;
+      return;
     }
+
+    // Remove conflicting 'identity' encoding if present.
+    encodings.removeWhere((e) => e.name == TransferEncoding.identity.name);
+
+    // Set Transfer-Encoding header and remove Content-Length as it is not needed for chunked encoding.
+    responseHeaders
+      ..set(
+        Headers.transferEncodingHeader,
+        encodings.map((e) => e.name).toList(),
+      )
+      ..removeAll(Headers.contentLengthHeader);
   }
 }
diff --git a/test/message/body_test.dart b/test/message/body_test.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 import 'dart:typed_data';
 
@@ -159,6 +160,45 @@ void main() {
       expect(response.headers['transfer-encoding'], isNull);
       expect(response.bodyBytes, equals([1, 2, 3, 4]));
     });
+
+    test(
+      'with an unknown content length and chunked encoding '
+      'then content-length should be set to 0 and it should throw an HttpException '
+      'with a message that states the content size exceeds the specified contentLength',
+      () async {
+        Completer<Object?> completer = Completer();
+
+        unawaited(runZonedGuarded(
+          () async {
+            await _scheduleServer(
+              (_) => Response.ok(
+                body: Body.fromDataStream(
+                  Stream.fromIterable([
+                    Uint8List.fromList([1, 2, 3, 4])
+                  ]),
+                  mimeType: MimeType.multipartByteranges,
+                ),
+                headers: Headers.response(),
+              ),
+            );
+
+            await _get();
+          },
+          (error, stackTrace) {
+            if (completer.isCompleted) return;
+            completer.complete(error);
+          },
+        ));
+
+        var error = await completer.future;
+
+        expect(error, isA<HttpException>());
+        expect(
+          error.toString(),
+          contains('Content size exceeds specified contentLength'),
+        );
+      },
+    );
   });
 }
 
@@ -173,7 +213,7 @@ Future<void> _scheduleServer(
   assert(_server == null);
   _server = await relic_server.serve(
     handler,
-    'localhost',
+    RelicAddress.fromHostname('localhost'),
     0,
     securityContext: securityContext,
   );