Skip to content

CDRIVER-6352 update CSE tests for server validation #2320

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

Open
kevinAlbs wants to merge 1 commit into
base: master
Choose a base branch
from
+74 −36
Open

CDRIVER-6352 update CSE tests for server validation #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions ...libmongoc/tests/client_side_encryption_prose/explicit_encryption/encryptedFields-c10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"fields": [
{
"keyId": {
"$binary": {
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
"subType": "04"
}
},
"path": "encryptedIndexed",
"bsonType": "string",
"queries": {
"queryType": "equality",
"contention": {
"$numberLong": "10"
}
}
},
{
"keyId": {
"$binary": {
"base64": "q83vqxI0mHYSNBI0VniQEg==",
"subType": "04"
}
},
"path": "encryptedUnindexed",
"bsonType": "string"
}
]
}
6 changes: 6 additions & 0 deletions ...tests/client_side_encryption_prose/explicit_encryption/encryptedFields-prefix-suffix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"strMaxQueryLength": {
"$numberInt": "10"
},
"contention": {
"$numberLong": "0"
},
"caseSensitive": true,
"diacriticSensitive": true
},
Expand All @@ -29,6 +32,9 @@
"strMaxQueryLength": {
"$numberInt": "10"
},
"contention": {
"$numberLong": "0"
},
"caseSensitive": true,
"diacriticSensitive": true
}
Expand Down
3 changes: 3 additions & 0 deletions ...goc/tests/client_side_encryption_prose/explicit_encryption/encryptedFields-substring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
"strMaxQueryLength": {
"$numberInt": "10"
},
"contention": {
"$numberLong": "0"
},
"caseSensitive": true,
"diacriticSensitive": true
}
Expand Down
71 changes: 35 additions & 36 deletions src/libmongoc/tests/test-mongoc-client-side-encryption.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3302,17 +3302,21 @@ typedef struct {
mongoc_client_encryption_t *clientEncryption;
mongoc_client_t *encryptedClient;
mongoc_collection_t *encryptedColl;
mongoc_collection_t *encryptedColl_c10;
} ee_fixture;

static ee_fixture *
explicit_encryption_setup(void)
{
char *encrypted_fields_path =
"./src/libmongoc/tests/client_side_encryption_prose/explicit_encryption/encryptedFields.json";
char *encrypted_fields_c10_path =
"./src/libmongoc/tests/client_side_encryption_prose/explicit_encryption/encryptedFields-c10.json";
char *key_path = "./src/libmongoc/tests/client_side_encryption_prose/explicit_encryption/key1-document.json";

ee_fixture *eef = (ee_fixture *)bson_malloc0(sizeof(ee_fixture));
bson_t *encryptedFields = get_bson_from_json_file(encrypted_fields_path);
bson_t *encryptedFields_c10 = get_bson_from_json_file(encrypted_fields_c10_path);
bson_t *key1Document = get_bson_from_json_file(key_path);
mongoc_client_t *setupClient = test_framework_new_default_client();

Expand Down Expand Up @@ -3352,6 +3356,31 @@ explicit_encryption_setup(void)
mongoc_database_destroy(db);
}

/* Drop and create the collection ``db.explicit_encryption_c10`` using
* ``encryptedFields_c10`` as an option. */
{
mongoc_database_t *db = mongoc_client_get_database(setupClient, "db");
mongoc_collection_t *coll = mongoc_database_get_collection(db, "explicit_encryption_c10");
bson_error_t error;
bson_t *opts;

opts = BCON_NEW("encryptedFields", BCON_DOCUMENT(encryptedFields_c10));

if (!mongoc_collection_drop_with_opts(coll, opts, &error)) {
if (error.code != MONGOC_SERVER_ERR_NS_NOT_FOUND) {
test_error("unexpected error in drop: %s", error.message);
}
}
mongoc_collection_destroy(coll);

coll = mongoc_database_create_collection(db, "explicit_encryption_c10", opts, &error);
ASSERT_OR_PRINT(coll, error);

mongoc_collection_destroy(coll);
bson_destroy(opts);
mongoc_database_destroy(db);
}

