libmongocrypt-helper 1.8.0.0.1001 → 1.11.0.0.1001
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/libmongocrypt/libmongocrypt/CHANGELOG.md +33 -0
- data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt +12 -1
- data/ext/libmongocrypt/libmongocrypt/CODEOWNERS +1 -4
- data/ext/libmongocrypt/libmongocrypt/Earthfile +151 -3
- data/ext/libmongocrypt/libmongocrypt/README.md +36 -40
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/CMakeLists.txt +1 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Driver.snk +0 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/AssemblyInfo.cs +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Binary.cs +16 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClientFactory.cs +8 -4
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Library.cs +10 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/LibraryLoader.cs +81 -44
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.csproj +2 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test/MongoDB.Libmongocrypt.Test.csproj +2 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test32/MongoDB.Libmongocrypt.Test32.csproj +2 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/README.md +3 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.cake +21 -26
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.config +3 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.sh +0 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/benchmarks/build.gradle.kts +28 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/benchmarks/src/main/java/com/mongodb/crypt/benchmark/BenchmarkRunner.java +217 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/benchmarks/src/main/resources/keyDocument.json +24 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/build.gradle.kts +21 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/gradle/wrapper/gradle-wrapper.jar +0 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/gradle/wrapper/gradle-wrapper.properties +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/gradlew +154 -108
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/gradlew.bat +7 -18
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/settings.gradle.kts +1 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/java/com/mongodb/crypt/capi/CAPI.java +41 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/java/com/mongodb/crypt/capi/CAPIHelper.java +5 -5
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/java/com/mongodb/crypt/capi/CipherCallback.java +27 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/java/com/mongodb/crypt/capi/MongoCryptImpl.java +34 -19
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/java/com/mongodb/crypt/capi/MongoExplicitEncryptOptions.java +6 -4
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/resources/META-INF/native-image/jni-config.json +180 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/main/resources/META-INF/native-image/reflect-config.json +134 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/java/com/mongodb/crypt/capi/MongoCryptTest.java +44 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/encrypted-payload.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/rangeopts.json +3 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/README.md +4 -900
- data/ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst +60 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/README.rst +41 -20
- data/ext/libmongocrypt/libmongocrypt/bindings/python/RELEASE.rst +6 -24
- data/ext/libmongocrypt/libmongocrypt/bindings/python/build-manylinux-wheel.sh +4 -13
- data/ext/libmongocrypt/libmongocrypt/bindings/python/hatch_build.py +36 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/libmongocrypt-version.txt +1 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/__init__.py +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/auto_encrypter.py +61 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/credentials.py +156 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/explicit_encrypter.py +156 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/state_machine.py +149 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/auto_encrypter.py +2 -46
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/binary.py +14 -17
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/binding.py +107 -61
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/compat.py +6 -4
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/credentials.py +2 -121
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/crypto.py +31 -20
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/errors.py +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/explicit_encrypter.py +2 -233
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/mongocrypt.py +168 -238
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/options.py +265 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/state_machine.py +2 -141
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/synchronous/auto_encrypter.py +61 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/synchronous/credentials.py +156 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/synchronous/explicit_encrypter.py +156 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/synchronous/state_machine.py +149 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/version.py +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pyproject.toml +118 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/release.sh +97 -61
- data/ext/libmongocrypt/libmongocrypt/bindings/python/{test-requirements.txt → requirements-test.txt} +4 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/requirements.txt +4 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/sbom.json +76 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/strip_header.py +6 -7
- data/ext/libmongocrypt/libmongocrypt/bindings/python/synchro.py +64 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/__init__.py +1 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/collection-info.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/command.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/compact/success/encrypted-payload.json +21 -21
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/encrypted-command-reply.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/encrypted-field-config-map.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit-v2/int32/encrypted-payload.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit-v2/int32/rangeopts.json +3 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-rangePreview-explicit/int32/rangeopts.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-rangePreview-explicit/int32/value-to-encrypt.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/key-document-azure.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/key-document-gcp.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/key-document.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/key-filter.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/list-collections-filter.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/mongocryptd-command.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/mongocryptd-reply.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/schema-map.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/performance/keyDocument.json +24 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/performance/perf_test.py +165 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/test_binding.py +8 -12
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/test_crypto.py +9 -11
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/test_mongocrypt.py +988 -340
- data/ext/libmongocrypt/libmongocrypt/bindings/python/update-sbom.sh +14 -0
- data/ext/libmongocrypt/libmongocrypt/cmake/FetchMongoC.cmake +19 -1
- data/ext/libmongocrypt/libmongocrypt/cmake/ImportBSON.cmake +23 -0
- data/ext/libmongocrypt/libmongocrypt/cmake/IntelDFP.cmake +19 -227
- data/ext/libmongocrypt/libmongocrypt/cmake/Patch.cmake +54 -0
- data/ext/libmongocrypt/libmongocrypt/doc/img/cli-icon.png +0 -0
- data/ext/libmongocrypt/libmongocrypt/doc/img/reference-targets.png +0 -0
- data/ext/libmongocrypt/libmongocrypt/doc/releasing.md +153 -0
- data/ext/libmongocrypt/libmongocrypt/etc/calc_release_version.py +61 -28
- data/ext/libmongocrypt/libmongocrypt/etc/calc_release_version_selftest.sh +73 -0
- data/ext/libmongocrypt/libmongocrypt/etc/cyclonedx.sbom.json +108 -0
- data/ext/libmongocrypt/libmongocrypt/etc/format.sh +1 -1
- data/ext/libmongocrypt/libmongocrypt/etc/libbson-remove-GCC-diagnostic-pragma.patch +27 -0
- data/ext/libmongocrypt/libmongocrypt/etc/mongo-inteldfp-alpine-arm-fix.patch +17 -0
- data/ext/libmongocrypt/libmongocrypt/etc/packager.py +120 -91
- data/ext/libmongocrypt/libmongocrypt/etc/purls.txt +14 -0
- data/ext/libmongocrypt/libmongocrypt/etc/repo_config.yaml +56 -0
- data/ext/libmongocrypt/libmongocrypt/etc/silk-create-asset-group.sh +70 -0
- data/ext/libmongocrypt/libmongocrypt/etc/ssdlc_compliance_report.md +37 -0
- data/ext/libmongocrypt/libmongocrypt/etc/third_party_vulnerabilities.md +42 -0
- data/ext/libmongocrypt/libmongocrypt/integrating.md +18 -1
- data/ext/libmongocrypt/libmongocrypt/kms-message/CMakeLists.txt +11 -3
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_gcp_request.c +1 -1
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_reader_writer.c +17 -0
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_reader_writer_private.h +6 -0
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_request.c +211 -1
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_response.c +163 -0
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_kmip_tag_type_private.h +2 -1
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_message/kms_kmip_request.h +17 -0
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_message/kms_kmip_response.h +6 -0
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_port.c +3 -2
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_request.c +4 -2
- data/ext/libmongocrypt/libmongocrypt/kms-message/src/kms_request_str.c +2 -2
- data/ext/libmongocrypt/libmongocrypt/kms-message/test/test_kmip_reader_writer.c +23 -2
- data/ext/libmongocrypt/libmongocrypt/src/crypto/libcrypto.c +13 -10
- data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.h +1 -1
- data/ext/libmongocrypt/libmongocrypt/src/mc-efc-private.h +16 -2
- data/ext/libmongocrypt/libmongocrypt/src/mc-efc.c +94 -6
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder-private.h +15 -5
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder.c +114 -53
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private-v2.h +1 -1
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private.h +1 -1
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-v2.c +2 -2
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload.c +2 -2
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private-v2.h +21 -6
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private.h +5 -5
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-v2.c +38 -2
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload.c +1 -1
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private-v2.h +20 -7
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private.h +8 -8
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-v2.c +89 -1
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-v2.c +3 -3
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev.c +1 -23
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds-private.h +4 -3
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds.c +15 -12
- data/ext/libmongocrypt/libmongocrypt/src/mc-optional-private.h +11 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation-private.h +16 -6
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation.c +64 -22
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding-private.h +23 -4
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding.c +359 -65
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-generator.template.h +26 -14
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-private.h +17 -6
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover.c +31 -13
- data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts-private.h +16 -3
- data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts.c +259 -63
- data/ext/libmongocrypt/libmongocrypt/src/mc-tokens-private.h +40 -24
- data/ext/libmongocrypt/libmongocrypt/src/mc-tokens.c +57 -13
- data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.h +17 -0
- data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.test.cpp +5 -0
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary-private.h +0 -5
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer.c +5 -7
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key.c +1 -0
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth-private.h +16 -18
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth.c +105 -76
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto.c +9 -3
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-datakey.c +170 -89
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-decrypt.c +5 -5
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-encrypt.c +505 -124
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-private.h +31 -6
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx.c +81 -13
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-dll-private.h +7 -0
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek-private.h +5 -1
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek.c +161 -103
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker-private.h +2 -7
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker.c +191 -69
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key.c +1 -1
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx-private.h +50 -15
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx.c +365 -69
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking-private.h +2 -1
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking.c +200 -107
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts-private.h +50 -5
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts.c +591 -15
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-private.h +6 -13
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util.c +3 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.c +47 -234
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.h +75 -24
- data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_dll.c +18 -2
- data/ext/libmongocrypt/libmongocrypt/src/os_win/os_dll.c +4 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/bypassQueryAnalysis/payload.json +53 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/jsonSchema/cmd-to-mongocryptd.json +23 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/jsonSchema/cmd.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/cmd-to-mongocryptd.json +50 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/cmd.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/collinfo.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/encrypted-field-map.json +24 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/encrypted-payload-pattern.json +53 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/simple/mongocryptd-reply.json +62 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/cmd-to-mongocryptd.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/cmd.json +17 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/mongocryptd-reply.json +39 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/payload.json +21 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/missing-key-id/collinfo.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/no-fields/collinfo.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/no-fields/encrypted-payload.json +4 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/cmd.json +1 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/collinfo.json +63 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/encrypted-field-config-map.json +61 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/encrypted-payload-range-v2.json +37 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/encrypted-payload.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/anchor-pad/cmd.json +1 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/anchor-pad/collinfo.json +64 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/anchor-pad/encrypted-payload-range-v2.json +105 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/anchor-pad/encrypted-payload.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/no-range/cmd.json +1 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/no-range/collinfo.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/no-range/encrypted-field-config-map.json +47 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/no-range/encrypted-payload.json +23 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/collinfo.json +15 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-field-config-map.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-payload-range-v2.json +104 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-payload.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explain/with-csfle/collinfo.json +4 -4
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explain/with-csfle/encrypted-payload.json +3 -3
- data/ext/libmongocrypt/libmongocrypt/test/data/kms-azure/decrypt-response.txt +16 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/kms-azure/encrypt-response.txt +16 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/kms-azure/oauth-response.txt +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/find/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/find/encrypted-field-map.json +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/find/encrypted-payload.json +62 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/find/mongocryptd-reply.json +69 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/insert/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/insert/encrypted-field-map.json +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/insert/encrypted-payload.json +40 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/no-trimFactor/insert/mongocryptd-reply.json +47 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-edge-generation/edges_decimal128.cstruct +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/range-edge-generation/edges_double.cstruct +8637 -7958
- data/ext/libmongocrypt/libmongocrypt/test/data/range-edge-generation/edges_int32.cstruct +5522 -1382
- data/ext/libmongocrypt/libmongocrypt/test/data/range-edge-generation/edges_int64.cstruct +5042 -1262
- data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_decimal128.cstruct +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_decimal128_precision.cstruct +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_double.cstruct +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_double_precision.cstruct +2 -2
- data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_int32.cstruct +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_int64.cstruct +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/encrypted-field-map.json +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/encrypted-payload.json +53 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/mongocryptd-reply.json +58 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/encrypted-field-map.json +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/encrypted-payload.json +40 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/mongocryptd-reply.json +45 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32/expected.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32/to-encrypt.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32-defaults/expected.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32-defaults/to-encrypt.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-insert-double/expected.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-insert-int32/expected.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-insert-int32-defaults/expected.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/README.md +7 -4
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/mc.json +9 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/server.json +9 -5
- data/ext/libmongocrypt/libmongocrypt/test/example-state-machine.c +1 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-gcp-auth.c +8 -8
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-efc.c +6 -4
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-range-payload-v2.c +43 -3
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup-v2.c +76 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-rfds.c +5 -5
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-edge-generation.c +89 -14
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-encoding.c +342 -76
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-mincover.c +94 -12
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-rangeopts.c +205 -7
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-tokens.c +49 -23
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.c +16 -19
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.h +22 -1
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache-oauth.c +94 -11
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cleanup.c +374 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-compact.c +121 -42
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-hooks.c +134 -4
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.c +40 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.h +16 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-csfle-lib.c +11 -11
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-decrypt.c +8 -5
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-encrypt.c +922 -92
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-rewrap-many-datakey.c +2 -2
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-setopt.c +114 -12
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-datakey.c +14 -9
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-ctx.c +424 -3
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-log.c +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-marking.c +447 -28
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-opts.c +42 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-traverse-util.c +30 -26
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.c +7 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.h +3 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.c +66 -14
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.h +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-named-kms-providers.c +2381 -0
- data/ext/libmongocrypt/libmongocrypt/test/util/HELP.autogen +3 -1
- data/ext/libmongocrypt/libmongocrypt/test/util/README.md +1 -0
- data/ext/libmongocrypt/libmongocrypt/test/util/csfle.c +4 -0
- data/ext/libmongocrypt/libmongocrypt/test/util/make_includes.py +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/util/util.c +38 -3
- data/lib/libmongocrypt_helper/version.rb +2 -2
- metadata +112 -106
- checksums.yaml.gz.sig +0 -0
- data/ext/libmongocrypt/libmongocrypt/VERSION_CURRENT +0 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/cs.sln +0 -79
- data/ext/libmongocrypt/libmongocrypt/bindings/node/CHANGELOG.md +0 -105
- data/ext/libmongocrypt/libmongocrypt/bindings/node/LICENSE +0 -201
- data/ext/libmongocrypt/libmongocrypt/bindings/node/binding.gyp +0 -79
- data/ext/libmongocrypt/libmongocrypt/bindings/node/etc/README.hbs +0 -44
- data/ext/libmongocrypt/libmongocrypt/bindings/node/etc/build-static.sh +0 -36
- data/ext/libmongocrypt/libmongocrypt/bindings/node/index.d.ts +0 -641
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/autoEncrypter.js +0 -420
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/buffer_pool.js +0 -123
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/clientEncryption.js +0 -821
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/common.js +0 -98
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/cryptoCallbacks.js +0 -87
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/errors.js +0 -75
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/index.js +0 -73
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/mongocryptdManager.js +0 -66
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/aws.js +0 -26
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/azure.js +0 -178
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/gcp.js +0 -24
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/index.js +0 -54
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/utils.js +0 -39
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/stateMachine.js +0 -492
- data/ext/libmongocrypt/libmongocrypt/bindings/node/package-lock.json +0 -15302
- data/ext/libmongocrypt/libmongocrypt/bindings/node/package.json +0 -100
- data/ext/libmongocrypt/libmongocrypt/bindings/node/src/mongocrypt.cc +0 -956
- data/ext/libmongocrypt/libmongocrypt/bindings/node/src/mongocrypt.h +0 -114
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/autoEncrypter.test.js +0 -950
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/buffer_pool.test.js +0 -91
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/clientEncryption.test.js +0 -1093
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/common.test.js +0 -94
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/cryptoCallbacks.test.js +0 -240
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/README.md +0 -5
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/cmd.json +0 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/collection-info.json +0 -37
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/encrypted-document-nested.json +0 -8
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/encrypted-document.json +0 -11
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/encryptedFields.json +0 -30
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/key-document.json +0 -32
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/key1-document.json +0 -30
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/data/mongocryptd-reply.json +0 -18
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/index.test.js +0 -45
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/mongocryptdManager.test.js +0 -48
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/providers/credentialsProvider.test.js +0 -551
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/release.test.js +0 -66
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/requirements.helper.js +0 -51
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/stateMachine.test.js +0 -331
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/tools/chai-addons.js +0 -8
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/tools/mongodb_reporter.js +0 -325
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/types/index.test-d.ts +0 -63
- data/ext/libmongocrypt/libmongocrypt/bindings/python/setup.py +0 -89
- data/ext/libmongocrypt/libmongocrypt/debian/build_snapshot.sh +0 -79
- data/ext/libmongocrypt/libmongocrypt/debian/changelog +0 -105
- data/ext/libmongocrypt/libmongocrypt/debian/compat +0 -1
- data/ext/libmongocrypt/libmongocrypt/debian/control +0 -41
- data/ext/libmongocrypt/libmongocrypt/debian/copyright +0 -129
- data/ext/libmongocrypt/libmongocrypt/debian/gbp.conf +0 -23
- data/ext/libmongocrypt/libmongocrypt/debian/libmongocrypt-dev.dirs +0 -2
- data/ext/libmongocrypt/libmongocrypt/debian/libmongocrypt-dev.install +0 -5
- data/ext/libmongocrypt/libmongocrypt/debian/libmongocrypt0.dirs +0 -1
- data/ext/libmongocrypt/libmongocrypt/debian/libmongocrypt0.install +0 -1
- data/ext/libmongocrypt/libmongocrypt/debian/rules +0 -46
- data/ext/libmongocrypt/libmongocrypt/debian/source/format +0 -1
- data/ext/libmongocrypt/libmongocrypt/debian/source/lintian-overrides +0 -3
- data/ext/libmongocrypt/libmongocrypt/debian/source/options +0 -1
- data/ext/libmongocrypt/libmongocrypt/debian/watch +0 -3
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/mongocryptd-reply.json +0 -72
- data.tar.gz.sig +0 -1
- metadata.gz.sig +0 -0
- /data/ext/libmongocrypt/libmongocrypt/{bindings/node/test/data/kms-decrypt-reply.txt → test/data/kms-aws/decrypt-response.txt} +0 -0
- /data/ext/libmongocrypt/libmongocrypt/{bindings/node/test/data/kms-encrypt-reply.txt → test/data/kms-aws/encrypt-response.txt} +0 -0
- /data/ext/libmongocrypt/libmongocrypt/test/data/{gcp-auth → kms-gcp}/decrypt-response.txt +0 -0
- /data/ext/libmongocrypt/libmongocrypt/test/data/{gcp-auth → kms-gcp}/encrypt-response.txt +0 -0
- /data/ext/libmongocrypt/libmongocrypt/test/data/{gcp-auth → kms-gcp}/oauth-response.txt +0 -0
@@ -16,6 +16,7 @@
|
|
16
16
|
|
17
17
|
#include "mongocrypt-crypto-private.h"
|
18
18
|
#include "mongocrypt-ctx-private.h"
|
19
|
+
#include "mongocrypt-kms-ctx-private.h"
|
19
20
|
#include "mongocrypt-private.h"
|
20
21
|
#include "mongocrypt.h"
|
21
22
|
|
@@ -46,107 +47,161 @@ static mongocrypt_kms_ctx_t *_next_kms_ctx(mongocrypt_ctx_t *ctx) {
|
|
46
47
|
return &dkctx->kms;
|
47
48
|
}
|
48
49
|
|
49
|
-
static bool _kms_kmip_start(mongocrypt_ctx_t *ctx) {
|
50
|
+
static bool _kms_kmip_start(mongocrypt_ctx_t *ctx, const mc_kms_creds_t *kc) {
|
50
51
|
bool ret = false;
|
51
52
|
_mongocrypt_ctx_datakey_t *dkctx = (_mongocrypt_ctx_datakey_t *)ctx;
|
52
53
|
char *user_supplied_keyid = NULL;
|
53
|
-
_mongocrypt_endpoint_t *endpoint = NULL;
|
54
|
+
const _mongocrypt_endpoint_t *endpoint = NULL;
|
54
55
|
mongocrypt_status_t *status = ctx->status;
|
55
56
|
_mongocrypt_buffer_t secretdata = {0};
|
56
57
|
|
57
58
|
BSON_ASSERT_PARAM(ctx);
|
59
|
+
BSON_ASSERT_PARAM(kc);
|
60
|
+
BSON_ASSERT(kc->type == MONGOCRYPT_KMS_PROVIDER_KMIP);
|
58
61
|
|
59
62
|
if (ctx->opts.kek.kms_provider != MONGOCRYPT_KMS_PROVIDER_KMIP) {
|
60
63
|
CLIENT_ERR("KMS provider is not KMIP");
|
61
64
|
goto fail;
|
62
65
|
}
|
66
|
+
const bool delegated = ctx->opts.kek.provider.kmip.delegated;
|
63
67
|
|
64
68
|
user_supplied_keyid = ctx->opts.kek.provider.kmip.key_id;
|
65
69
|
|
66
70
|
if (ctx->opts.kek.provider.kmip.endpoint) {
|
67
71
|
endpoint = ctx->opts.kek.provider.kmip.endpoint;
|
68
|
-
} else if (
|
69
|
-
endpoint =
|
72
|
+
} else if (kc->value.kmip.endpoint) {
|
73
|
+
endpoint = kc->value.kmip.endpoint;
|
70
74
|
} else {
|
71
75
|
CLIENT_ERR("endpoint not set for KMIP request");
|
72
76
|
goto fail;
|
73
77
|
}
|
74
78
|
|
75
|
-
/* The KMIP createDataKey flow is the following:
|
76
|
-
*
|
77
|
-
* 1. Send a KMIP Register request with a new 96 byte key as a SecretData
|
78
|
-
* managed object. This returns a Unique Identifier.
|
79
|
-
* 2. Send a KMIP Activate request with the Unique Identifier.
|
80
|
-
* This returns the same Unique Identifier.
|
81
|
-
* 3. Send a KMIP Get request with the Unique Identifier.
|
82
|
-
* This returns the 96 byte SecretData.
|
83
|
-
* 4. Use the 96 byte SecretData to encrypt a new DEK.
|
84
|
-
*
|
85
|
-
* If the user set a 'keyId' to use, the flow begins at step 3.
|
86
|
-
*/
|
87
|
-
|
88
79
|
if (user_supplied_keyid && !dkctx->kmip_unique_identifier) {
|
89
80
|
/* User set a 'keyId'. */
|
90
81
|
dkctx->kmip_unique_identifier = bson_strdup(user_supplied_keyid);
|
91
82
|
dkctx->kmip_activated = true;
|
92
|
-
/* Fall through to Step 3. */
|
93
83
|
}
|
94
84
|
|
95
|
-
if (
|
96
|
-
/*
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
85
|
+
if (delegated) {
|
86
|
+
/*
|
87
|
+
* The KMIP delegated createDataKey flow is the following:
|
88
|
+
* 1. Send a KMIP Create request (symmetric key) (returns keyId)
|
89
|
+
* 2. Send a KMIP Activate request with that keyId
|
90
|
+
* 3. Send a KMIP Encrypt request to encrypt the DEK
|
91
|
+
*
|
92
|
+
* Steps 1 and 2 are skipped if the user provided a keyId
|
93
|
+
*/
|
94
|
+
|
95
|
+
if (!dkctx->kmip_unique_identifier) {
|
96
|
+
/* User did not set a 'keyId'. */
|
97
|
+
/* Step 1. Send a KMIP Create request for a new AES-256 symmetric key. */
|
98
|
+
if (!_mongocrypt_kms_ctx_init_kmip_create(&dkctx->kms, endpoint, ctx->opts.kek.kmsid, &ctx->crypt->log)) {
|
99
|
+
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
100
|
+
goto fail;
|
101
|
+
}
|
102
|
+
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
103
|
+
goto success;
|
102
104
|
}
|
103
105
|
|
104
|
-
if (!
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
106
|
+
if (!dkctx->kmip_activated) {
|
107
|
+
/* Step 2. Send a KMIP Activate request. */
|
108
|
+
if (!_mongocrypt_kms_ctx_init_kmip_activate(&dkctx->kms,
|
109
|
+
endpoint,
|
110
|
+
dkctx->kmip_unique_identifier,
|
111
|
+
ctx->opts.kek.kmsid,
|
112
|
+
&ctx->crypt->log)) {
|
113
|
+
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
114
|
+
goto fail;
|
115
|
+
}
|
116
|
+
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
117
|
+
goto success;
|
111
118
|
}
|
112
|
-
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
113
119
|
|
114
|
-
|
115
|
-
|
120
|
+
if (!dkctx->encrypted_key_material.data) {
|
121
|
+
/* Step 3. Have the KMS encrypt a new DEK. */
|
122
|
+
if (!_mongocrypt_kms_ctx_init_kmip_encrypt(&dkctx->kms,
|
123
|
+
endpoint,
|
124
|
+
dkctx->kmip_unique_identifier,
|
125
|
+
ctx->opts.kek.kmsid,
|
126
|
+
&dkctx->plaintext_key_material,
|
127
|
+
&ctx->crypt->log)) {
|
128
|
+
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
129
|
+
goto fail;
|
130
|
+
}
|
131
|
+
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
132
|
+
goto success;
|
133
|
+
}
|
134
|
+
} else {
|
135
|
+
/* The KMIP createDataKey flow is the following:
|
136
|
+
*
|
137
|
+
* 1. Send a KMIP Register request with a new 96 byte key as a SecretData
|
138
|
+
* managed object. This returns a Unique Identifier.
|
139
|
+
* 2. Send a KMIP Activate request with the Unique Identifier.
|
140
|
+
* This returns the same Unique Identifier.
|
141
|
+
* 3. Send a KMIP Get request with the Unique Identifier.
|
142
|
+
* This returns the 96 byte SecretData.
|
143
|
+
* 4. Use the 96 byte SecretData to encrypt a new DEK.
|
144
|
+
*
|
145
|
+
* If the user set a 'keyId' to use, the flow begins at step 3.
|
146
|
+
*/
|
147
|
+
if (!dkctx->kmip_unique_identifier) {
|
148
|
+
/* User did not set a 'keyId'. */
|
149
|
+
/* Step 1. Send a KMIP Register request with a new 96 byte SecretData. */
|
150
|
+
_mongocrypt_buffer_init(&secretdata);
|
151
|
+
_mongocrypt_buffer_resize(&secretdata, MONGOCRYPT_KEY_LEN);
|
152
|
+
if (!_mongocrypt_random(ctx->crypt->crypto, &secretdata, MONGOCRYPT_KEY_LEN, ctx->status)) {
|
153
|
+
goto fail;
|
154
|
+
}
|
116
155
|
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
156
|
+
if (!_mongocrypt_kms_ctx_init_kmip_register(&dkctx->kms,
|
157
|
+
endpoint,
|
158
|
+
secretdata.data,
|
159
|
+
secretdata.len,
|
160
|
+
ctx->opts.kek.kmsid,
|
161
|
+
&ctx->crypt->log)) {
|
162
|
+
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
163
|
+
goto fail;
|
164
|
+
}
|
165
|
+
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
166
|
+
goto success;
|
125
167
|
}
|
126
|
-
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
127
|
-
goto success;
|
128
|
-
}
|
129
168
|
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
169
|
+
if (!dkctx->kmip_activated) {
|
170
|
+
/* Step 2. Send a KMIP Activate request. */
|
171
|
+
if (!_mongocrypt_kms_ctx_init_kmip_activate(&dkctx->kms,
|
172
|
+
endpoint,
|
173
|
+
dkctx->kmip_unique_identifier,
|
174
|
+
ctx->opts.kek.kmsid,
|
175
|
+
&ctx->crypt->log)) {
|
176
|
+
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
177
|
+
goto fail;
|
178
|
+
}
|
179
|
+
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
180
|
+
goto success;
|
138
181
|
}
|
139
|
-
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
140
|
-
goto success;
|
141
|
-
}
|
142
182
|
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
183
|
+
if (!dkctx->kmip_secretdata.data) {
|
184
|
+
/* Step 3. Send a KMIP Get request with the Unique Identifier. */
|
185
|
+
if (!_mongocrypt_kms_ctx_init_kmip_get(&dkctx->kms,
|
186
|
+
endpoint,
|
187
|
+
dkctx->kmip_unique_identifier,
|
188
|
+
ctx->opts.kek.kmsid,
|
189
|
+
&ctx->crypt->log)) {
|
190
|
+
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
191
|
+
goto fail;
|
192
|
+
}
|
193
|
+
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
194
|
+
goto success;
|
195
|
+
}
|
196
|
+
|
197
|
+
/* Step 4. Use the 96 byte SecretData to encrypt a new DEK. */
|
198
|
+
if (!_mongocrypt_wrap_key(ctx->crypt->crypto,
|
199
|
+
&dkctx->kmip_secretdata,
|
200
|
+
&dkctx->plaintext_key_material,
|
201
|
+
&dkctx->encrypted_key_material,
|
202
|
+
ctx->status)) {
|
203
|
+
goto fail;
|
204
|
+
}
|
150
205
|
}
|
151
206
|
|
152
207
|
if (!ctx->opts.kek.provider.kmip.key_id) {
|
@@ -180,14 +235,23 @@ static bool _kms_start(mongocrypt_ctx_t *ctx) {
|
|
180
235
|
|
181
236
|
dkctx = (_mongocrypt_ctx_datakey_t *)ctx;
|
182
237
|
|
238
|
+
mc_kms_creds_t kc;
|
239
|
+
if (!_mongocrypt_opts_kms_providers_lookup(kms_providers, ctx->opts.kek.kmsid, &kc)) {
|
240
|
+
mongocrypt_status_t *status = ctx->status;
|
241
|
+
CLIENT_ERR("KMS provider `%s` is not configured", ctx->opts.kek.kmsid);
|
242
|
+
_mongocrypt_ctx_fail(ctx);
|
243
|
+
goto done;
|
244
|
+
}
|
245
|
+
|
183
246
|
/* Clear out any pre-existing initialized KMS context, and zero it (so it is
|
184
247
|
* safe to call cleanup again). */
|
185
248
|
_mongocrypt_kms_ctx_cleanup(&dkctx->kms);
|
186
249
|
memset(&dkctx->kms, 0, sizeof(dkctx->kms));
|
187
250
|
dkctx->kms_returned = false;
|
188
251
|
if (ctx->opts.kek.kms_provider == MONGOCRYPT_KMS_PROVIDER_LOCAL) {
|
252
|
+
BSON_ASSERT(kc.type == MONGOCRYPT_KMS_PROVIDER_LOCAL);
|
189
253
|
if (!_mongocrypt_wrap_key(ctx->crypt->crypto,
|
190
|
-
&
|
254
|
+
&kc.value.local.key,
|
191
255
|
&dkctx->plaintext_key_material,
|
192
256
|
&dkctx->encrypted_key_material,
|
193
257
|
ctx->status)) {
|
@@ -203,8 +267,9 @@ static bool _kms_start(mongocrypt_ctx_t *ctx) {
|
|
203
267
|
kms_providers,
|
204
268
|
&ctx->opts,
|
205
269
|
&dkctx->plaintext_key_material,
|
206
|
-
|
207
|
-
ctx->
|
270
|
+
ctx->crypt->crypto,
|
271
|
+
ctx->opts.kek.kmsid,
|
272
|
+
&ctx->crypt->log)) {
|
208
273
|
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
209
274
|
_mongocrypt_ctx_fail(ctx);
|
210
275
|
goto done;
|
@@ -212,27 +277,30 @@ static bool _kms_start(mongocrypt_ctx_t *ctx) {
|
|
212
277
|
|
213
278
|
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
214
279
|
} else if (ctx->opts.kek.kms_provider == MONGOCRYPT_KMS_PROVIDER_AZURE) {
|
215
|
-
|
216
|
-
|
280
|
+
BSON_ASSERT(kc.type == MONGOCRYPT_KMS_PROVIDER_AZURE);
|
281
|
+
if (kc.value.azure.access_token) {
|
282
|
+
access_token = bson_strdup(kc.value.azure.access_token);
|
217
283
|
} else {
|
218
|
-
access_token =
|
284
|
+
access_token = mc_mapof_kmsid_to_token_get_token(ctx->crypt->cache_oauth, ctx->opts.kek.kmsid);
|
219
285
|
}
|
220
286
|
if (access_token) {
|
221
287
|
if (!_mongocrypt_kms_ctx_init_azure_wrapkey(&dkctx->kms,
|
222
|
-
&ctx->crypt->log,
|
223
288
|
kms_providers,
|
224
289
|
&ctx->opts,
|
225
290
|
access_token,
|
226
|
-
&dkctx->plaintext_key_material
|
291
|
+
&dkctx->plaintext_key_material,
|
292
|
+
ctx->opts.kek.kmsid,
|
293
|
+
&ctx->crypt->log)) {
|
227
294
|
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
228
295
|
_mongocrypt_ctx_fail(ctx);
|
229
296
|
goto done;
|
230
297
|
}
|
231
298
|
} else {
|
232
299
|
if (!_mongocrypt_kms_ctx_init_azure_auth(&dkctx->kms,
|
233
|
-
&
|
234
|
-
|
235
|
-
ctx->opts.kek.
|
300
|
+
&kc,
|
301
|
+
ctx->opts.kek.provider.azure.key_vault_endpoint,
|
302
|
+
ctx->opts.kek.kmsid,
|
303
|
+
&ctx->crypt->log)) {
|
236
304
|
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
237
305
|
_mongocrypt_ctx_fail(ctx);
|
238
306
|
goto done;
|
@@ -240,28 +308,31 @@ static bool _kms_start(mongocrypt_ctx_t *ctx) {
|
|
240
308
|
}
|
241
309
|
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
242
310
|
} else if (ctx->opts.kek.kms_provider == MONGOCRYPT_KMS_PROVIDER_GCP) {
|
243
|
-
|
244
|
-
|
311
|
+
BSON_ASSERT(kc.type == MONGOCRYPT_KMS_PROVIDER_GCP);
|
312
|
+
if (NULL != kc.value.gcp.access_token) {
|
313
|
+
access_token = bson_strdup(kc.value.gcp.access_token);
|
245
314
|
} else {
|
246
|
-
access_token =
|
315
|
+
access_token = mc_mapof_kmsid_to_token_get_token(ctx->crypt->cache_oauth, ctx->opts.kek.kmsid);
|
247
316
|
}
|
248
317
|
if (access_token) {
|
249
318
|
if (!_mongocrypt_kms_ctx_init_gcp_encrypt(&dkctx->kms,
|
250
|
-
&ctx->crypt->log,
|
251
319
|
kms_providers,
|
252
320
|
&ctx->opts,
|
253
321
|
access_token,
|
254
|
-
&dkctx->plaintext_key_material
|
322
|
+
&dkctx->plaintext_key_material,
|
323
|
+
ctx->opts.kek.kmsid,
|
324
|
+
&ctx->crypt->log)) {
|
255
325
|
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
256
326
|
_mongocrypt_ctx_fail(ctx);
|
257
327
|
goto done;
|
258
328
|
}
|
259
329
|
} else {
|
260
330
|
if (!_mongocrypt_kms_ctx_init_gcp_auth(&dkctx->kms,
|
261
|
-
&ctx->crypt->log,
|
262
331
|
&ctx->crypt->opts,
|
263
|
-
|
264
|
-
ctx->opts.kek.provider.gcp.endpoint
|
332
|
+
&kc,
|
333
|
+
ctx->opts.kek.provider.gcp.endpoint,
|
334
|
+
ctx->opts.kek.kmsid,
|
335
|
+
&ctx->crypt->log)) {
|
265
336
|
mongocrypt_kms_ctx_status(&dkctx->kms, ctx->status);
|
266
337
|
_mongocrypt_ctx_fail(ctx);
|
267
338
|
goto done;
|
@@ -269,7 +340,7 @@ static bool _kms_start(mongocrypt_ctx_t *ctx) {
|
|
269
340
|
}
|
270
341
|
ctx->state = MONGOCRYPT_CTX_NEED_KMS;
|
271
342
|
} else if (ctx->opts.kek.kms_provider == MONGOCRYPT_KMS_PROVIDER_KMIP) {
|
272
|
-
if (!_kms_kmip_start(ctx)) {
|
343
|
+
if (!_kms_kmip_start(ctx, &kc)) {
|
273
344
|
goto done;
|
274
345
|
}
|
275
346
|
} else {
|
@@ -305,7 +376,10 @@ static bool _kms_done(mongocrypt_ctx_t *ctx) {
|
|
305
376
|
bson_t oauth_response;
|
306
377
|
|
307
378
|
BSON_ASSERT(_mongocrypt_buffer_to_bson(&dkctx->kms.result, &oauth_response));
|
308
|
-
if (!
|
379
|
+
if (!mc_mapof_kmsid_to_token_add_response(ctx->crypt->cache_oauth,
|
380
|
+
ctx->opts.kek.kmsid,
|
381
|
+
&oauth_response,
|
382
|
+
status)) {
|
309
383
|
return _mongocrypt_ctx_fail(ctx);
|
310
384
|
}
|
311
385
|
return _kms_start(ctx);
|
@@ -313,11 +387,15 @@ static bool _kms_done(mongocrypt_ctx_t *ctx) {
|
|
313
387
|
bson_t oauth_response;
|
314
388
|
|
315
389
|
BSON_ASSERT(_mongocrypt_buffer_to_bson(&dkctx->kms.result, &oauth_response));
|
316
|
-
if (!
|
390
|
+
if (!mc_mapof_kmsid_to_token_add_response(ctx->crypt->cache_oauth,
|
391
|
+
ctx->opts.kek.kmsid,
|
392
|
+
&oauth_response,
|
393
|
+
status)) {
|
317
394
|
return _mongocrypt_ctx_fail(ctx);
|
318
395
|
}
|
319
396
|
return _kms_start(ctx);
|
320
|
-
} else if (dkctx->kms.req_type == MONGOCRYPT_KMS_KMIP_REGISTER
|
397
|
+
} else if (dkctx->kms.req_type == MONGOCRYPT_KMS_KMIP_REGISTER
|
398
|
+
|| dkctx->kms.req_type == MONGOCRYPT_KMS_KMIP_CREATE) {
|
321
399
|
dkctx->kmip_unique_identifier = bson_strdup((const char *)dkctx->kms.result.data);
|
322
400
|
return _kms_start(ctx);
|
323
401
|
} else if (dkctx->kms.req_type == MONGOCRYPT_KMS_KMIP_ACTIVATE) {
|
@@ -326,6 +404,9 @@ static bool _kms_done(mongocrypt_ctx_t *ctx) {
|
|
326
404
|
} else if (dkctx->kms.req_type == MONGOCRYPT_KMS_KMIP_GET) {
|
327
405
|
_mongocrypt_buffer_copy_to(&dkctx->kms.result, &dkctx->kmip_secretdata);
|
328
406
|
return _kms_start(ctx);
|
407
|
+
} else if (dkctx->kms.req_type == MONGOCRYPT_KMS_KMIP_ENCRYPT) {
|
408
|
+
_mongocrypt_buffer_copy_to(&dkctx->kms.result, &dkctx->encrypted_key_material);
|
409
|
+
return _kms_start(ctx);
|
329
410
|
}
|
330
411
|
|
331
412
|
/* Store the result. */
|
@@ -475,7 +556,7 @@ bool mongocrypt_ctx_datakey_init(mongocrypt_ctx_t *ctx) {
|
|
475
556
|
}
|
476
557
|
}
|
477
558
|
|
478
|
-
if (_mongocrypt_needs_credentials_for_provider(ctx->crypt, ctx->opts.kek.kms_provider)) {
|
559
|
+
if (_mongocrypt_needs_credentials_for_provider(ctx->crypt, ctx->opts.kek.kms_provider, ctx->opts.kek.kmsid_name)) {
|
479
560
|
ctx->state = MONGOCRYPT_CTX_NEED_KMS_CREDENTIALS;
|
480
561
|
} else if (!_kms_start(ctx)) {
|
481
562
|
goto done;
|
@@ -484,4 +565,4 @@ bool mongocrypt_ctx_datakey_init(mongocrypt_ctx_t *ctx) {
|
|
484
565
|
ret = true;
|
485
566
|
done:
|
486
567
|
return ret;
|
487
|
-
}
|
568
|
+
}
|
@@ -406,7 +406,7 @@ static bool _replace_ciphertext_with_plaintext(void *ctx,
|
|
406
406
|
|
407
407
|
static bool _finalize(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *out) {
|
408
408
|
bson_t as_bson, final_bson;
|
409
|
-
bson_iter_t iter;
|
409
|
+
bson_iter_t iter = {0};
|
410
410
|
_mongocrypt_ctx_decrypt_t *dctx;
|
411
411
|
bool res;
|
412
412
|
|
@@ -504,6 +504,7 @@ static bool _collect_K_KeyID_from_FLE2IndexedEncryptedValueV2(void *ctx,
|
|
504
504
|
|| (in->data[0] == MC_SUBTYPE_FLE2IndexedRangeEncryptedValueV2));
|
505
505
|
|
506
506
|
mc_FLE2IndexedEncryptedValueV2_t *iev = mc_FLE2IndexedEncryptedValueV2_new();
|
507
|
+
_mongocrypt_buffer_t S_Key = {0};
|
507
508
|
CHECK_AND_RETURN(iev);
|
508
509
|
CHECK_AND_RETURN(mc_FLE2IndexedEncryptedValueV2_parse(iev, in, status));
|
509
510
|
|
@@ -511,7 +512,6 @@ static bool _collect_K_KeyID_from_FLE2IndexedEncryptedValueV2(void *ctx,
|
|
511
512
|
CHECK_AND_RETURN(S_KeyId);
|
512
513
|
|
513
514
|
_mongocrypt_key_broker_t *kb = ctx;
|
514
|
-
_mongocrypt_buffer_t S_Key = {0};
|
515
515
|
CHECK_AND_RETURN_KB_STATUS(_mongocrypt_key_broker_decrypted_key_by_id(kb, S_KeyId, &S_Key));
|
516
516
|
|
517
517
|
/* Decrypt InnerEncrypted to get K_KeyId. */
|
@@ -537,6 +537,7 @@ static bool _collect_K_KeyID_from_FLE2IndexedEncryptedValue(void *ctx,
|
|
537
537
|
BSON_ASSERT_PARAM(in);
|
538
538
|
BSON_ASSERT(in->data);
|
539
539
|
bool ret = false;
|
540
|
+
_mongocrypt_buffer_t S_Key = {0};
|
540
541
|
|
541
542
|
BSON_ASSERT((in->data[0] == MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue)
|
542
543
|
|| (in->data[0] == MC_SUBTYPE_FLE2IndexedRangeEncryptedValue));
|
@@ -549,7 +550,6 @@ static bool _collect_K_KeyID_from_FLE2IndexedEncryptedValue(void *ctx,
|
|
549
550
|
CHECK_AND_RETURN(S_KeyId);
|
550
551
|
|
551
552
|
_mongocrypt_key_broker_t *kb = ctx;
|
552
|
-
_mongocrypt_buffer_t S_Key = {0};
|
553
553
|
CHECK_AND_RETURN_KB_STATUS(_mongocrypt_key_broker_decrypted_key_by_id(kb, S_KeyId, &S_Key));
|
554
554
|
|
555
555
|
/* Decrypt InnerEncrypted to get K_KeyId. */
|
@@ -604,7 +604,7 @@ static bool _check_for_K_KeyId(mongocrypt_ctx_t *ctx) {
|
|
604
604
|
}
|
605
605
|
|
606
606
|
bson_t as_bson;
|
607
|
-
bson_iter_t iter;
|
607
|
+
bson_iter_t iter = {0};
|
608
608
|
_mongocrypt_ctx_decrypt_t *dctx = (_mongocrypt_ctx_decrypt_t *)ctx;
|
609
609
|
if (!_mongocrypt_buffer_to_bson(&dctx->original_doc, &as_bson)) {
|
610
610
|
return _mongocrypt_ctx_fail_w_msg(ctx, "error converting original_doc to bson");
|
@@ -843,7 +843,7 @@ static bool _kms_done(mongocrypt_ctx_t *ctx) {
|
|
843
843
|
bool mongocrypt_ctx_decrypt_init(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *doc) {
|
844
844
|
_mongocrypt_ctx_decrypt_t *dctx;
|
845
845
|
bson_t as_bson;
|
846
|
-
bson_iter_t iter;
|
846
|
+
bson_iter_t iter = {0};
|
847
847
|
_mongocrypt_ctx_opts_spec_t opts_spec;
|
848
848
|
|
849
849
|
memset(&opts_spec, 0, sizeof(opts_spec));
|