CDRIVER-4502: Handle int64 connectionId values in hello responses (#1121)

alcaeus · kevinAlbs · commit c9e0679f8297 · 2022-10-16T20:09:20.000-04:00
diff --git a/src/libmongoc/src/mongoc/mongoc-apm-private.h b/src/libmongoc/src/mongoc/mongoc-apm-private.h
@@ -56,7 +56,7 @@ struct _mongoc_apm_command_started_t {
    const mongoc_host_list_t *host;
    uint32_t server_id;
    bson_oid_t service_id;
-   int32_t server_connection_id;
+   int64_t server_connection_id;
    void *context;
 };
 
@@ -70,7 +70,7 @@ struct _mongoc_apm_command_succeeded_t {
    const mongoc_host_list_t *host;
    uint32_t server_id;
    bson_oid_t service_id;
-   int32_t server_connection_id;
+   int64_t server_connection_id;
    void *context;
 };
 
@@ -85,7 +85,7 @@ struct _mongoc_apm_command_failed_t {
    const mongoc_host_list_t *host;
    uint32_t server_id;
    bson_oid_t service_id;
-   int32_t server_connection_id;
+   int64_t server_connection_id;
    void *context;
 };
 
@@ -162,7 +162,7 @@ mongoc_apm_command_started_init (mongoc_apm_command_started_t *event,
                                  const mongoc_host_list_t *host,
                                  uint32_t server_id,
                                  const bson_oid_t *service_id,
-                                 int32_t server_connection_id,
+                                 int64_t server_connection_id,
                                  bool *is_redacted, /* out */
                                  void *context);
 
@@ -186,7 +186,7 @@ mongoc_apm_command_succeeded_init (mongoc_apm_command_succeeded_t *event,
                                    const mongoc_host_list_t *host,
                                    uint32_t server_id,
                                    const bson_oid_t *service_id,
-                                   int32_t server_connection_id,
+                                   int64_t server_connection_id,
                                    bool force_redaction,
                                    void *context);
 
@@ -204,7 +204,7 @@ mongoc_apm_command_failed_init (mongoc_apm_command_failed_t *event,
                                 const mongoc_host_list_t *host,
                                 uint32_t server_id,
                                 const bson_oid_t *service_id,
-                                int32_t server_connection_id,
+                                int64_t server_connection_id,
                                 bool force_redaction,
                                 void *context);
 
diff --git a/src/libmongoc/src/mongoc/mongoc-apm.c b/src/libmongoc/src/mongoc/mongoc-apm.c
@@ -77,7 +77,7 @@ mongoc_apm_command_started_init (mongoc_apm_command_started_t *event,
                                  const mongoc_host_list_t *host,
                                  uint32_t server_id,
                                  const bson_oid_t *service_id,
-                                 int32_t server_connection_id,
+                                 int64_t server_connection_id,
                                  bool *is_redacted, /* out */
                                  void *context)
 {
@@ -208,7 +208,7 @@ mongoc_apm_command_succeeded_init (mongoc_apm_command_succeeded_t *event,
                                    const mongoc_host_list_t *host,
                                    uint32_t server_id,
                                    const bson_oid_t *service_id,
-                                   int32_t server_connection_id,
+                                   int64_t server_connection_id,
                                    bool force_redaction,
                                    void *context)
 {
@@ -271,7 +271,7 @@ mongoc_apm_command_failed_init (mongoc_apm_command_failed_t *event,
                                 const mongoc_host_list_t *host,
                                 uint32_t server_id,
                                 const bson_oid_t *service_id,
-                                int32_t server_connection_id,
+                                int64_t server_connection_id,
                                 bool force_redaction,
                                 void *context)
 {
@@ -390,7 +390,12 @@ int32_t
 mongoc_apm_command_started_get_server_connection_id (
    const mongoc_apm_command_started_t *event)
 {
-   return event->server_connection_id;
+   if (event->server_connection_id > INT32_MAX ||
+       event->server_connection_id < INT32_MIN) {
+      return MONGOC_NO_SERVER_CONNECTION_ID;
+   }
+
+   return (int32_t) event->server_connection_id;
 }
 
 
@@ -477,7 +482,12 @@ int32_t
 mongoc_apm_command_succeeded_get_server_connection_id (
    const mongoc_apm_command_succeeded_t *event)
 {
-   return event->server_connection_id;
+   if (event->server_connection_id > INT32_MAX ||
+       event->server_connection_id < INT32_MIN) {
+      return MONGOC_NO_SERVER_CONNECTION_ID;
+   }
+
+   return (int32_t) event->server_connection_id;
 }
 
 
@@ -568,7 +578,12 @@ int32_t
 mongoc_apm_command_failed_get_server_connection_id (
    const mongoc_apm_command_failed_t *event)
 {
-   return event->server_connection_id;
+   if (event->server_connection_id > INT32_MAX ||
+       event->server_connection_id < INT32_MIN) {
+      return MONGOC_NO_SERVER_CONNECTION_ID;
+   }
+
+   return (int32_t) event->server_connection_id;
 }
 
 
diff --git a/src/libmongoc/src/mongoc/mongoc-server-description-private.h b/src/libmongoc/src/mongoc/mongoc-server-description-private.h
@@ -125,7 +125,7 @@ struct _mongoc_server_description_t {
     * service IDs. The only server generation is mapped from kZeroServiceID */
    mongoc_generation_map_t *_generation_map_;
    bson_oid_t service_id;
-   int32_t server_connection_id;
+   int64_t server_connection_id;
 };
 
 /** Get a mutable pointer to the server's generation map */
diff --git a/src/libmongoc/src/mongoc/mongoc-server-description.c b/src/libmongoc/src/mongoc/mongoc-server-description.c
@@ -740,9 +740,9 @@ mongoc_server_description_handle_hello (mongoc_server_description_t *sd,
             goto failure;
          bson_oid_copy_unsafe (bson_iter_oid (&iter), &sd->service_id);
       } else if (strcmp ("connectionId", bson_iter_key (&iter)) == 0) {
-         if (!BSON_ITER_HOLDS_INT32 (&iter))
+         if (!BSON_ITER_HOLDS_INT (&iter))
             goto failure;
-         sd->server_connection_id = bson_iter_int32 (&iter);
+         sd->server_connection_id = bson_iter_as_int64 (&iter);
       }
    }
 
diff --git a/src/libmongoc/tests/test-mongoc-server-description.c b/src/libmongoc/tests/test-mongoc-server-description.c
@@ -381,6 +381,42 @@ test_server_description_legacy_hello_ok (void)
    bson_destroy (&hello_response);
 }
 
+static void
+test_server_description_connection_id (void)
+{
+   mongoc_server_description_t sd;
+   bson_t *hello;
+   bson_error_t error;
+
+   mongoc_server_description_init (&sd, "host:1234", 1);
+   hello = BCON_NEW ("minWireVersion",
+                     BCON_INT32 (WIRE_VERSION_MIN),
+                     "maxWireVersion",
+                     BCON_INT32 (WIRE_VERSION_MAX),
+                     "connectionId",
+                     BCON_INT32 (1));
+   memset (&error, 0, sizeof (bson_error_t));
+   mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
+   BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
+   BSON_ASSERT (sd.server_connection_id == 1);
+
+   mongoc_server_description_reset (&sd);
+   bson_destroy (hello);
+   hello = BCON_NEW ("minWireVersion",
+                     BCON_INT32 (WIRE_VERSION_MIN),
+                     "maxWireVersion",
+                     BCON_INT32 (WIRE_VERSION_MAX),
+                     "connectionId",
+                     BCON_INT64 (1));
+   memset (&error, 0, sizeof (bson_error_t));
+   mongoc_server_description_handle_hello (&sd, hello, 0 /* rtt */, &error);
+   BSON_ASSERT (sd.type == MONGOC_SERVER_STANDALONE);
+   BSON_ASSERT (sd.server_connection_id == 1);
+
+   bson_destroy (hello);
+   mongoc_server_description_cleanup (&sd);
+}
+
 void
 test_server_description_install (TestSuite *suite)
 {
@@ -403,4 +439,7 @@ test_server_description_install (TestSuite *suite)
    TestSuite_Add (suite,
                   "/server_description/legacy_hello_ok",
                   test_server_description_legacy_hello_ok);
+   TestSuite_Add (suite,
+                  "/server_description/connection_id",
+                  test_server_description_connection_id);
 }
diff --git a/src/libmongoc/tests/unified/entity-map.h b/src/libmongoc/tests/unified/entity-map.h
@@ -30,7 +30,7 @@ typedef struct _event_t {
    bson_t *command;
    bson_t *reply;
    bson_oid_t service_id;
-   int32_t server_connection_id;
+   int64_t server_connection_id;
    struct _event_t *next;
 } event_t;
 
diff --git a/src/libmongoc/tests/unified/runner.c b/src/libmongoc/tests/unified/runner.c
@@ -1145,7 +1145,7 @@ test_check_event (test_t *test,
       }
 
       if (!*expected_has_server_connection_id && has_server_connection_id) {
-         test_error ("expected no server connectionId, but got %d",
+         test_error ("expected no server connectionId, but got %" PRId64,
                      actual->server_connection_id);
       }
    }

Original file line number	Diff line number	Diff line change
`@@ -740,9 +740,9 @@ mongoc_server_description_handle_hello (mongoc_server_description_t *sd,`
`740`	`740`	`goto failure;`
`741`	`741`	`bson_oid_copy_unsafe (bson_iter_oid (&iter), &sd->service_id);`
`742`	`742`	`} else if (strcmp ("connectionId", bson_iter_key (&iter)) == 0) {`
`743`		`- if (!BSON_ITER_HOLDS_INT32 (&iter))`
	`743`	`+ if (!BSON_ITER_HOLDS_INT (&iter))`
`744`	`744`	`goto failure;`
`745`		`- sd->server_connection_id = bson_iter_int32 (&iter);`
	`745`	`+ sd->server_connection_id = bson_iter_as_int64 (&iter);`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`
Original file line number	Diff line number	Diff line change
`@@ -1145,7 +1145,7 @@ test_check_event (test_t *test,`
`1145`	`1145`	`}`
`1146`	`1146`
`1147`	`1147`	`if (!*expected_has_server_connection_id && has_server_connection_id) {`
`1148`		`- test_error ("expected no server connectionId, but got %d",`
	`1148`	`+ test_error ("expected no server connectionId, but got %" PRId64,`
`1149`	`1149`	`actual->server_connection_id);`
`1150`	`1150`	`}`
`1151`	`1151`	`}`