Skip to content

MONGOCRYPT-922 Make padding strings unique #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kevinAlbs wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

MONGOCRYPT-922 Make padding strings unique #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41fb8ca
test no sequential repeats of tokens
kevinAlbs May 26, 2026
53a0db4
append uint32 to padding tokens
kevinAlbs May 26, 2026
31adbe6
update payload expectations
kevinAlbs May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 83 additions & 13 deletions src/mongocrypt-marking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "mongocrypt-buffer-private.h"
#include "mongocrypt-ciphertext-private.h"
#include "mongocrypt-crypto-private.h"
#include "mongocrypt-endian-private.h"
#include "mongocrypt-key-broker-private.h"
#include "mongocrypt-marking-private.h"
#include "mongocrypt-private.h"
Expand Down Expand Up @@ -1326,15 +1327,39 @@ static bool _fle2_generate_TextSearchTokenSets(_mongocrypt_key_broker_t *kb,
mc_TextSubstringTokenSet_cleanup(&tset);
goto fail;
}
_mongocrypt_buffer_cleanup(&asBsonValue);

if (appendCount > 1) {
mc_TextSubstringTokenSet_t tset_copy;
mc_TextSubstringTokenSet_shallow_copy(&tset, &tset_copy);
// Count is only greater than one for padding strings.
BSON_ASSERT(substring[bytelen - 1] == '\xFF');

// Make room to append count.
_mongocrypt_buffer_resize(&asBsonValue, asBsonValue.len + (uint32_t)sizeof(uint32_t));

for (; appendCount > 1; appendCount--) {
_mc_array_append_val(&tsts->substringArray, tset_copy);
// Convert to little-endian (not strictly necessary since count is only appended for uniqueness):
uint32_t count_le = MONGOCRYPT_UINT32_TO_LE(appendCount);
memcpy(asBsonValue.data + asBsonValue.len - sizeof(uint32_t), &count_le, sizeof(uint32_t));

mc_TextSubstringTokenSet_t tset_padding = {{0}};
mc_TextSubstringTokenSet_init(&tset_padding);
if (!_fle2_generate_TextSubstringTokenSet(kb,
&tset_padding,
&asBsonValue,
contentionFactor,
0 /* msize */,
common.collectionsLevel1Token,
common.serverTokenDerivationLevel1Token,
status)) {
_mongocrypt_buffer_cleanup(&asBsonValue);
mc_TextSubstringTokenSet_cleanup(&tset_padding);
mc_TextSubstringTokenSet_cleanup(&tset);
goto fail;
}
_mc_array_append_val(&tsts->substringArray, tset_padding); // moves ownership of tset_padding
}
}

_mongocrypt_buffer_cleanup(&asBsonValue);
_mc_array_append_val(&tsts->substringArray, tset); // array now owns tset
}
}
Expand Down Expand Up @@ -1367,15 +1392,37 @@ static bool _fle2_generate_TextSearchTokenSets(_mongocrypt_key_broker_t *kb,
mc_TextSuffixTokenSet_cleanup(&tset);
goto fail;
}
_mongocrypt_buffer_cleanup(&asBsonValue);

if (appendCount > 1) {
mc_TextSuffixTokenSet_t tset_copy;
mc_TextSuffixTokenSet_shallow_copy(&tset, &tset_copy);
// Count is only greater than one for padding strings.
BSON_ASSERT(substring[bytelen - 1] == '\xFF');

// Make room to append count.
_mongocrypt_buffer_resize(&asBsonValue, asBsonValue.len + (uint32_t)sizeof(uint32_t));

for (; appendCount > 1; appendCount--) {
_mc_array_append_val(&tsts->suffixArray, tset_copy);
// Convert to little-endian (not strictly necessary since count is only appended for uniqueness):
uint32_t count_le = MONGOCRYPT_UINT32_TO_LE(appendCount);
memcpy(asBsonValue.data + asBsonValue.len - sizeof(uint32_t), &count_le, sizeof(uint32_t));

mc_TextSuffixTokenSet_t tset_padding = {{0}};
mc_TextSuffixTokenSet_init(&tset_padding);
if (!_fle2_generate_TextSuffixTokenSet(kb,
&tset_padding,
&asBsonValue,
contentionFactor,
0 /* msize */,
common.collectionsLevel1Token,
common.serverTokenDerivationLevel1Token,
status)) {
_mongocrypt_buffer_cleanup(&asBsonValue);
mc_TextSuffixTokenSet_cleanup(&tset_padding);
mc_TextSuffixTokenSet_cleanup(&tset);
goto fail;
}
_mc_array_append_val(&tsts->suffixArray, tset_padding); // moves ownership of tset_padding
}
}
_mongocrypt_buffer_cleanup(&asBsonValue);
_mc_array_append_val(&tsts->suffixArray, tset); // array now owns tset
}
}
Expand Down Expand Up @@ -1408,15 +1455,38 @@ static bool _fle2_generate_TextSearchTokenSets(_mongocrypt_key_broker_t *kb,
mc_TextPrefixTokenSet_cleanup(&tset);
goto fail;
}
_mongocrypt_buffer_cleanup(&asBsonValue);

if (appendCount > 1) {
mc_TextPrefixTokenSet_t tset_copy;
mc_TextPrefixTokenSet_shallow_copy(&tset, &tset_copy);
// Count is only greater than one for padding strings.
BSON_ASSERT(substring[bytelen - 1] == '\xFF');

// Make room to append count.
_mongocrypt_buffer_resize(&asBsonValue, asBsonValue.len + (uint32_t)sizeof(uint32_t));

for (; appendCount > 1; appendCount--) {
_mc_array_append_val(&tsts->prefixArray, tset_copy); // array now owns tset_copy
// Convert to little-endian (not strictly necessary since count is only appended for uniqueness):
uint32_t count_le = MONGOCRYPT_UINT32_TO_LE(appendCount);
memcpy(asBsonValue.data + asBsonValue.len - sizeof(uint32_t), &count_le, sizeof(uint32_t));

mc_TextPrefixTokenSet_t tset_padding = {{0}};
mc_TextPrefixTokenSet_init(&tset_padding);
if (!_fle2_generate_TextPrefixTokenSet(kb,
&tset_padding,
&asBsonValue,
contentionFactor,
0 /* msize */,
common.collectionsLevel1Token,
common.serverTokenDerivationLevel1Token,
status)) {
_mongocrypt_buffer_cleanup(&asBsonValue);
mc_TextPrefixTokenSet_cleanup(&tset_padding);
mc_TextPrefixTokenSet_cleanup(&tset);
goto fail;
}
_mc_array_append_val(&tsts->prefixArray, tset_padding); // moves ownership of tset_padding
}
}
_mongocrypt_buffer_cleanup(&asBsonValue);
_mc_array_append_val(&tsts->prefixArray, tset); // moves ownership of tset
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/data/fle2-explicit/insert-casef-diacf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"v": {
"$binary": {
"base64": "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",
"base64": "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",
"subType": "06"
}
}
Expand Down
Loading