update with master for kms-divergence-check test

Author: joshbsiegel

.evergreen/config_generator/generate.py

@@ -1,12 +1,6 @@
 #!/usr/bin/env python3
 
 # Generates *.yml files under .evergreen/generated_configs.
-#
-# Install dependencies by running (preferably in a virtual environment):
-#     python -m pip install -r .evergreen/config_generator/requirements.txt
-#
-# Invoke this using the command:
-#     python3 .evergreen/config_generator/generate-config.py
 
 
 import sys

.evergreen/config_generator/requirements.txt

@@ -27,7 +27,7 @@
 Name:      mongo-c-driver
 Summary:   Client library written in C for MongoDB
 Version:   %{up_version}%{?up_prever:~%{up_prever}}
-Release:   1%{?dist}
+Release:   2%{?dist}
 # See THIRD_PARTY_NOTICES
 License:   Apache-2.0 AND ISC AND MIT AND Zlib
 URL:       https://github.com/%{gh_owner}/%{gh_project}
@@ -258,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Mon Oct  7 2024 Remi Collet <[email protected]> - 1.28.0-2
+- rebuild for utf8proc #2316935
+
 * Thu Sep 19 2024 Remi Collet <[email protected]> - 1.28.0-1
 - update to 1.28.0
 - raise dependency to libmongocrypt 1.11.0

.evergreen/etc/mongo-c-driver.spec

@@ -15,6 +15,6 @@
  Summary:   Client library written in C for MongoDB
 -Version:   %{up_version}%{?up_prever:~%{up_prever}}
 +Version:   %{up_version}%{?up_prever}
- Release:   1%{?dist}
+ Release:   2%{?dist}
  # See THIRD_PARTY_NOTICES
  License:   Apache-2.0 AND ISC AND MIT AND Zlib

.evergreen/etc/spec.patch

@@ -40,7 +40,7 @@
     import yaml
     import yamlordereddictloader  # type: ignore
 except ImportError:
-    sys.stderr.write("try 'pip install -r evergreen_config_generator/requirements.txt'\n")
+    sys.stderr.write("try 'poetry install --with=dev'\n")
     raise
 
 

.evergreen/legacy_config_generator/evergreen_config_generator/__init__.py

@@ -28,7 +28,7 @@
     DependencySpec,
 )
 from evergreen_config_lib import shell_mongoc
-from pkg_resources import parse_version
+from packaging.version import Version
 
 
 ToggleStr = Literal["OFF", "ON"]
@@ -474,7 +474,7 @@ def do_is_valid_combination(self) -> bool:
         # CSE has extra requirements
         if self.settings.version != "latest":
             # We only work with 4.2 or newer for CSE
-            require(parse_version(str(self.settings.version)) >= parse_version("4.2"))
+            require(Version(str(self.settings.version)) >= Version("4.2"))
         return True
 
 

.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

@@ -13,7 +13,7 @@ LIBMONGOCRYPT_DIR="$MONGOC_DIR/libmongocrypt-for-kms-divergence-check"
 
 # LIBMONGOCRYPT_GITREF is expected to refer to the version of libmongocrypt
 # where kms-message was last copied.
