in_http: add application/msgpack for http2.

Signed-off-by: Phillip Whelan <[email protected]>
fluent · Sep 30, 2024 · 760ddbb · 760ddbb
1 parent 7ec4d69
commit 760ddbb
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 1 deletion.
diff --git a/plugins/in_http/http_prot.c b/plugins/in_http/http_prot.c
@@ -1023,6 +1023,10 @@ static int process_payload_ng(flb_sds_t tag,
         type = HTTP_CONTENT_URLENCODED;
     }
 
+    if (strcasecmp(request->content_type, "application/msgpack") == 0) {
+        type = HTTP_CONTENT_MSGPACK;
+    }
+
     if (type == -1) {
         send_response_ng(response, 400, "error: invalid 'Content-Type'\n");
         return -1;
@@ -1044,6 +1048,13 @@ static int process_payload_ng(flb_sds_t tag,
             return parse_payload_urlencoded(ctx, tag, payload, cfl_sds_len(payload));
         }
     }
+    else if (type == HTTP_CONTENT_MSGPACK) {
+        ctx = (struct flb_http *) request->stream->user_data;
+        payload = (char *) request->body;
+        if (payload) {
+            return parse_payload_msgpack(ctx, tag, payload, cfl_sds_len(payload));
+        }
+    }
 
     return 0;
 }

diff --git a/tests/runtime/in_http.c b/tests/runtime/in_http.c
@@ -280,7 +280,7 @@ void flb_test_http()
     test_ctx_destroy(ctx);
 }
 
-void flb_test_msgpack()
+void flb_test_msgpack_legacy()
 {
     struct flb_lib_out_cb cb_data;
     struct test_ctx *ctx;
@@ -354,6 +354,78 @@ void flb_test_msgpack()
     test_ctx_destroy(ctx);
 }
 
+void flb_test_msgpack()
+{
+    struct flb_lib_out_cb cb_data;
+    struct test_ctx *ctx;
+    struct flb_http_client *c;
+    int ret;
+    int num;
+    size_t b_sent;
+    char buf[] = "\xdd\x00\x00\x00\x02\xdd\x00\x00"
+                "\x00\x02\xd7\x00\x65\xd3\x9c\x63"
+                "\x19\x36\xb8\xd5\x80\x81\xa7\x6d"
+                "\x65\x73\x73\x61\x67\x65\xa5\x64"
+                "\x75\x6d\x6d\x79\xbe";
+
+
+    clear_output_num();
+
+    cb_data.cb = cb_check_result_json;
+    cb_data.data = "\"message\":\"dummy\"";
+
+    ctx = test_ctx_create(&cb_data);
+    if (!TEST_CHECK(ctx != NULL)) {
+        TEST_MSG("test_ctx_create failed");
+        exit(EXIT_FAILURE);
+    }
+
+    ret = flb_output_set(ctx->flb, ctx->o_ffd,
+                         "match", "*",
+                         "format", "json",
+                         NULL);
+    TEST_CHECK(ret == 0);
+
+    /* Start the engine */
+    ret = flb_start(ctx->flb);
+    TEST_CHECK(ret == 0);
+
+    ctx->httpc = http_client_ctx_create();
+    TEST_CHECK(ctx->httpc != NULL);
+
+    c = flb_http_client(ctx->httpc->u_conn, FLB_HTTP_POST, "/", buf, sizeof(buf),
+                        "127.0.0.1", 9880, NULL, 0);
+    ret = flb_http_add_header(c, FLB_HTTP_HEADER_CONTENT_TYPE, strlen(FLB_HTTP_HEADER_CONTENT_TYPE),
+                              MSGPACK_CONTENT_TYPE, strlen(MSGPACK_CONTENT_TYPE));
+    TEST_CHECK(ret == 0);
+    if (!TEST_CHECK(c != NULL)) {
+        TEST_MSG("http_client failed");
+        exit(EXIT_FAILURE);
+    }
+
+    ret = flb_http_do(c, &b_sent);
+    if (!TEST_CHECK(ret == 0)) {
+        TEST_MSG("ret error. ret=%d\n", ret);
+    }
+    else if (!TEST_CHECK(b_sent > 0)){
+        TEST_MSG("b_sent size error. b_sent = %lu\n", b_sent);
+    }
+    else if (!TEST_CHECK(c->resp.status == 201)) {
+        TEST_MSG("http response code error. expect: 201, got: %d\n", c->resp.status);
+    }
+
+    /* waiting to flush */
+    flb_time_msleep(1500);
+
+    num = get_output_num();
+    if (!TEST_CHECK(num > 0))  {
+        TEST_MSG("no outputs");
+    }
+    flb_http_client_destroy(c);
+    flb_upstream_conn_release(ctx->httpc->u_conn);
+    test_ctx_destroy(ctx);
+}
+
 void flb_test_http_successful_response_code(char *response_code)
 {
     struct flb_lib_out_cb cb_data;
@@ -738,6 +810,7 @@ void flb_test_http_tag_key()
 
 TEST_LIST = {
     {"http", flb_test_http},
+    {"msgpack_legacy", flb_test_msgpack_legacy},
     {"msgpack", flb_test_msgpack},
     {"successful_response_code_200", flb_test_http_successful_response_code_200},
     {"successful_response_code_204", flb_test_http_successful_response_code_204},