CDRIVER-6044 Text search explicit encryption API and prose tests #2084
+776
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdb-ad
changed the title
mdb-ad
requested review from
Julia-Garland and
kevinAlbs
and removed request for
Julia-Garland
kevinAlbs
reviewed
Sep 5, 2025
|
|
||
| void | ||
| mongoc_encrypt_text_opts_destroy(mongoc_encrypt_text_opts_t *topts) | ||
| { |
There was a problem hiding this comment.
For consistency with other _destroy functions, return if argument is NULL:
if (!topts) {
return;
}I expect this may fix ASan tasks:
mongoc-client-side-encryption.c:636:51: runtime error: member access within null pointer of type 'mongoc_encrypt_text_opts_t' (aka 'struct _mongoc_encrypt_text_opts_t')
| @@ -182,6 +190,67 @@ mongoc_client_encryption_get_key(mongoc_client_encryption_t *client_encryption, | |||
| bson_t *key_doc, | |||
| bson_error_t *error); | |||
|
|
|||
| MONGOC_EXPORT(mongoc_encrypt_text_prefix_opts_t *) | |||
| mongoc_encrypt_text_prefix_opts_new(void); | |||
There was a problem hiding this comment.
Add .rst docs for the new API.
| BSON_ASSERT_PARAM(bson_text_opts); | ||
| BSON_ASSERT_PARAM(opts); | ||
|
|
||
| BSON_ASSERT(BSON_APPEND_BOOL(bson_text_opts, "caseSensitive", opts->case_sensitive)); |
There was a problem hiding this comment.
I expect caseSensitive and diacriticSensitive should only be applied if set, like:
if (opts->diacritic_sensitive.set) {
BSON_ASSERT(BSON_APPEND_BOOL(bson_text_opts, "diacriticSensitive", opts->diacritic_sensitive.value));
}The current implementation defaults to false. The spec requires these be set. If a user does not set either field, I expect libmongocrypt will error.
| "subType": "04" | ||
| } | ||
| }, | ||
| "path": "encrypted-textPreview", |
There was a problem hiding this comment.
Suggest updating the encryptedFields files to match what is in the spec. The spec refers to "encryptedText".
| @@ -1668,6 +1671,18 @@ _create_explicit_state_machine(_mongoc_crypt_t *crypt, | |||
| mongocrypt_binary_destroy(binary_range_opts); | |||
| } | |||
|
|
|||
| if (text_opts != NULL) { | |||
| /* mongocrypt error checks and parses range options */ | |||
There was a problem hiding this comment.
Suggested change
| /* mongocrypt error checks and parses range options */ | |
| /* mongocrypt error checks and parses text options */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.