-LIBMONGOCRYPT_GITREF="f44b2973a07dec80f194014a122689b0800d8413"
+LIBMONGOCRYPT_GITREF="a650d171ed3b552446095817ae2c5c4f7cec43a2"
 
 cleanup() {
     if [ -d "$LIBMONGOCRYPT_DIR" ]; then

.evergreen/scripts/kms-divergence-check.sh

@@ -10,12 +10,16 @@ Platform Support:
 
   * Support for Visual Studio 2013 is dropped.
 
-libmongoc 1.28.1 (unreleased)
-=============================
+libmongoc 1.28.1
+================
 
-Fixed:
+Fixes:
 
   * Do not return result in `mongoc_bulkwritereturn_t` if there are no known successful writes.
+  * Validate lengths in ill-formed server responses.
+  * Do not override read preference when using aggregate with `$out/$merge` with unscanned servers.
+  * Remove unexpected warning if `authSource` in TXT record is overriden by URI option.
+  * Fix crash when non-existent CA file configured with OpenSSL.
 
 libmongoc 1.28.0
 ================

NEWS

@@ -35,7 +35,7 @@ types-docutils = "^0.20.0.1"
 # XXX: These dependencies are only to force certain versions of transitive requirements,
 # but are not required otherwise.
 [tool.poetry.group.ext.dependencies]
-pyyaml = "<5.4"
+pydantic = "^1"
 
 [build-system]
 requires = ["poetry-core"]

poetry.lock

@@ -182,7 +182,7 @@ kms_kmip_request_activate_new (void *reserved, const char *unique_identifer)
    kmip_writer_close_struct (writer); /* KMIP_TAG_RequestHeader */
 
    kmip_writer_begin_struct (writer, KMIP_TAG_BatchItem);
-   /* 0x0A == Get */
+   /* 0x12 == Activate */
    kmip_writer_write_enumeration (writer, KMIP_TAG_Operation, 0x12);
    kmip_writer_begin_struct (writer, KMIP_TAG_RequestPayload);
    kmip_writer_write_string (writer,

pyproject.toml

@@ -57,6 +57,9 @@ kms_response_parser_error (kms_response_parser_t *parser);
 KMS_MSG_EXPORT (void)
 kms_response_parser_destroy (kms_response_parser_t *parser);
 
+KMS_MSG_EXPORT (void)
+kms_response_parser_reset (kms_response_parser_t *parser);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

src/kms-message/src/kms_kmip_request.c

@@ -38,6 +38,14 @@ _parser_init (kms_response_parser_t *parser)
    parser->kmip = NULL;
 }
 
+void
+kms_response_parser_reset (kms_response_parser_t *parser)
+{
+   KMS_ASSERT(!parser->kmip); // KMIP is not-yet supported.  
+   _parser_destroy(parser);  
+   _parser_init(parser);  
+}
+
 kms_response_parser_t *
 kms_response_parser_new (void)
 {

src/kms-message/src/kms_message/kms_response_parser.h

@@ -5,6 +5,20 @@ Deprecated:
 
   * `bson_string_t` and associated functions are deprecated and planned for removal in a future major release.
 
+libbson 1.28.1
+==============
+
+Fixes:
+
+  * Fix large string handling in `bson_string_truncate`.
+  * Fix possible crash in `bson_value_copy`.
+
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Joshua Siegel
+  * Kevin Albertson
+
 libbson 1.28.0
 ==============
 

src/kms-message/src/kms_response_parser.c

@@ -882,7 +882,10 @@ mongoc_stream_t *
 mongoc_stream_tls_openssl_new_with_context (
    mongoc_stream_t *base_stream, const char *host, mongoc_ssl_opt_t *opt, int client, SSL_CTX *ssl_ctx)
 {
-   BSON_ASSERT_PARAM (ssl_ctx);
+   // `ssl_ctx` may be NULL if creating the context failed. Return NULL to signal failure.
+   if (!ssl_ctx) {
+      return NULL;
+   }
    SSL_CTX_up_ref (ssl_ctx);
 
    return create_stream_with_ctx (base_stream, host, opt, client, ssl_ctx);

src/libbson/NEWS

@@ -200,6 +200,16 @@ test_mongoc_ssl_opts_cleanup_zero (void)
    _mongoc_ssl_opts_cleanup (&ssl_opt, false /* free_internal */);
 }
 
+// `test_non_existant_cafile` is a regression test for CDRIVER-5736.
+static void
+test_non_existant_cafile (void)
+{
+   mongoc_client_t *client = mongoc_client_new ("mongodb://localhost:27017/?tls=true&tlsCAFile=/nonexistant/ca.pem");
+   // Ignore return. May return true on Windows hosts. See CDRIVER-5747.
+   mongoc_client_command_simple (client, "admin", tmp_bson ("{'ping': 1}"), NULL, NULL, NULL);
+   mongoc_client_destroy (client);
+}
+
 #endif /* MONGOC_ENABLE_SSL */
 
 void
@@ -208,5 +218,6 @@ test_ssl_install (TestSuite *suite)
 #ifdef MONGOC_ENABLE_SSL
    TestSuite_Add (suite, "/ssl_opt/from_bson", test_mongoc_ssl_opts_from_bson);
    TestSuite_Add (suite, "/ssl_opt/cleanup", test_mongoc_ssl_opts_cleanup_zero);
+   TestSuite_Add (suite, "/ssl_opt/non-existant-cafile", test_non_existant_cafile);
 #endif /* MONGOC_ENABLE_SSL */
 }