/* Drop and create the collection ``keyvault.datakeys``. */
{
mongoc_database_t *db = mongoc_client_get_database(setupClient, "keyvault");
Expand Down Expand Up @@ -3416,10 +3445,12 @@ explicit_encryption_setup(void)
bson_destroy(kms_providers);
mongoc_auto_encryption_opts_destroy(aeOpts);
eef->encryptedColl = mongoc_client_get_collection(eef->encryptedClient, "db", "explicit_encryption");
eef->encryptedColl_c10 = mongoc_client_get_collection(eef->encryptedClient, "db", "explicit_encryption_c10");
}

mongoc_client_destroy(setupClient);
bson_destroy(key1Document);
bson_destroy(encryptedFields_c10);
bson_destroy(encryptedFields);
return eef;
}
Expand All @@ -3431,6 +3462,7 @@ explicit_encryption_destroy(ee_fixture *eef)
return;
}

mongoc_collection_destroy(eef->encryptedColl_c10);
mongoc_collection_destroy(eef->encryptedColl);
mongoc_client_destroy(eef->encryptedClient);
mongoc_client_encryption_destroy(eef->clientEncryption);
Expand Down Expand Up @@ -4197,48 +4229,14 @@ test_explicit_encryption_case2(void *unused)

ASSERT(BSON_APPEND_VALUE(&to_insert, "encryptedIndexed", &insertPayload));

ok = mongoc_collection_insert_one(eef->encryptedColl, &to_insert, NULL /* opts */, NULL /* reply */, &error);
ok = mongoc_collection_insert_one(eef->encryptedColl_c10, &to_insert, NULL /* opts */, NULL /* reply */, &error);
ASSERT_OR_PRINT(ok, error);

bson_value_destroy(&insertPayload);
bson_destroy(&to_insert);
mongoc_client_encryption_encrypt_opts_destroy(eopts);
}

/* Find with contention factor of 0. Expect < 10 documents returned.
*/
{
bson_value_t findPayload;
mongoc_cursor_t *cursor;
bson_t filter = BSON_INITIALIZER;
const bson_t *got;
int got_count = 0;

eopts = mongoc_client_encryption_encrypt_opts_new();
mongoc_client_encryption_encrypt_opts_set_keyid(eopts, &eef->key1ID);
mongoc_client_encryption_encrypt_opts_set_algorithm(eopts, MONGOC_ENCRYPT_ALGORITHM_INDEXED);
mongoc_client_encryption_encrypt_opts_set_query_type(eopts, MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY);
mongoc_client_encryption_encrypt_opts_set_contention_factor(eopts, 0);

ok = mongoc_client_encryption_encrypt(eef->clientEncryption, &plaintext, eopts, &findPayload, &error);
ASSERT_OR_PRINT(ok, error);

ASSERT(BSON_APPEND_VALUE(&filter, "encryptedIndexed", &findPayload));

cursor = mongoc_collection_find_with_opts(eef->encryptedColl, &filter, NULL /* opts */, NULL /* read_prefs */);

while (mongoc_cursor_next(cursor, &got)) {
got_count++;
ASSERT_MATCH(got, "{ 'encryptedIndexed': 'encrypted indexed value' }");
}
ASSERT_OR_PRINT(!mongoc_cursor_error(cursor, &error), error);
ASSERT_CMPINT(got_count, <, 10);

bson_value_destroy(&findPayload);
mongoc_cursor_destroy(cursor);
mongoc_client_encryption_encrypt_opts_destroy(eopts);
bson_destroy(&filter);
}

/* Find with contention factor of 10. Expect all 10 documents returned. */
{
Expand All @@ -4259,7 +4257,8 @@ test_explicit_encryption_case2(void *unused)

ASSERT(BSON_APPEND_VALUE(&filter, "encryptedIndexed", &findPayload));

cursor = mongoc_collection_find_with_opts(eef->encryptedColl, &filter, NULL /* opts */, NULL /* read_prefs */);
cursor =
mongoc_collection_find_with_opts(eef->encryptedColl_c10, &filter, NULL /* opts */, NULL /* read_prefs */);

while (mongoc_cursor_next(cursor, &got)) {
got_count++;
Expand Down