libmongocrypt-helper 1.7.4.0.1002 → 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 +40 -5
- data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt +29 -24
- data/ext/libmongocrypt/libmongocrypt/CODEOWNERS +1 -4
- data/ext/libmongocrypt/libmongocrypt/Earthfile +522 -0
- 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/CryptClient.cs +25 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClientFactory.cs +8 -4
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Library.cs +35 -3
- 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.Example/MongoDB.Libmongocrypt.Example.csproj +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test/BasicTests.cs +1 -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 +22 -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 +22 -7
- 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 +50 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/encrypted-payload.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/{python/test/data/fle2-find-range-explicit → java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2}/int32/rangeopts.json +3 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/README.md +4 -771
- data/ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst +86 -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 +232 -296
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/compat.py +6 -31
- 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 -254
- 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/requirements-test.txt +7 -0
- 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 +2 -10
- 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 +26 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit-v2/int32/rangeopts.json +14 -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 +991 -343
- 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 +31 -6
- data/ext/libmongocrypt/libmongocrypt/cmake/IntelDFP.cmake +20 -227
- data/ext/libmongocrypt/libmongocrypt/cmake/Patch.cmake +54 -0
- data/ext/libmongocrypt/libmongocrypt/cmake/Platform.cmake +50 -0
- data/ext/libmongocrypt/libmongocrypt/cmake/mongocrypt-config.cmake +21 -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/c6-vault.repo +39 -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/fle2_aead_generate_tests.py +15 -24
- data/ext/libmongocrypt/libmongocrypt/etc/fle2_crypto.py +66 -54
- data/ext/libmongocrypt/libmongocrypt/etc/fle2_generate_tests.py +14 -23
- data/ext/libmongocrypt/libmongocrypt/etc/fle2v2_aead_generate_tests.py +32 -0
- data/ext/libmongocrypt/libmongocrypt/etc/format-all.sh +12 -0
- data/ext/libmongocrypt/libmongocrypt/etc/format.sh +16 -0
- data/ext/libmongocrypt/libmongocrypt/etc/install-package.sh +48 -0
- 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/mongo-inteldfp-libmongocrypt-pr-625.patch +13 -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/cng.c +381 -436
- data/ext/libmongocrypt/libmongocrypt/src/crypto/commoncrypto.c +162 -227
- data/ext/libmongocrypt/libmongocrypt/src/crypto/libcrypto.c +183 -248
- data/ext/libmongocrypt/libmongocrypt/src/crypto/none.c +33 -55
- data/ext/libmongocrypt/libmongocrypt/src/csfle-markup.cpp +175 -205
- data/ext/libmongocrypt/libmongocrypt/src/mc-array-private.h +10 -21
- data/ext/libmongocrypt/libmongocrypt/src/mc-array.c +44 -56
- data/ext/libmongocrypt/libmongocrypt/src/mc-check-conversions-private.h +4 -8
- data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.h +351 -463
- data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.test.cpp +59 -66
- data/ext/libmongocrypt/libmongocrypt/src/mc-efc-private.h +21 -11
- data/ext/libmongocrypt/libmongocrypt/src/mc-efc.c +175 -99
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle-blob-subtype-private.h +18 -10
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder-private.h +69 -70
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder.c +445 -439
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private-v2.h +41 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private.h +11 -18
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-v2.c +135 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload.c +109 -126
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private-v2.h +103 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private.h +28 -31
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-v2.c +173 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload.c +106 -125
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private-v2.h +130 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private.h +36 -44
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-v2.c +382 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload.c +237 -278
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-private-v2.h +133 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-private.h +67 -56
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-v2.c +437 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev.c +454 -325
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-common-private.h +69 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-common.c +182 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-private.h +23 -31
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-v2-private.h +85 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-v2.c +142 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev.c +104 -231
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-range-operator-private.h +8 -7
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds-private.h +56 -56
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds.c +520 -580
- data/ext/libmongocrypt/libmongocrypt/src/mc-optional-private.h +47 -66
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation-private.h +67 -76
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation.c +201 -190
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding-private.h +55 -42
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding.c +809 -558
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-generator.template.h +177 -201
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-private.h +54 -53
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover.c +188 -240
- data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts-private.h +43 -35
- data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts.c +484 -337
- data/ext/libmongocrypt/libmongocrypt/src/mc-reader-private.h +36 -71
- data/ext/libmongocrypt/libmongocrypt/src/mc-reader.c +111 -164
- data/ext/libmongocrypt/libmongocrypt/src/mc-tokens-private.h +87 -65
- data/ext/libmongocrypt/libmongocrypt/src/mc-tokens.c +153 -125
- data/ext/libmongocrypt/libmongocrypt/src/mc-writer-private.h +66 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-writer.c +141 -0
- data/ext/libmongocrypt/libmongocrypt/src/mlib/check.hpp +37 -55
- data/ext/libmongocrypt/libmongocrypt/src/mlib/endian.h +11 -11
- data/ext/libmongocrypt/libmongocrypt/src/mlib/error.h +27 -32
- data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.h +461 -499
- data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.test.cpp +256 -334
- data/ext/libmongocrypt/libmongocrypt/src/mlib/macros.h +4 -5
- data/ext/libmongocrypt/libmongocrypt/src/mlib/path.h +196 -231
- data/ext/libmongocrypt/libmongocrypt/src/mlib/path.test.c +56 -79
- data/ext/libmongocrypt/libmongocrypt/src/mlib/str.h +411 -530
- data/ext/libmongocrypt/libmongocrypt/src/mlib/str.test.c +116 -131
- data/ext/libmongocrypt/libmongocrypt/src/mlib/thread.h +17 -26
- data/ext/libmongocrypt/libmongocrypt/src/mlib/user-check.h +2 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary-private.h +1 -9
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary.c +31 -48
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer-private.h +55 -131
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer.c +442 -565
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-collinfo-private.h +1 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-collinfo.c +28 -45
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key-private.h +11 -17
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key.c +104 -132
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth-private.h +16 -24
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth.c +110 -93
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-private.h +26 -45
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache.c +220 -273
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ciphertext-private.h +13 -25
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ciphertext.c +147 -166
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-compat.h +2 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto-private.h +110 -204
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto.c +1145 -1567
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-datakey.c +510 -476
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-decrypt.c +817 -694
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-encrypt.c +2775 -2697
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-private.h +189 -184
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-rewrap-many-datakey.c +308 -351
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx.c +990 -1139
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-dll-private.h +23 -24
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endian-private.h +44 -58
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endpoint-private.h +21 -25
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endpoint.c +167 -181
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek-private.h +42 -44
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek.c +292 -272
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker-private.h +70 -110
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker.c +1010 -1033
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-private.h +27 -44
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key.c +349 -402
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx-private.h +127 -120
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx.c +1692 -1611
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log-private.h +35 -67
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log.c +49 -83
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking-private.h +31 -36
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking.c +1923 -1479
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-mutex-private.h +7 -12
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts-private.h +124 -107
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts.c +925 -419
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-private.h +99 -122
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-status-private.h +3 -8
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-status.c +92 -119
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-traverse-util-private.h +19 -29
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-traverse-util.c +136 -176
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util-private.h +11 -21
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util.c +98 -136
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.c +924 -1339
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.h +199 -313
- data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_dll.c +83 -79
- data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_mutex.c +20 -28
- data/ext/libmongocrypt/libmongocrypt/src/os_win/os_dll.c +64 -73
- data/ext/libmongocrypt/libmongocrypt/src/os_win/os_mutex.c +8 -16
- data/ext/libmongocrypt/libmongocrypt/test/crypt_shared-stub.cpp +57 -87
- 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-delete/empty/encrypted-payload-v2.json +60 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-delete/success/encrypted-payload-v2.json +67 -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 +5 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/find-indexed-contentionFactor1-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/find-indexed-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-contentionFactor1-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-same-user-and-index-key-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/cmd.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/encrypted-field-map.json +22 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/encrypted-payload.json +40 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/mongocryptd-reply.json +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/cmd.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/cmd.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/encrypted-payload.json +50 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/mongocryptd-reply.json +58 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/cmd.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/double/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/double-precision/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-openinterval/encrypted-payload-v2.json +16 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert/cmd.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date/RNG_DATA.h +65 -65
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/cmd.json +13 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128/RNG_DATA.h +132 -132
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision/RNG_DATA.h +71 -71
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/encrypted-payload.json +53 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/mongocryptd-reply.json +61 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double/RNG_DATA.h +68 -68
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision/RNG_DATA.h +19 -19
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/encrypted-payload.json +47 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/mongocryptd-reply.json +55 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32/RNG_DATA.h +25 -25
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64/RNG_DATA.h +65 -65
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double/RNG_DATA.h +68 -68
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double-precision/RNG_DATA.h +19 -19
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double-precision/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32/RNG_DATA.h +25 -25
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/sparsity-2/RNG_DATA.h +15 -15
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/sparsity-2/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/encrypted-field-map.json +18 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/encrypted-payload.json +14 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/mongocryptd-reply.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/encrypted-field-map.json +22 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/encrypted-payload.json +39 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/iev-v2/FLECrudTest-insertOneRangeV2.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/iev-v2/FLECrudTest-insertOneV2.json +10 -0
- 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/roundtrip/README.md +17 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/aes-ctr.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2-fixed.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2-generated.json +38 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-decrypt.json +35 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-fixed.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-generated.json +122 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2v2-aead-fixed.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2v2-aead-generated.json +122 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/mcgrew.json +12 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/nist.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/README.md +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/mc.json +25 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/server.json +25 -0
- data/ext/libmongocrypt/libmongocrypt/test/example-no-bson.c +4 -4
- data/ext/libmongocrypt/libmongocrypt/test/example-state-machine.c +279 -323
- data/ext/libmongocrypt/libmongocrypt/test/fuzz_kms.c +8 -7
- data/ext/libmongocrypt/libmongocrypt/test/test-dll.cpp +6 -7
- data/ext/libmongocrypt/libmongocrypt/test/test-gcp-auth.c +221 -283
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-efc.c +60 -73
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-equality-payload-v2.c +78 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-range-payload-v2.c +129 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev-v2.c +248 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev.c +467 -414
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup-v2.c +248 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup.c +141 -159
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-uev-v2.c +338 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-uev.c +238 -176
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-rfds.c +373 -474
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-edge-generation.c +421 -388
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-encoding.c +974 -825
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-mincover.c +499 -481
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-rangeopts.c +312 -148
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-reader.c +124 -207
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-tokens.c +249 -213
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-writer.c +176 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.c +632 -808
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.h +22 -2
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert.h +168 -189
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-buffer.c +187 -211
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache-oauth.c +118 -37
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache.c +210 -233
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ciphertext.c +185 -220
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cleanup.c +374 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-compact.c +410 -445
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-hooks.c +798 -812
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.c +142 -135
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.h +70 -71
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto.c +394 -846
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-csfle-lib.c +159 -183
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-decrypt.c +870 -1045
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-encrypt.c +5183 -4717
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-rewrap-many-datakey.c +750 -964
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-setopt.c +1093 -1178
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-datakey.c +348 -420
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-dll.c +23 -30
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-endpoint.c +98 -111
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kek.c +49 -52
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key-broker.c +770 -920
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key-cache.c +354 -407
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key.c +197 -245
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-ctx.c +705 -368
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-responses.c +147 -166
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-local-kms.c +50 -61
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-log.c +85 -100
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-marking.c +1073 -690
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-opts.c +42 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-status.c +46 -58
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-traverse-util.c +381 -451
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.c +55 -67
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.h +7 -10
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.c +879 -918
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.h +119 -169
- 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 +512 -559
- data/ext/libmongocrypt/libmongocrypt/test/util/make_includes.py +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/util/util.c +771 -882
- data/ext/libmongocrypt/libmongocrypt/test/util/util.h +33 -55
- data/lib/libmongocrypt_helper/version.rb +2 -2
- metadata +245 -111
- checksums.yaml.gz.sig +0 -0
- data/ext/libmongocrypt/libmongocrypt/VERSION_CURRENT +0 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/encrypted-payload.json +0 -26
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/key-document.json +0 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/CHANGELOG.md +0 -81
- 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 -39
- data/ext/libmongocrypt/libmongocrypt/bindings/node/index.d.ts +0 -515
- 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 -699
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/common.js +0 -100
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/credentialsProvider.js +0 -33
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/cryptoCallbacks.js +0 -87
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/index.js +0 -42
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/mongocryptdManager.js +0 -66
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/stateMachine.js +0 -487
- data/ext/libmongocrypt/libmongocrypt/bindings/node/package-lock.json +0 -16051
- data/ext/libmongocrypt/libmongocrypt/bindings/node/package.json +0 -81
- data/ext/libmongocrypt/libmongocrypt/bindings/node/src/mongocrypt.cc +0 -929
- data/ext/libmongocrypt/libmongocrypt/bindings/node/src/mongocrypt.h +0 -114
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/autoEncrypter.test.js +0 -953
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/buffer_pool.test.js +0 -91
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/clientEncryption.test.js +0 -701
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/credentialsProvider.test.js +0 -163
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/cryptoCallbacks.test.js +0 -284
- 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/mongocryptdManager.test.js +0 -48
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/release.test.js +0 -59
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/requirements.helper.js +0 -29
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/stateMachine.test.js +0 -331
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/tools/mongodb_reporter.js +0 -325
- data/ext/libmongocrypt/libmongocrypt/bindings/python/setup.py +0 -84
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit/int32/encrypted-payload.json +0 -26
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test-requirements.txt +0 -12
- 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/aes-ctr.cstructs +0 -359
- data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/mongocryptd-reply.json +0 -72
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-aead.cstructs +0 -109
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload.json +0 -26
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/rangeopts.json +0 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/RNG_DATA.h +0 -70
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload.json +0 -8
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/rangeopts.json +0 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/value-to-encrypt.json +0 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2.cstructs +0 -33
- data.tar.gz.sig +0 -0
- metadata.gz.sig +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/key-filter.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/value-to-encrypt.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/value-to-encrypt.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/{java/mongocrypt/src/test/resources/fle2-find-range-explicit → python/test/data/fle2-find-rangePreview-explicit}/int32/rangeopts.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/{test/data/fle2-find-range-explicit/int32-nominmax → bindings/python/test/data/fle2-find-rangePreview-explicit/int32}/value-to-encrypt.json +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,643 +16,583 @@
|
|
16
16
|
|
17
17
|
#include "mc-fle2-rfds-private.h"
|
18
18
|
|
19
|
-
#include "mongocrypt-private.h" // CLIENT_ERR
|
20
19
|
#include "mc-check-conversions-private.h"
|
21
20
|
#include "mc-fle-blob-subtype-private.h" // MC_SUBTYPE_FLE2EncryptionPlaceholder
|
21
|
+
#include "mongocrypt-private.h" // CLIENT_ERR
|
22
22
|
|
23
|
-
#include <math.h> // INFINITY
|
24
23
|
#include "mlib/thread.h" // mlib_once_flag
|
24
|
+
#include <math.h> // INFINITY
|
25
25
|
|
26
|
-
static mc_FLE2RangeOperator_t
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
return FLE2RangeOperator_kNone;
|
41
|
-
}
|
26
|
+
static mc_FLE2RangeOperator_t get_operator_type(const char *key) {
|
27
|
+
BSON_ASSERT_PARAM(key);
|
28
|
+
|
29
|
+
if (0 == strcmp(key, "$gt")) {
|
30
|
+
return FLE2RangeOperator_kGt;
|
31
|
+
} else if (0 == strcmp(key, "$gte")) {
|
32
|
+
return FLE2RangeOperator_kGte;
|
33
|
+
} else if (0 == strcmp(key, "$lt")) {
|
34
|
+
return FLE2RangeOperator_kLt;
|
35
|
+
} else if (0 == strcmp(key, "$lte")) {
|
36
|
+
return FLE2RangeOperator_kLte;
|
37
|
+
} else {
|
38
|
+
return FLE2RangeOperator_kNone;
|
39
|
+
}
|
42
40
|
}
|
43
41
|
|
44
|
-
static const char *
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
return "$lt";
|
54
|
-
case FLE2RangeOperator_kLte:
|
55
|
-
return "$lte";
|
56
|
-
case FLE2RangeOperator_kNone:
|
57
|
-
return "none";
|
58
|
-
default:
|
59
|
-
return "Unknown";
|
60
|
-
}
|
42
|
+
static const char *mc_FLE2RangeOperator_to_string(mc_FLE2RangeOperator_t op) {
|
43
|
+
switch (op) {
|
44
|
+
case FLE2RangeOperator_kGt: return "$gt";
|
45
|
+
case FLE2RangeOperator_kGte: return "$gte";
|
46
|
+
case FLE2RangeOperator_kLt: return "$lt";
|
47
|
+
case FLE2RangeOperator_kLte: return "$lte";
|
48
|
+
case FLE2RangeOperator_kNone: return "none";
|
49
|
+
default: return "Unknown";
|
50
|
+
}
|
61
51
|
}
|
62
52
|
|
63
|
-
static bool
|
64
|
-
|
65
|
-
|
66
|
-
BSON_ASSERT_PARAM (key);
|
67
|
-
return get_operator_type (key) != FLE2RangeOperator_kNone;
|
53
|
+
static bool is_supported_operator(const char *key) {
|
54
|
+
BSON_ASSERT_PARAM(key);
|
55
|
+
return get_operator_type(key) != FLE2RangeOperator_kNone;
|
68
56
|
}
|
69
57
|
|
70
58
|
// Suffix an error message with the JSON string form of bson.
|
71
|
-
#define ERR_WITH_BSON(bson, fmt, ...)
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
59
|
+
#define ERR_WITH_BSON(bson, fmt, ...) \
|
60
|
+
if (1) { \
|
61
|
+
char *_str = bson_as_canonical_extended_json((bson), NULL); \
|
62
|
+
CLIENT_ERR(fmt ": %s", __VA_ARGS__, _str); \
|
63
|
+
bson_free(_str); \
|
64
|
+
} else \
|
65
|
+
(void)0
|
78
66
|
|
79
67
|
// Parses a document like {$and: []} and outputs an iterator to the array.
|
80
|
-
static bool
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
in, "unexpected extra key '%s' after '$and'", bson_iter_key (&and));
|
104
|
-
return false;
|
105
|
-
}
|
106
|
-
return true;
|
68
|
+
static bool parse_and(const bson_t *in, bson_iter_t *out, mongocrypt_status_t *status) {
|
69
|
+
BSON_ASSERT_PARAM(in);
|
70
|
+
BSON_ASSERT_PARAM(out);
|
71
|
+
BSON_ASSERT(status || true);
|
72
|
+
|
73
|
+
bson_iter_t and = {0};
|
74
|
+
if (!bson_iter_init(&and, in) || !bson_iter_next(&and) || 0 != strcmp(bson_iter_key(&and), "$and")) {
|
75
|
+
ERR_WITH_BSON(in, "%s", "error unable to find '$and'");
|
76
|
+
return false;
|
77
|
+
}
|
78
|
+
|
79
|
+
if (!BSON_ITER_HOLDS_ARRAY(&and)) {
|
80
|
+
ERR_WITH_BSON(in, "%s", "expected '$and' to be array");
|
81
|
+
return false;
|
82
|
+
}
|
83
|
+
|
84
|
+
*out = and;
|
85
|
+
|
86
|
+
if (bson_iter_next(&and)) {
|
87
|
+
ERR_WITH_BSON(in, "unexpected extra key '%s' after '$and'", bson_iter_key(&and));
|
88
|
+
return false;
|
89
|
+
}
|
90
|
+
return true;
|
107
91
|
}
|
108
92
|
|
109
93
|
typedef struct {
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
94
|
+
const char *op_type_str;
|
95
|
+
const char *field;
|
96
|
+
bson_iter_t value;
|
97
|
+
mc_FLE2RangeOperator_t op_type;
|
114
98
|
} operator_value_t;
|
115
99
|
|
116
100
|
// Parses a document like {$gt: ["$age", 5]}.
|
117
101
|
static bool
|
118
|
-
parse_aggregate_expression
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
*out = (operator_value_t){
|
170
|
-
.field = field,
|
171
|
-
.op_type_str = op_type_str,
|
172
|
-
.op_type = get_operator_type (op_type_str),
|
173
|
-
.value = value,
|
174
|
-
};
|
175
|
-
|
176
|
-
ok = true;
|
102
|
+
parse_aggregate_expression(const bson_t *orig, bson_iter_t *in, operator_value_t *out, mongocrypt_status_t *status) {
|
103
|
+
BSON_ASSERT_PARAM(orig);
|
104
|
+
BSON_ASSERT_PARAM(in);
|
105
|
+
BSON_ASSERT_PARAM(out);
|
106
|
+
BSON_ASSERT(status || true);
|
107
|
+
|
108
|
+
bson_iter_t array = {0}, value;
|
109
|
+
const char *op_type_str = bson_iter_key(in);
|
110
|
+
bool ok = false;
|
111
|
+
const char *field;
|
112
|
+
|
113
|
+
if (!BSON_ITER_HOLDS_ARRAY(in)) {
|
114
|
+
ERR_WITH_BSON(orig, "%s", "expected argument to be array");
|
115
|
+
goto fail;
|
116
|
+
}
|
117
|
+
|
118
|
+
if (!bson_iter_recurse(in, &array)) {
|
119
|
+
ERR_WITH_BSON(orig, "%s", "failed to recurse into array");
|
120
|
+
goto fail;
|
121
|
+
}
|
122
|
+
|
123
|
+
// Expect exactly 2 elements, like ["$age", 5]. The first element is the
|
124
|
+
// field path. The second element is the value.
|
125
|
+
if (!bson_iter_next(&array)) {
|
126
|
+
ERR_WITH_BSON(orig, "expected 2 elements in operand %s, got 0", op_type_str);
|
127
|
+
goto fail;
|
128
|
+
}
|
129
|
+
if (!BSON_ITER_HOLDS_UTF8(&array)) {
|
130
|
+
ERR_WITH_BSON(orig, "expected UTF-8 as first element in %s", op_type_str);
|
131
|
+
goto fail;
|
132
|
+
}
|
133
|
+
field = bson_iter_utf8(&array, NULL);
|
134
|
+
|
135
|
+
if (!bson_iter_next(&array)) {
|
136
|
+
ERR_WITH_BSON(orig, "expected 2 elements in operand %s, got 1", op_type_str);
|
137
|
+
goto fail;
|
138
|
+
}
|
139
|
+
value = array;
|
140
|
+
if (bson_iter_next(&array)) {
|
141
|
+
ERR_WITH_BSON(orig, "expected 2 elements in operand %s, got > 2", op_type_str);
|
142
|
+
goto fail;
|
143
|
+
}
|
144
|
+
|
145
|
+
*out = (operator_value_t){
|
146
|
+
.field = field,
|
147
|
+
.op_type_str = op_type_str,
|
148
|
+
.op_type = get_operator_type(op_type_str),
|
149
|
+
.value = value,
|
150
|
+
};
|
151
|
+
|
152
|
+
ok = true;
|
177
153
|
fail:
|
178
|
-
|
154
|
+
return ok;
|
179
155
|
}
|
180
156
|
|
181
157
|
// Parses a document like {age: {$gt: 5}}.
|
182
158
|
static bool
|
183
|
-
parse_match_expression
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
.value = value,
|
230
|
-
};
|
231
|
-
|
232
|
-
ok = true;
|
159
|
+
parse_match_expression(const bson_t *orig, bson_iter_t *in, operator_value_t *out, mongocrypt_status_t *status) {
|
160
|
+
BSON_ASSERT_PARAM(orig);
|
161
|
+
BSON_ASSERT_PARAM(in);
|
162
|
+
BSON_ASSERT_PARAM(out);
|
163
|
+
BSON_ASSERT(status || true);
|
164
|
+
|
165
|
+
bson_iter_t document = {0}, value;
|
166
|
+
const char *op_type_str;
|
167
|
+
bool ok = false;
|
168
|
+
const char *field = bson_iter_key(in);
|
169
|
+
|
170
|
+
if (!BSON_ITER_HOLDS_DOCUMENT(in)) {
|
171
|
+
ERR_WITH_BSON(orig, "%s", "expected argument to be document");
|
172
|
+
goto fail;
|
173
|
+
}
|
174
|
+
|
175
|
+
if (!bson_iter_recurse(in, &document)) {
|
176
|
+
ERR_WITH_BSON(orig, "%s", "failed to recurse into document");
|
177
|
+
goto fail;
|
178
|
+
}
|
179
|
+
|
180
|
+
// Expect exactly 1 elements, like {$gt: 5}.
|
181
|
+
if (!bson_iter_next(&document)) {
|
182
|
+
ERR_WITH_BSON(orig, "expected 1 elements in operand %s, got 0", field);
|
183
|
+
goto fail;
|
184
|
+
}
|
185
|
+
op_type_str = bson_iter_key(&document);
|
186
|
+
if (!is_supported_operator(op_type_str)) {
|
187
|
+
ERR_WITH_BSON(orig, "unsupported operator: %s", op_type_str);
|
188
|
+
goto fail;
|
189
|
+
}
|
190
|
+
value = document;
|
191
|
+
|
192
|
+
if (bson_iter_next(&document)) {
|
193
|
+
ERR_WITH_BSON(orig, "expected 1 elements in operand %s, got > 1", field);
|
194
|
+
goto fail;
|
195
|
+
}
|
196
|
+
|
197
|
+
*out = (operator_value_t){
|
198
|
+
.field = field,
|
199
|
+
.op_type_str = op_type_str,
|
200
|
+
.op_type = get_operator_type(op_type_str),
|
201
|
+
.value = value,
|
202
|
+
};
|
203
|
+
|
204
|
+
ok = true;
|
233
205
|
fail:
|
234
|
-
|
206
|
+
return ok;
|
235
207
|
}
|
236
208
|
|
237
|
-
bool
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
if (!BSON_ITER_HOLDS_DOCUMENT (&array)) {
|
269
|
-
ERR_WITH_BSON (in, "%s", "expected document in '$and' array");
|
270
|
-
goto fail;
|
271
|
-
}
|
272
|
-
|
273
|
-
if (!bson_iter_recurse (&array, &doc)) {
|
274
|
-
ERR_WITH_BSON (in, "%s", "failed to recurse into '$and' element");
|
275
|
-
goto fail;
|
276
|
-
}
|
277
|
-
|
278
|
-
if (!bson_iter_next (&doc)) {
|
279
|
-
ERR_WITH_BSON (in, "%s", "unexpected empty '$and' array document");
|
280
|
-
goto fail;
|
281
|
-
}
|
282
|
-
|
283
|
-
if (arg_type == UNKNOWN) {
|
284
|
-
// Attempt to determine argument type by inspecting first key.
|
285
|
-
if (is_supported_operator (bson_iter_key (&doc))) {
|
286
|
-
// Assume the document is part of an Aggregate Expression, like:
|
287
|
-
// {$gt: ["$age", 5]}
|
288
|
-
arg_type = AGGREGATE_EXPRESSION;
|
289
|
-
spec->isAggregateExpression = true;
|
290
|
-
} else {
|
291
|
-
// Assume the document is part of a Match Expression, like:
|
292
|
-
// {age: {$gt: 5}}
|
293
|
-
arg_type = MATCH_EXPRESSION;
|
294
|
-
}
|
295
|
-
}
|
296
|
-
|
297
|
-
operator_value_t op;
|
298
|
-
switch (arg_type) {
|
299
|
-
case AGGREGATE_EXPRESSION:
|
300
|
-
if (!parse_aggregate_expression (in, &doc, &op, status)) {
|
209
|
+
bool mc_FLE2RangeFindDriverSpec_parse(mc_FLE2RangeFindDriverSpec_t *spec,
|
210
|
+
const bson_t *in,
|
211
|
+
mongocrypt_status_t *status) {
|
212
|
+
BSON_ASSERT_PARAM(in);
|
213
|
+
BSON_ASSERT(status || true);
|
214
|
+
|
215
|
+
*spec = (mc_FLE2RangeFindDriverSpec_t){0};
|
216
|
+
// `in` may be an Aggregate Expression with this form:
|
217
|
+
// {$and: [{$gt: ["$age", 5]}, {$lt:["$age", 50]}]}
|
218
|
+
// Or `in` may be a Match Expression with this form:
|
219
|
+
// {$and: [{age: {$gt: 5}}, {age: {$lt: 50}} ]}
|
220
|
+
bson_iter_t and = {0}, array = {0};
|
221
|
+
bool ok = false;
|
222
|
+
|
223
|
+
if (!parse_and(in, &and, status)) {
|
224
|
+
goto fail;
|
225
|
+
}
|
226
|
+
|
227
|
+
// Iterate over array elements.
|
228
|
+
if (!bson_iter_recurse(&and, &array)) {
|
229
|
+
ERR_WITH_BSON(in, "%s", "failed to recurse into '$and'");
|
230
|
+
goto fail;
|
231
|
+
}
|
232
|
+
|
233
|
+
enum { UNKNOWN, MATCH_EXPRESSION, AGGREGATE_EXPRESSION } arg_type = UNKNOWN;
|
234
|
+
|
235
|
+
while (bson_iter_next(&array)) {
|
236
|
+
bson_iter_t doc;
|
237
|
+
|
238
|
+
if (!BSON_ITER_HOLDS_DOCUMENT(&array)) {
|
239
|
+
ERR_WITH_BSON(in, "%s", "expected document in '$and' array");
|
301
240
|
goto fail;
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
241
|
+
}
|
242
|
+
|
243
|
+
if (!bson_iter_recurse(&array, &doc)) {
|
244
|
+
ERR_WITH_BSON(in, "%s", "failed to recurse into '$and' element");
|
245
|
+
goto fail;
|
246
|
+
}
|
247
|
+
|
248
|
+
if (!bson_iter_next(&doc)) {
|
249
|
+
ERR_WITH_BSON(in, "%s", "unexpected empty '$and' array document");
|
306
250
|
goto fail;
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
251
|
+
}
|
252
|
+
|
253
|
+
if (arg_type == UNKNOWN) {
|
254
|
+
// Attempt to determine argument type by inspecting first key.
|
255
|
+
if (is_supported_operator(bson_iter_key(&doc))) {
|
256
|
+
// Assume the document is part of an Aggregate Expression, like:
|
257
|
+
// {$gt: ["$age", 5]}
|
258
|
+
arg_type = AGGREGATE_EXPRESSION;
|
259
|
+
spec->isAggregateExpression = true;
|
260
|
+
} else {
|
261
|
+
// Assume the document is part of a Match Expression, like:
|
262
|
+
// {age: {$gt: 5}}
|
263
|
+
arg_type = MATCH_EXPRESSION;
|
264
|
+
}
|
265
|
+
}
|
266
|
+
|
267
|
+
operator_value_t op = {0};
|
268
|
+
switch (arg_type) {
|
269
|
+
case AGGREGATE_EXPRESSION:
|
270
|
+
if (!parse_aggregate_expression(in, &doc, &op, status)) {
|
271
|
+
goto fail;
|
272
|
+
}
|
273
|
+
break;
|
274
|
+
case MATCH_EXPRESSION:
|
275
|
+
if (!parse_match_expression(in, &doc, &op, status)) {
|
276
|
+
goto fail;
|
277
|
+
}
|
278
|
+
break;
|
279
|
+
case UNKNOWN:
|
280
|
+
default: ERR_WITH_BSON(in, "%s", "unexpected unknown expression type"); goto fail;
|
281
|
+
}
|
282
|
+
|
283
|
+
switch (op.op_type) {
|
284
|
+
case FLE2RangeOperator_kGt:
|
285
|
+
case FLE2RangeOperator_kGte:
|
286
|
+
if (spec->lower.set) {
|
287
|
+
ERR_WITH_BSON(in, "unexpected duplicate bound %s", op.op_type_str);
|
288
|
+
goto fail;
|
289
|
+
}
|
290
|
+
spec->lower.set = true;
|
291
|
+
spec->lower.value = op.value;
|
292
|
+
spec->lower.included = op.op_type == FLE2RangeOperator_kGte;
|
293
|
+
break;
|
294
|
+
case FLE2RangeOperator_kLt:
|
295
|
+
case FLE2RangeOperator_kLte:
|
296
|
+
if (spec->upper.set) {
|
297
|
+
ERR_WITH_BSON(in, "unexpected duplicate bound %s", op.op_type_str);
|
298
|
+
goto fail;
|
299
|
+
}
|
300
|
+
spec->upper.set = true;
|
301
|
+
spec->upper.value = op.value;
|
302
|
+
spec->upper.included = op.op_type == FLE2RangeOperator_kLte;
|
303
|
+
break;
|
304
|
+
case FLE2RangeOperator_kNone:
|
305
|
+
default:
|
306
|
+
ERR_WITH_BSON(in, "unsupported operator type %s", op.op_type_str);
|
320
307
|
goto fail;
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
308
|
+
break;
|
309
|
+
}
|
310
|
+
|
311
|
+
if (spec->field && 0 != strcmp(spec->field, op.field)) {
|
312
|
+
ERR_WITH_BSON(in,
|
313
|
+
"unexpected field mismatch. Expected all fields to be "
|
314
|
+
"%s, but got %s",
|
315
|
+
spec->field,
|
316
|
+
op.field);
|
330
317
|
goto fail;
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
"unexpected field mismatch. Expected all fields to be "
|
346
|
-
"%s, but got %s",
|
347
|
-
spec->field,
|
348
|
-
op.field);
|
349
|
-
goto fail;
|
350
|
-
}
|
351
|
-
|
352
|
-
spec->nOps++;
|
353
|
-
|
354
|
-
switch (spec->nOps) {
|
355
|
-
case 1:
|
356
|
-
spec->firstOp = op.op_type;
|
357
|
-
break;
|
358
|
-
case 2:
|
359
|
-
spec->secondOp = op.op_type;
|
360
|
-
break;
|
361
|
-
default:
|
362
|
-
ERR_WITH_BSON (
|
363
|
-
in, "expected 1 or 2 operators, got > 2: %s", op.op_type_str);
|
364
|
-
goto fail;
|
365
|
-
}
|
366
|
-
|
367
|
-
spec->field = op.field;
|
368
|
-
}
|
369
|
-
|
370
|
-
ok = true;
|
318
|
+
}
|
319
|
+
|
320
|
+
spec->nOps++;
|
321
|
+
|
322
|
+
switch (spec->nOps) {
|
323
|
+
case 1: spec->firstOp = op.op_type; break;
|
324
|
+
case 2: spec->secondOp = op.op_type; break;
|
325
|
+
default: ERR_WITH_BSON(in, "expected 1 or 2 operators, got > 2: %s", op.op_type_str); goto fail;
|
326
|
+
}
|
327
|
+
|
328
|
+
spec->field = op.field;
|
329
|
+
}
|
330
|
+
|
331
|
+
ok = true;
|
371
332
|
fail:
|
372
|
-
|
333
|
+
return ok;
|
373
334
|
}
|
374
335
|
|
375
336
|
// mc_makeRangeFindPlaceholder creates a placeholder to be consumed by
|
376
337
|
// libmongocrypt for encryption.
|
377
|
-
bool
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
TRY (BSON_APPEND_INT64 (p, "s", args->sparsity));
|
338
|
+
bool mc_makeRangeFindPlaceholder(mc_makeRangeFindPlaceholder_args_t *args,
|
339
|
+
_mongocrypt_buffer_t *out,
|
340
|
+
mongocrypt_status_t *status) {
|
341
|
+
BSON_ASSERT_PARAM(args);
|
342
|
+
BSON_ASSERT_PARAM(out);
|
343
|
+
BSON_ASSERT(status || true);
|
344
|
+
|
345
|
+
bool ok = false;
|
346
|
+
bson_t *edgesInfo = bson_new();
|
347
|
+
bson_t *v = bson_new();
|
348
|
+
bson_t *p = bson_new();
|
349
|
+
_mongocrypt_buffer_init(out);
|
350
|
+
|
351
|
+
#define TRY(stmt) \
|
352
|
+
if (!(stmt)) { \
|
353
|
+
CLIENT_ERR("error appending BSON for placeholder"); \
|
354
|
+
goto fail; \
|
355
|
+
}
|
356
|
+
|
357
|
+
// create edgesInfo.
|
358
|
+
|
359
|
+
if (!args->isStub) {
|
360
|
+
TRY(bson_append_iter(edgesInfo, "lowerBound", -1, &args->lowerBound));
|
361
|
+
TRY(BSON_APPEND_BOOL(edgesInfo, "lbIncluded", args->lbIncluded));
|
362
|
+
TRY(bson_append_iter(edgesInfo, "upperBound", -1, &args->upperBound));
|
363
|
+
TRY(BSON_APPEND_BOOL(edgesInfo, "ubIncluded", args->ubIncluded));
|
364
|
+
TRY(bson_append_iter(edgesInfo, "indexMin", -1, &args->indexMin));
|
365
|
+
TRY(bson_append_iter(edgesInfo, "indexMax", -1, &args->indexMax));
|
366
|
+
if (args->precision.set) {
|
367
|
+
TRY(BSON_APPEND_INT32(edgesInfo, "precision", args->precision.value));
|
368
|
+
}
|
369
|
+
if (args->trimFactor.set) {
|
370
|
+
TRY(BSON_APPEND_INT32(edgesInfo, "trimFactor", args->trimFactor.value));
|
371
|
+
}
|
372
|
+
TRY(BSON_APPEND_DOCUMENT(v, "edgesInfo", edgesInfo));
|
373
|
+
}
|
374
|
+
|
375
|
+
// create v.
|
376
|
+
TRY(BSON_APPEND_INT32(v, "payloadId", args->payloadId));
|
377
|
+
TRY(BSON_APPEND_INT32(v, "firstOperator", (int32_t)args->firstOp));
|
378
|
+
if (args->secondOp) {
|
379
|
+
TRY(BSON_APPEND_INT32(v, "secondOperator", (int32_t)args->secondOp));
|
380
|
+
}
|
381
|
+
|
382
|
+
// create placeholder.
|
383
|
+
TRY(BSON_APPEND_INT32(p, "t", MONGOCRYPT_FLE2_PLACEHOLDER_TYPE_FIND));
|
384
|
+
TRY(BSON_APPEND_INT32(p, "a", MONGOCRYPT_FLE2_ALGORITHM_RANGE));
|
385
|
+
TRY(_mongocrypt_buffer_append(args->index_key_id, p, "ki", 2));
|
386
|
+
TRY(_mongocrypt_buffer_append(args->user_key_id, p, "ku", 2));
|
387
|
+
TRY(BSON_APPEND_DOCUMENT(p, "v", v));
|
388
|
+
TRY(BSON_APPEND_INT64(p, "cm", args->maxContentionFactor));
|
389
|
+
TRY(BSON_APPEND_INT64(p, "s", args->sparsity));
|
430
390
|
#undef TRY
|
431
391
|
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
392
|
+
BSON_ASSERT(p->len < UINT32_MAX);
|
393
|
+
_mongocrypt_buffer_resize(out, p->len + 1u);
|
394
|
+
out->subtype = BSON_SUBTYPE_ENCRYPTED;
|
395
|
+
out->data[0] = MC_SUBTYPE_FLE2EncryptionPlaceholder;
|
396
|
+
memcpy(out->data + 1, bson_get_data(p), p->len);
|
437
397
|
|
438
|
-
|
398
|
+
ok = true;
|
439
399
|
fail:
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
400
|
+
bson_destroy(p);
|
401
|
+
bson_destroy(v);
|
402
|
+
bson_destroy(edgesInfo);
|
403
|
+
return ok;
|
444
404
|
}
|
445
405
|
|
446
|
-
bool
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
474
|
-
|
475
|
-
|
476
|
-
|
477
|
-
|
478
|
-
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
|
484
|
-
|
485
|
-
|
486
|
-
|
487
|
-
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
506
|
-
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
|
527
|
-
|
528
|
-
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
536
|
-
|
537
|
-
|
538
|
-
|
539
|
-
|
540
|
-
|
541
|
-
|
542
|
-
|
543
|
-
|
544
|
-
// First operator is the non-stub.
|
545
|
-
if (!mc_makeRangeFindPlaceholder (&args, &p2, status)) {
|
546
|
-
goto fail;
|
547
|
-
}
|
548
|
-
}
|
549
|
-
|
550
|
-
if (spec->isAggregateExpression) {
|
551
|
-
/*
|
552
|
-
Create an Aggregate Expression document like:
|
553
|
-
{
|
554
|
-
"$and" : [
|
555
|
-
{"$gt" : [ "$age", "<placeholder1>" ]},
|
556
|
-
{"$lt" : [ "$age", "<placeholder2>" ]}
|
557
|
-
]
|
558
|
-
}
|
559
|
-
*/
|
560
|
-
bson_t and;
|
561
|
-
TRY (BSON_APPEND_ARRAY_BEGIN (out, "$and", &and));
|
562
|
-
bson_t elem;
|
563
|
-
TRY (BSON_APPEND_DOCUMENT_BEGIN (&and, "0", &elem));
|
564
|
-
bson_t operator;
|
565
|
-
TRY (BSON_APPEND_ARRAY_BEGIN (
|
566
|
-
&elem, mc_FLE2RangeOperator_to_string (spec->firstOp), &operator));
|
567
|
-
TRY (BSON_APPEND_UTF8 (&operator, "0", spec->field));
|
568
|
-
TRY (_mongocrypt_buffer_append (&p1, &operator, "1", 1));
|
569
|
-
TRY (bson_append_array_end (&elem, &operator));
|
570
|
-
TRY (bson_append_document_end (&and, &elem));
|
571
|
-
|
572
|
-
if (spec->nOps == 2) {
|
573
|
-
TRY (BSON_APPEND_DOCUMENT_BEGIN (&and, "1", &elem));
|
574
|
-
TRY (BSON_APPEND_ARRAY_BEGIN (
|
575
|
-
&elem, mc_FLE2RangeOperator_to_string (spec->secondOp), &operator));
|
576
|
-
TRY (BSON_APPEND_UTF8 (&operator, "0", spec->field));
|
577
|
-
TRY (_mongocrypt_buffer_append (&p2, &operator, "1", 1));
|
578
|
-
TRY (bson_append_array_end (&elem, &operator));
|
579
|
-
TRY (bson_append_document_end (&and, &elem));
|
580
|
-
}
|
581
|
-
|
582
|
-
TRY (bson_append_array_end (out, &and));
|
583
|
-
} else {
|
584
|
-
/*
|
585
|
-
Create a Match Expression document like:
|
586
|
-
{
|
406
|
+
bool mc_FLE2RangeFindDriverSpec_to_placeholders(mc_FLE2RangeFindDriverSpec_t *spec,
|
407
|
+
const mc_RangeOpts_t *range_opts,
|
408
|
+
int64_t maxContentionFactor,
|
409
|
+
const _mongocrypt_buffer_t *user_key_id,
|
410
|
+
const _mongocrypt_buffer_t *index_key_id,
|
411
|
+
int32_t payloadId,
|
412
|
+
bson_t *out,
|
413
|
+
mongocrypt_status_t *status) {
|
414
|
+
BSON_ASSERT_PARAM(spec);
|
415
|
+
BSON_ASSERT_PARAM(range_opts);
|
416
|
+
BSON_ASSERT_PARAM(user_key_id);
|
417
|
+
BSON_ASSERT_PARAM(index_key_id);
|
418
|
+
BSON_ASSERT_PARAM(out);
|
419
|
+
BSON_ASSERT(status || true);
|
420
|
+
|
421
|
+
_mongocrypt_buffer_t p1 = {0}, p2 = {0};
|
422
|
+
bson_t infDoc = BSON_INITIALIZER;
|
423
|
+
bson_iter_t negInf, posInf;
|
424
|
+
bson_t minMaxDoc = BSON_INITIALIZER;
|
425
|
+
bson_iter_t indexMin, indexMax;
|
426
|
+
bool ok = false;
|
427
|
+
|
428
|
+
BCON_APPEND(&infDoc, "p", BCON_DOUBLE(INFINITY), "n", BCON_DOUBLE(-INFINITY));
|
429
|
+
|
430
|
+
#define TRY(stmt) \
|
431
|
+
if (!(stmt)) { \
|
432
|
+
CLIENT_ERR("error transforming BSON for FLE2RangeFindDriverSpec: %s", #stmt); \
|
433
|
+
goto fail; \
|
434
|
+
}
|
435
|
+
|
436
|
+
TRY(bson_iter_init_find(&posInf, &infDoc, "p"));
|
437
|
+
TRY(bson_iter_init_find(&negInf, &infDoc, "n"));
|
438
|
+
|
439
|
+
// Apply default index min/max values.
|
440
|
+
{
|
441
|
+
bson_type_t index_type;
|
442
|
+
if (spec->lower.set) {
|
443
|
+
index_type = bson_iter_type(&spec->lower.value);
|
444
|
+
} else if (spec->upper.set) {
|
445
|
+
index_type = bson_iter_type(&spec->upper.value);
|
446
|
+
} else {
|
447
|
+
CLIENT_ERR("expected lower or upper bound to be set");
|
448
|
+
goto fail;
|
449
|
+
}
|
450
|
+
if (!mc_RangeOpts_appendMin(range_opts, index_type, "indexMin", &minMaxDoc, status)) {
|
451
|
+
goto fail;
|
452
|
+
}
|
453
|
+
if (!mc_RangeOpts_appendMax(range_opts, index_type, "indexMax", &minMaxDoc, status)) {
|
454
|
+
goto fail;
|
455
|
+
}
|
456
|
+
|
457
|
+
TRY(bson_iter_init_find(&indexMin, &minMaxDoc, "indexMin"));
|
458
|
+
TRY(bson_iter_init_find(&indexMax, &minMaxDoc, "indexMax"));
|
459
|
+
}
|
460
|
+
|
461
|
+
mc_makeRangeFindPlaceholder_args_t args = {.isStub = false,
|
462
|
+
.user_key_id = user_key_id,
|
463
|
+
.index_key_id = index_key_id,
|
464
|
+
.lowerBound = spec->lower.set ? spec->lower.value : negInf,
|
465
|
+
.lbIncluded = spec->lower.set ? spec->lower.included : true,
|
466
|
+
.upperBound = spec->upper.set ? spec->upper.value : posInf,
|
467
|
+
.ubIncluded = spec->upper.set ? spec->upper.included : true,
|
468
|
+
.payloadId = payloadId,
|
469
|
+
.firstOp = spec->firstOp,
|
470
|
+
.secondOp = spec->secondOp,
|
471
|
+
.indexMin = indexMin,
|
472
|
+
.indexMax = indexMax,
|
473
|
+
.precision = range_opts->precision,
|
474
|
+
.maxContentionFactor = maxContentionFactor,
|
475
|
+
.sparsity = range_opts->sparsity,
|
476
|
+
.trimFactor = range_opts->trimFactor};
|
477
|
+
|
478
|
+
// First operator is the non-stub.
|
479
|
+
if (!mc_makeRangeFindPlaceholder(&args, &p1, status)) {
|
480
|
+
goto fail;
|
481
|
+
}
|
482
|
+
|
483
|
+
// Second operator (if required) is a stub.
|
484
|
+
if (spec->nOps == 2) {
|
485
|
+
mc_makeRangeFindPlaceholder_args_t args = {.isStub = true,
|
486
|
+
.user_key_id = user_key_id,
|
487
|
+
.index_key_id = index_key_id,
|
488
|
+
.payloadId = payloadId,
|
489
|
+
.firstOp = spec->firstOp,
|
490
|
+
.secondOp = spec->secondOp,
|
491
|
+
.maxContentionFactor = maxContentionFactor,
|
492
|
+
.sparsity = range_opts->sparsity};
|
493
|
+
|
494
|
+
// First operator is the non-stub.
|
495
|
+
if (!mc_makeRangeFindPlaceholder(&args, &p2, status)) {
|
496
|
+
goto fail;
|
497
|
+
}
|
498
|
+
}
|
499
|
+
|
500
|
+
if (spec->isAggregateExpression) {
|
501
|
+
/*
|
502
|
+
Create an Aggregate Expression document like:
|
503
|
+
{
|
587
504
|
"$and" : [
|
588
|
-
|
589
|
-
|
590
|
-
|
591
|
-
|
592
|
-
|
593
|
-
|
594
|
-
|
595
|
-
|
596
|
-
|
597
|
-
|
598
|
-
|
599
|
-
|
600
|
-
|
601
|
-
|
602
|
-
|
603
|
-
|
604
|
-
|
605
|
-
|
606
|
-
|
607
|
-
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
|
612
|
-
|
613
|
-
|
614
|
-
|
505
|
+
{"$gt" : [ "$age", "<placeholder1>" ]},
|
506
|
+
{"$lt" : [ "$age", "<placeholder2>" ]}
|
507
|
+
]
|
508
|
+
}
|
509
|
+
*/
|
510
|
+
bson_t and;
|
511
|
+
TRY(BSON_APPEND_ARRAY_BEGIN(out, "$and", &and));
|
512
|
+
bson_t elem;
|
513
|
+
TRY(BSON_APPEND_DOCUMENT_BEGIN(&and, "0", &elem));
|
514
|
+
bson_t operator;
|
515
|
+
TRY(BSON_APPEND_ARRAY_BEGIN(&elem, mc_FLE2RangeOperator_to_string(spec->firstOp), &operator));
|
516
|
+
TRY(BSON_APPEND_UTF8(&operator, "0", spec->field));
|
517
|
+
TRY(_mongocrypt_buffer_append(&p1, &operator, "1", 1));
|
518
|
+
TRY(bson_append_array_end(&elem, &operator));
|
519
|
+
TRY(bson_append_document_end(&and, &elem));
|
520
|
+
|
521
|
+
if (spec->nOps == 2) {
|
522
|
+
TRY(BSON_APPEND_DOCUMENT_BEGIN(&and, "1", &elem));
|
523
|
+
TRY(BSON_APPEND_ARRAY_BEGIN(&elem, mc_FLE2RangeOperator_to_string(spec->secondOp), &operator));
|
524
|
+
TRY(BSON_APPEND_UTF8(&operator, "0", spec->field));
|
525
|
+
TRY(_mongocrypt_buffer_append(&p2, &operator, "1", 1));
|
526
|
+
TRY(bson_append_array_end(&elem, &operator));
|
527
|
+
TRY(bson_append_document_end(&and, &elem));
|
528
|
+
}
|
529
|
+
|
530
|
+
TRY(bson_append_array_end(out, &and));
|
531
|
+
} else {
|
532
|
+
/*
|
533
|
+
Create a Match Expression document like:
|
534
|
+
{
|
535
|
+
"$and" : [
|
536
|
+
{"age" : { "$gt": "<placeholder1>" }},
|
537
|
+
{"age" : { "$lt": "<placeholder2>" }}
|
538
|
+
]
|
539
|
+
}
|
540
|
+
*/
|
541
|
+
bson_t and;
|
542
|
+
TRY(BSON_APPEND_ARRAY_BEGIN(out, "$and", &and));
|
543
|
+
bson_t elem;
|
544
|
+
TRY(BSON_APPEND_DOCUMENT_BEGIN(&and, "0", &elem));
|
545
|
+
bson_t operator;
|
546
|
+
TRY(BSON_APPEND_DOCUMENT_BEGIN(&elem, spec->field, &operator));
|
547
|
+
const char *op_str = mc_FLE2RangeOperator_to_string(spec->firstOp);
|
548
|
+
TRY(_mongocrypt_buffer_append(&p1, &operator, op_str, -1));
|
549
|
+
TRY(bson_append_document_end(&elem, &operator));
|
550
|
+
TRY(bson_append_document_end(&and, &elem));
|
551
|
+
|
552
|
+
if (spec->nOps == 2) {
|
553
|
+
TRY(BSON_APPEND_DOCUMENT_BEGIN(&and, "1", &elem));
|
554
|
+
TRY(BSON_APPEND_DOCUMENT_BEGIN(&elem, spec->field, &operator));
|
555
|
+
const char *op_str = mc_FLE2RangeOperator_to_string(spec->secondOp);
|
556
|
+
TRY(_mongocrypt_buffer_append(&p2, &operator, op_str, -1));
|
557
|
+
TRY(bson_append_document_end(&elem, &operator));
|
558
|
+
TRY(bson_append_document_end(&and, &elem));
|
559
|
+
}
|
560
|
+
|
561
|
+
TRY(bson_append_array_end(out, &and));
|
562
|
+
}
|
615
563
|
|
616
564
|
#undef TRY
|
617
|
-
|
565
|
+
ok = true;
|
618
566
|
fail:
|
619
|
-
|
620
|
-
|
621
|
-
|
622
|
-
|
623
|
-
|
567
|
+
_mongocrypt_buffer_cleanup(&p2);
|
568
|
+
_mongocrypt_buffer_cleanup(&p1);
|
569
|
+
bson_destroy(&minMaxDoc);
|
570
|
+
bson_destroy(&infDoc);
|
571
|
+
return ok;
|
624
572
|
}
|
625
573
|
|
626
574
|
static mlib_once_flag payloadId_init_flag = MLIB_ONCE_INITIALIZER;
|
627
575
|
static mongocrypt_mutex_t payloadId_mutex;
|
628
576
|
static int32_t payloadId = 0;
|
629
577
|
|
630
|
-
static void
|
631
|
-
|
632
|
-
{
|
633
|
-
_mongocrypt_mutex_init (&payloadId_mutex);
|
578
|
+
static void payloadId_init_mutex(void) {
|
579
|
+
_mongocrypt_mutex_init(&payloadId_mutex);
|
634
580
|
}
|
635
581
|
|
636
|
-
void
|
637
|
-
|
638
|
-
{
|
639
|
-
|
640
|
-
|
641
|
-
{
|
642
|
-
payloadId = 0;
|
643
|
-
}
|
582
|
+
void mc_reset_payloadId_for_testing(void) {
|
583
|
+
mlib_call_once(&payloadId_init_flag, payloadId_init_mutex);
|
584
|
+
MONGOCRYPT_WITH_MUTEX(payloadId_mutex) {
|
585
|
+
payloadId = 0;
|
586
|
+
}
|
644
587
|
}
|
645
588
|
|
646
589
|
// mc_getNextPayloadId is thread safe.
|
647
|
-
int32_t
|
648
|
-
|
649
|
-
|
650
|
-
|
651
|
-
|
652
|
-
|
653
|
-
|
654
|
-
|
655
|
-
payloadId = payloadId < INT32_MAX ? payloadId + 1 : 0;
|
656
|
-
}
|
657
|
-
return ret;
|
590
|
+
int32_t mc_getNextPayloadId(void) {
|
591
|
+
mlib_call_once(&payloadId_init_flag, payloadId_init_mutex);
|
592
|
+
int32_t ret;
|
593
|
+
MONGOCRYPT_WITH_MUTEX(payloadId_mutex) {
|
594
|
+
ret = payloadId;
|
595
|
+
payloadId = payloadId < INT32_MAX ? payloadId + 1 : 0;
|
596
|
+
}
|
597
|
+
return ret;
|
658
598
|
}
|