back out bulkwrite changes

mdb-ad · mdb-ad · commit 5ede743ef2ab · 2025-05-01T11:39:55.000-07:00
diff --git a/src/libmongoc/src/mongoc/mongoc-bulkwrite.c b/src/libmongoc/src/mongoc/mongoc-bulkwrite.c
@@ -1561,6 +1561,15 @@ mongoc_bulkwrite_execute (mongoc_bulkwrite_t *self, const mongoc_bulkwriteopts_t
       goto fail;
    }
 
+   if (_mongoc_cse_is_enabled (self->client)) {
+      _mongoc_set_error (&error,
+                         MONGOC_ERROR_COMMAND,
+                         MONGOC_ERROR_COMMAND_INVALID_ARG,
+                         "bulkWrite does not currently support automatic encryption");
+      _bulkwriteexception_set_error (ret.exc, &error);
+      goto fail;
+   }
+
    const mongoc_ss_log_context_t ss_log_context = {
       .operation = "bulkWrite", .has_operation_id = true, .operation_id = self->operation_id};
 
@@ -1686,11 +1695,8 @@ mongoc_bulkwrite_execute (mongoc_bulkwrite_t *self, const mongoc_bulkwriteopts_t
       }
    }
 
-   const int32_t maxWriteBatchSize = mongoc_server_stream_max_write_batch_size (ss);
+   int32_t maxWriteBatchSize = mongoc_server_stream_max_write_batch_size (ss);
    int32_t maxMessageSizeBytes = mongoc_server_stream_max_msg_size (ss);
-   if (_mongoc_cse_is_enabled (self->client)) {
-      maxMessageSizeBytes = MONGOC_REDUCED_MAX_MSG_SIZE_FOR_FLE;
-   }
    // `ops_doc_offset` is an offset into the `ops` document sequence. Counts the number of documents sent.
    size_t ops_doc_offset = 0;
    // `ops_byte_offset` is an offset into the `ops` document sequence. Counts the number of bytes sent.
diff --git a/src/libmongoc/src/mongoc/mongoc-crypt.c b/src/libmongoc/src/mongoc/mongoc-crypt.c
@@ -310,9 +310,9 @@ _state_machine_destroy (_state_machine_t *state_machine)
    bson_free (state_machine);
 }
 
-/* State handler MONGOCRYPT_CTX_NEED_MONGO_COLLINFO{_WITH_DB} */
+/* State handler MONGOCRYPT_CTX_NEED_MONGO_COLLINFO */
 static bool
