tests: http_server: add tests for dynamic response context

Add tests covering new method of providing a response for dynamic
resources.

Tests cover the application sending response codes and headers,
overriding "default" headers, and sending various combinations of
headers and body data. Each case is tested for HTTP1 & HTTP2, both POST
and GET methods.

Signed-off-by: Matt Rodgers <[email protected]>

Author: mrodgers-witekio

subsys/net/lib/http/http_server_http1.c

@@ -117,7 +117,8 @@ static int handle_http1_static_resource(
 	"Transfer-Encoding: chunked\r\n"
 
 static int http1_send_headers(struct http_client_ctx *client, enum http_status status,
-			      const struct http_header *headers, size_t header_count)
+			      const struct http_header *headers, size_t header_count,
+			      struct http_resource_detail_dynamic *dynamic_detail)
 {
 	int ret;
 	bool content_type_sent = false;
@@ -183,8 +184,8 @@ static int http1_send_headers(struct http_client_ctx *client, enum http_status s
 	if (!content_type_sent) {
 		const char *content_type = NULL;
 
-		if (client->current_detail != NULL) {
-			content_type = client->current_detail->content_type;
+		if (dynamic_detail != NULL) {
+			content_type = dynamic_detail->common.content_type;
 		}
 
 		snprintk(http_response, sizeof(http_response), "Content-Type: %s\r\n",
@@ -208,7 +209,8 @@ static int http1_send_headers(struct http_client_ctx *client, enum http_status s
 	return ret;
 }
 
-static int http1_dynamic_response(struct http_client_ctx *client, struct http_response_ctx *rsp)
+static int http1_dynamic_response(struct http_client_ctx *client, struct http_response_ctx *rsp,
+				  struct http_resource_detail_dynamic *dynamic_detail)
 {
 	int ret;
 	char tmp[TEMP_BUF_LEN];
@@ -224,7 +226,8 @@ static int http1_dynamic_response(struct http_client_ctx *client, struct http_re
 			rsp->status = 200;
 		}
 
-		ret = http1_send_headers(client, rsp->status, rsp->headers, rsp->header_count);
+		ret = http1_send_headers(client, rsp->status, rsp->headers, rsp->header_count,
+					 dynamic_detail);
 		if (ret < 0) {
 			return ret;
 		}
@@ -285,7 +288,7 @@ static int dynamic_get_req(struct http_resource_detail_dynamic *dynamic_detail,
 			return ret;
 		}
 
-		ret = http1_dynamic_response(client, &response_ctx);
+		ret = http1_dynamic_response(client, &response_ctx, dynamic_detail);
 		if (ret < 0) {
 			return ret;
 		}
@@ -324,7 +327,7 @@ static int dynamic_post_req(struct http_resource_detail_dynamic *dynamic_detail,
 	}
 
 	copy_len = MIN(remaining, dynamic_detail->data_buffer_len);
-	while (copy_len > 0) {
+	while (1) {
 		enum http_data_status status;
 
 		ptr = &start[offset];
@@ -347,14 +350,14 @@ static int dynamic_post_req(struct http_resource_detail_dynamic *dynamic_detail,
 		}
 
 		if (http_response_is_provided(&response_ctx)) {
-			ret = http1_dynamic_response(client, &response_ctx);
+			ret = http1_dynamic_response(client, &response_ctx, dynamic_detail);
 			if (ret < 0) {
 				return ret;
 			}
+		}
 
-			if (http_response_is_final(&response_ctx, status)) {
-				break;
-			}
+		if (http_response_is_final(&response_ctx, status)) {
+			break;
 		}
 
 		offset += copy_len;
@@ -366,7 +369,7 @@ static int dynamic_post_req(struct http_resource_detail_dynamic *dynamic_detail,
 	if (!client->http1_headers_sent) {
 		memset(&response_ctx, 0, sizeof(response_ctx));
 		response_ctx.final_chunk = true;
-		ret = http1_dynamic_response(client, &response_ctx);
+		ret = http1_dynamic_response(client, &response_ctx, dynamic_detail);
 		if (ret < 0) {
 			return ret;
 		}

subsys/net/lib/http/http_server_http2.c

@@ -178,7 +178,7 @@ static int send_headers_frame(struct http_client_ctx *client, enum http_status s
 
 	if (!content_encoding_sent && detail_common && detail_common->content_encoding != NULL) {
 		ret = add_header_field(client, &buf, &buflen, "content-encoding",
-				       "gzip");
+				       detail_common->content_encoding);
 		if (ret < 0) {
 			return ret;
 		}
@@ -488,7 +488,8 @@ static int handle_http2_static_fs_resource(struct http_resource_detail_static_fs
 }
 
 static int http2_dynamic_response(struct http_client_ctx *client, struct http2_frame *frame,
-				  struct http_response_ctx *rsp, enum http_data_status data_status)
+				  struct http_response_ctx *rsp, enum http_data_status data_status,
+				  struct http_resource_detail_dynamic *dynamic_detail)
 {
 	int ret;
 	uint8_t flags = 0;
@@ -522,8 +523,8 @@ static int http2_dynamic_response(struct http_client_ctx *client, struct http2_f
 		}
 
 		ret = send_headers_frame(client, rsp->status, frame->stream_identifier,
-					 client->current_detail, flags, rsp->headers,
-					 rsp->header_count);
+					 (struct http_resource_detail *)dynamic_detail, flags,
+					 rsp->headers, rsp->header_count);
 		if (ret < 0) {
 			return ret;
 		}
@@ -588,7 +589,7 @@ static int dynamic_get_req_v2(struct http_resource_detail_dynamic *dynamic_detai
 			return ret;
 		}
 
-		ret = http2_dynamic_response(client, frame, &response_ctx, status);
+		ret = http2_dynamic_response(client, frame, &response_ctx, status, dynamic_detail);
 		if (ret < 0) {
 			return ret;
 		}
@@ -660,7 +661,8 @@ static int dynamic_post_req_v2(struct http_resource_detail_dynamic *dynamic_deta
 		}
 
 		if (http_response_is_provided(&response_ctx)) {
-			ret = http2_dynamic_response(client, frame, &response_ctx, status);
+			ret = http2_dynamic_response(client, frame, &response_ctx, status,
+						     dynamic_detail);
 			if (ret < 0) {
 				return ret;
 			}
@@ -683,7 +685,7 @@ static int dynamic_post_req_v2(struct http_resource_detail_dynamic *dynamic_deta
 			memset(&response_ctx, 0, sizeof(response_ctx));
 			response_ctx.final_chunk = true;
 			ret = http2_dynamic_response(client, frame, &response_ctx,
-						     HTTP_SERVER_DATA_FINAL);
+						     HTTP_SERVER_DATA_FINAL, dynamic_detail);
 		}
 
 		if (ret < 0) {