Skip to content

MONGOCRYPT-956 error if "kmip" configured twice #1203

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

Merged
kevinAlbs merged 3 commits into from
Jul 17, 2026
Merged

MONGOCRYPT-956 error if "kmip" configured twice #1203

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
fcc6ce3
add regression test
kevinAlbs Jul 16, 2026
f9f4fb4
MONGOCRYPT-956 reject repeated configuration of KMIP KMS provider
kevinAlbs Jul 16, 2026
6154a58
fix format
kevinAlbs Jul 17, 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
4 changes: 4 additions & 0 deletions src/mongocrypt-opts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,10 @@ bool _mongocrypt_parse_kms_providers(mongocrypt_binary_t *kms_providers_definiti
} else if (0 == strcmp(field_name, "kmip") && bson_empty(&field_bson)) {
kms_providers->need_credentials |= MONGOCRYPT_KMS_PROVIDER_KMIP;
} else if (0 == strcmp(field_name, "kmip")) {
if (0 != (kms_providers->configured_providers & MONGOCRYPT_KMS_PROVIDER_KMIP)) {
CLIENT_ERR("kmip KMS provider already set");
return false;
}
if (!_mongocrypt_opts_kms_provider_kmip_parse(&kms_providers->kmip_mut, field_name, &field_bson, status)) {
return false;
}
Expand Down
10 changes: 10 additions & 0 deletions test/test-mongocrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,16 @@ static void _test_setopt_kms_providers(_mongocrypt_tester_t *tester) {
ASSERT_FAILS(mongocrypt_setopt_kms_providers(crypt, more), crypt, "already set");
mongocrypt_destroy(crypt);
}

// Errors if followed by call to `mongocrypt_setopt_kms_providers` configuring "kmip".
// This is a regression test for: MONGOCRYPT-956
{
mongocrypt_binary_t *kms_providers = TEST_BSON("{'kmip' : {'endpoint' : 'localhost'}}");
mongocrypt_t *crypt = mongocrypt_new();
ASSERT_OK(mongocrypt_setopt_kms_providers(crypt, kms_providers), crypt);
ASSERT_FAILS(mongocrypt_setopt_kms_providers(crypt, kms_providers), crypt, "already set");
mongocrypt_destroy(crypt);
}
}

static void test_tmp_bsonf(_mongocrypt_tester_t *tester) {
Expand Down