-_state_need_mongo_collinfo (_state_machine_t *state_machine, bool with_db, bson_error_t *error)
+_state_need_mongo_collinfo (_state_machine_t *state_machine, bson_error_t *error)
 {
    mongoc_database_t *db = NULL;
    mongoc_cursor_t *cursor = NULL;
@@ -336,13 +336,7 @@ _state_need_mongo_collinfo (_state_machine_t *state_machine, bool with_db, bson_
    }
 
    bson_append_document (&opts, "filter", -1, &filter_bson);
-   const char *db_name = with_db ? mongocrypt_ctx_mongo_db (state_machine->ctx) : state_machine->db_name;
-   if (!db_name) {
-      _ctx_check_error (state_machine->ctx, error, true);
-      goto fail;
-   }
-   db = mongoc_client_get_database (state_machine->collinfo_client, db_name);
-
+   db = mongoc_client_get_database (state_machine->collinfo_client, state_machine->db_name);
    cursor = mongoc_database_find_collections_with_opts (db, &opts);
    if (mongoc_cursor_error (cursor, error)) {
       goto fail;
@@ -1084,7 +1078,7 @@ _state_machine_run (_state_machine_t *state_machine, bson_t *result, bson_error_
          _ctx_check_error (state_machine->ctx, error, true);
          goto fail;
       case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO:
-         if (!_state_need_mongo_collinfo (state_machine, false, error)) {
+         if (!_state_need_mongo_collinfo (state_machine, error)) {
             goto fail;
          }
          break;
@@ -1118,9 +1112,12 @@ _state_machine_run (_state_machine_t *state_machine, bson_t *result, bson_error_
          goto success;
          break;
       case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB:
-         if (!_state_need_mongo_collinfo (state_machine, true, error)) {
-            goto fail;
-         }
+         _mongoc_set_error (error,
+                            MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION,
+                            MONGOC_ERROR_CLIENT_INVALID_ENCRYPTION_STATE,
+                            "MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB is "
+                            "unimplemented");
+         goto fail;
          break;
       }
    }
@@ -1403,8 +1400,6 @@ _mongoc_crypt_new (const bson_t *kms_providers,
    crypt->kmsid_to_tlsopts = mcd_mapof_kmsid_to_tlsopts_new ();
    crypt->handle = mongocrypt_new ();
    mongocrypt_setopt_retry_kms (crypt->handle, true);
-   mongocrypt_setopt_use_need_mongo_collinfo_with_db_state (crypt->handle);
-
    if (!mongocrypt_setopt_enable_multiple_collinfo (crypt->handle)) {
       _crypt_check_error (crypt->handle, error, true);
       goto fail;
diff --git a/src/libmongoc/tests/client_side_encryption_prose/limits-encryptedFields.json b/src/libmongoc/tests/client_side_encryption_prose/limits-encryptedFields.json
diff --git a/src/libmongoc/tests/client_side_encryption_prose/limits-qe-doc.json b/src/libmongoc/tests/client_side_encryption_prose/limits-qe-doc.json
diff --git a/src/libmongoc/tests/test-mongoc-client-side-encryption.c b/src/libmongoc/tests/test-mongoc-client-side-encryption.c
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-#include "TestSuite.h"
-#include "bson/bson.h"
 #include "json-test.h"
-#include <mongoc/mongoc.h>
-
 #include "test-libmongoc.h"
 
 #include <common-bson-dsl-private.h>
@@ -344,15 +340,14 @@ _command_started (const mongoc_apm_command_started_t *event)
    limits_apm_ctx_t *ctx;
 
    ctx = (limits_apm_ctx_t *) mongoc_apm_command_started_get_context (event);
-   const char *cmd_name = mongoc_apm_command_started_get_command_name (event);
-   if (0 == strcmp ("insert", cmd_name) || 0 == strcmp ("bulkWrite", cmd_name)) {
+   if (0 == strcmp ("insert", mongoc_apm_command_started_get_command_name (event))) {
       ctx->num_inserts++;
    }
 }
 
 /* Prose Test 4: BSON Size Limits and Batch Splitting */
 static void
-test_bson_size_limits_and_batch_splitting (bool with_qe)
+test_bson_size_limits_and_batch_splitting (void *unused)
 {
    /* Expect an insert of two documents over 2MiB to split into two inserts but
     * still succeed. */
@@ -375,6 +370,8 @@ test_bson_size_limits_and_batch_splitting (bool with_qe)
    const int exceeds_2mib_after_encryption = size_2mib - 2000;
    const int exceeds_16mib_after_encryption = size_16mib - 2000;
 
+   BSON_UNUSED (unused);
+
    /* Do the test setup. */
 
    /* Drop and create db.coll configured with limits-schema.json */
@@ -426,7 +423,6 @@ test_bson_size_limits_and_batch_splitting (bool with_qe)
    coll = mongoc_client_get_collection (client, "db", "coll");
    /* End of setup */
 
-   /* Case 1 */
    /* Insert { "_id": "over_2mib_under_16mib", "unencrypted": <the string "a"
     * repeated 2097152 times> } */
    docs[0] = BCON_NEW ("_id", "over_2mib_under_16mib");
@@ -445,23 +441,6 @@ test_bson_size_limits_and_batch_splitting (bool with_qe)
    ASSERT_OR_PRINT (mongoc_collection_insert_one (coll, docs[0], NULL /* opts */, NULL /* reply */, &error), error);
    bson_destroy (docs[0]);
 
-   /* Check that inserting close to, but not exceeding, 16MiB, passes */
-   docs[0] = bson_new ();
-   bson_append_utf8 (docs[0], "_id", -1, "under_16mib", -1);
-   bson_append_utf8 (docs[0], "unencrypted", -1, as, exceeds_16mib_after_encryption);
-   ASSERT_OR_PRINT (mongoc_collection_insert_one (coll, docs[0], NULL /* opts */, NULL /* reply */, &error), error);
-   bson_destroy (docs[0]);
-
-   /* but.. exceeding 16 MiB fails */
-   docs[0] = get_bson_from_json_file ("./src/libmongoc/tests/client_side_encryption_prose/limits-doc.json");
-   bson_append_utf8 (docs[0], "_id", -1, "under_16mib", -1);
-   bson_append_utf8 (docs[0], "unencrypted", -1, as, exceeds_16mib_after_encryption);
-   BSON_ASSERT (!mongoc_collection_insert_one (coll, docs[0], NULL /* opts */, NULL /* reply */, &error));
-   ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_SERVER, 2, "too large");
-   bson_destroy (docs[0]);
-
-   /* Case 2: collection bulkWrite */
-
    /* Insert two documents that each exceed 2MiB but no encryption occurs.
     * Expect the bulk write to succeed and run as two separate inserts.
     */
@@ -495,73 +474,20 @@ test_bson_size_limits_and_batch_splitting (bool with_qe)
    bson_destroy (docs[0]);
    bson_destroy (docs[1]);
 
-   if (with_qe) {
-      /* Case 3: client bulkWrite */
-      mongoc_bulkwriteopts_t *bw_opts = mongoc_bulkwriteopts_new ();
-      mongoc_bulkwriteopts_set_verboseresults (bw_opts, true);
+   /* Check that inserting close to, but not exceeding, 16MiB, passes */
+   docs[0] = bson_new ();
+   bson_append_utf8 (docs[0], "_id", -1, "under_16mib", -1);
+   bson_append_utf8 (docs[0], "unencrypted", -1, as, exceeds_16mib_after_encryption);
+   ASSERT_OR_PRINT (mongoc_collection_insert_one (coll, docs[0], NULL /* opts */, NULL /* reply */, &error), error);
+   bson_destroy (docs[0]);
 
-      bson_t *corpus_encryptedFields =
-         get_bson_from_json_file ("./src/libmongoc/tests/client_side_encryption_prose/limits-encryptedFields.json");
-      bson_t *coll_opts = BCON_NEW ("encryptedFields", BCON_DOCUMENT (corpus_encryptedFields));
-      mongoc_database_t *db = mongoc_client_get_database (client, "db");
-      (void) mongoc_collection_drop (coll, NULL);
-      // Create a newly named collection to avoid cached previous JSON Schema.
-      mongoc_collection_t *coll2 = mongoc_database_create_collection (db, "coll2", coll_opts, &error);
-      ASSERT_OR_PRINT (coll2, error);
-      mongoc_collection_destroy(coll2);
-
-      /* Insert two documents that each exceed 2MiB but no encryption occurs.
-       * Expect two separate bulkWrite commands.
-       */
-      docs[0] = BCON_NEW ("_id", "over_2mib_3");
-      bson_append_utf8 (docs[0], "unencrypted", -1, as, size_2mib - 1500);
-      docs[1] = BCON_NEW ("_id", "over_2mib_4");
-      bson_append_utf8 (docs[1], "unencrypted", -1, as, size_2mib - 1500);
-
-      ctx.num_inserts = 0;
-      mongoc_bulkwrite_t *bw = mongoc_client_bulkwrite_new (client);
-      ASSERT_OR_PRINT (mongoc_bulkwrite_append_insertone (bw, "db.coll2", docs[0], NULL, &error), error);
-      ASSERT_OR_PRINT (mongoc_bulkwrite_append_insertone (bw, "db.coll2", docs[1], NULL, &error), error);
-
-      mongoc_bulkwritereturn_t bwr = mongoc_bulkwrite_execute (bw, bw_opts);
-      ASSERT_NO_BULKWRITEEXCEPTION (bwr);
-      ASSERT_CMPINT (ctx.num_inserts, ==, 2);
-      bson_destroy (docs[0]);
-      bson_destroy (docs[1]);
-      mongoc_bulkwrite_destroy (bw);
-      mongoc_bulkwriteresult_destroy (bwr.res);
-      mongoc_bulkwriteexception_destroy (bwr.exc);
-
-      /* Insert two documents that each exceed 2MiB after encryption occurs. Expect
-       * the bulk write to succeed and run as two separate inserts.
-       */
-
-
-      docs[0] = get_bson_from_json_file ("./src/libmongoc/tests/client_side_encryption_prose/limits-qe-doc.json");
-      bson_append_utf8 (docs[0], "_id", -1, "encryption_exceeds_2mib_3", -1);
-      bson_append_utf8 (docs[0], "foo", -1, as, exceeds_2mib_after_encryption - 1500);
-      docs[1] = get_bson_from_json_file ("./src/libmongoc/tests/client_side_encryption_prose/limits-qe-doc.json");
-      bson_append_utf8 (docs[1], "_id", -1, "encryption_exceeds_2mib_4", -1);
-      bson_append_utf8 (docs[1], "foo", -1, as, exceeds_2mib_after_encryption - 1500);
-
-      ctx.num_inserts = 0;
-      bw = mongoc_client_bulkwrite_new (client);
-      ASSERT_OR_PRINT (mongoc_bulkwrite_append_insertone (bw, "db.coll2", docs[0], NULL, &error), error);
-      ASSERT_OR_PRINT (mongoc_bulkwrite_append_insertone (bw, "db.coll2", docs[1], NULL, &error), error);
-
-      bwr = mongoc_bulkwrite_execute (bw, bw_opts);
-      ASSERT_NO_BULKWRITEEXCEPTION (bwr);
-      ASSERT_CMPINT (ctx.num_inserts, ==, 2);
-      bson_destroy (docs[0]);
-      bson_destroy (docs[1]);
-      mongoc_bulkwrite_destroy (bw);
-      mongoc_bulkwriteresult_destroy (bwr.res);
-      mongoc_bulkwriteexception_destroy (bwr.exc);
-      mongoc_bulkwriteopts_destroy (bw_opts);
-      bson_destroy (corpus_encryptedFields);
-      bson_destroy (coll_opts);
-      mongoc_database_destroy (db);
-   }
+   /* but.. exceeding 16 MiB fails */
+   docs[0] = get_bson_from_json_file ("./src/libmongoc/tests/client_side_encryption_prose/limits-doc.json");
+   bson_append_utf8 (docs[0], "_id", -1, "under_16mib", -1);
+   bson_append_utf8 (docs[0], "unencrypted", -1, as, exceeds_16mib_after_encryption);
+   BSON_ASSERT (!mongoc_collection_insert_one (coll, docs[0], NULL /* opts */, NULL /* reply */, &error));
+   ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_SERVER, 2, "too large");
+   bson_destroy (docs[0]);
 
    bson_free (as);
    bson_destroy (kms_providers);
@@ -575,20 +501,6 @@ test_bson_size_limits_and_batch_splitting (bool with_qe)
    mongoc_auto_encryption_opts_destroy (opts);
 }
 
-static void
-test_bson_size_limits_and_batch_splitting_no_qe (void *unused)
-{
-   BSON_UNUSED (unused);
-   test_bson_size_limits_and_batch_splitting (false);
-}
-
-static void
-test_bson_size_limits_and_batch_splitting_qe (void *unused)
-{
-   BSON_UNUSED (unused);
-   test_bson_size_limits_and_batch_splitting (true);
-}
-
 typedef struct {
    bson_t *last_cmd;
 } _datakey_and_double_encryption_ctx_t;
@@ -6995,19 +6907,11 @@ test_client_side_encryption_install (TestSuite *suite)
                       test_framework_skip_if_no_auth /* requires auth for error check */);
    TestSuite_AddFull (suite,
                       "/client_side_encryption/bson_size_limits_and_batch_splitting",
-                      test_bson_size_limits_and_batch_splitting_no_qe,
+                      test_bson_size_limits_and_batch_splitting,
                       NULL,
                       NULL,
                       test_framework_skip_if_no_client_side_encryption,
                       test_framework_skip_if_max_wire_version_less_than_8);
-   TestSuite_AddFull (suite,
-                      "/client_side_encryption/bson_size_limits_and_batch_splitting_qe",
-                      test_bson_size_limits_and_batch_splitting_qe,
-                      NULL,
-                      NULL,
-                      test_framework_skip_if_no_client_side_encryption,
-                      test_framework_skip_if_max_wire_version_less_than_25,
-                      test_framework_skip_if_single);
    TestSuite_AddFull (suite,
                       "/client_side_encryption/views_are_prohibited",
                       test_views_are_prohibited,
diff --git a/src/libmongoc/tests/test-mongoc-crud.c b/src/libmongoc/tests/test-mongoc-crud.c
@@ -1519,6 +1519,14 @@ test_crud_install (TestSuite *suite)
                       test_framework_skip_if_max_wire_version_less_than_25 // require server 8.0
    );
 
+   TestSuite_AddFull (suite,
+                      "/crud/prose_test_13",
+                      prose_test_13,
+                      NULL /* dtor */,
+                      NULL /* ctx */,
+                      test_framework_skip_if_max_wire_version_less_than_25, // require server 8.0
+                      test_framework_skip_if_no_client_side_encryption);
+
    TestSuite_AddFull (suite,
                       "/crud/prose_test_15",
                       prose_test_15,
