@@ -2675,13 +2675,27 @@ test_bypass_spawning_via_helper (const char *auto_encryption_opt)
2675
2675
mongoc_auto_encryption_opts_set_bypass_query_analysis (
2676
2676
auto_encryption_opts , true);
2677
2677
} else if (0 == strcmp (auto_encryption_opt , "cryptSharedLibRequired" )) {
2678
+ bson_t * schema =
2679
+ get_bson_from_json_file ("./src/libmongoc/tests/"
2680
+ "client_side_encryption_prose/external/"
2681
+ "external-schema.json" );
2682
+ BSON_ASSERT (schema );
2683
+ bson_t * schema_map = BCON_NEW ("db.coll" , BCON_DOCUMENT (schema ));
2684
+ mongoc_auto_encryption_opts_set_schema_map (auto_encryption_opts ,
2685
+ schema_map );
2678
2686
check_crypt_shared = true;
2679
2687
char * env_cryptSharedLibPath =
2680
2688
test_framework_getenv ("MONGOC_TEST_CRYPT_SHARED_LIB_PATH" );
2681
2689
BSON_ASSERT (env_cryptSharedLibPath );
2682
2690
BSON_APPEND_UTF8 (extra , "cryptSharedLibPath" , env_cryptSharedLibPath );
2683
2691
BSON_APPEND_BOOL (extra , "cryptSharedLibRequired" , true);
2692
+ BSON_APPEND_UTF8 (
2693
+ extra ,
2694
+ "mongocryptdURI" ,
2695
+ "mongodb://localhost:27021/db?serverSelectionTimeoutMS=1000" );
2684
2696
bson_free (env_cryptSharedLibPath );
2697
+ bson_destroy (schema );
2698
+ bson_destroy (schema_map );
2685
2699
} else {
2686
2700
test_error ("Unexpected 'auto_encryption_opt' argument: %s" ,
2687
2701
auto_encryption_opt );
@@ -2706,7 +2720,7 @@ test_bypass_spawning_via_helper (const char *auto_encryption_opt)
2706
2720
NULL );
2707
2721
}
2708
2722
2709
- /* Insert { 'encrypt ': 'test' }. Should succeed. */
2723
+ /* Insert { 'unencrypted ': 'test' }. Should succeed. */
2710
2724
coll = mongoc_client_get_collection (client_encrypted , "db" , "coll" );
2711
2725
doc_to_insert = BCON_NEW ("unencrypted" , "test" );
2712
2726
ret = mongoc_collection_insert_one (
@@ -2740,8 +2754,9 @@ test_bypass_spawning_via_bypassQueryAnalysis (void *unused)
2740
2754
test_bypass_spawning_via_helper ("bypass_query_analysis" );
2741
2755
}
2742
2756
2757
+ /* Prose Test 8: Bypass Spawning mongocryptd - Via loading shared library */
2743
2758
static void
2744
- test_bypass_spawning_via_cryptSharedLibRequired (void * unused )
2759
+ test_bypass_spawning_via_cryptSharedLibLoaded (void * unused )
2745
2760
{
2746
2761
BSON_UNUSED (unused );
2747
2762
test_bypass_spawning_via_helper ("cryptSharedLibRequired" );
@@ -5773,8 +5788,8 @@ test_client_side_encryption_install (TestSuite *suite)
5773
5788
test_framework_skip_if_max_wire_version_less_than_8 );
5774
5789
TestSuite_AddFull (suite ,
5775
5790
"/client_side_encryption/bypass_spawning_mongocryptd/"
5776
- "cryptSharedLibRequired " ,
5777
- test_bypass_spawning_via_cryptSharedLibRequired ,
5791
+ "cryptSharedLibLoaded " ,
5792
+ test_bypass_spawning_via_cryptSharedLibLoaded ,
5778
5793
NULL ,
5779
5794
NULL ,
5780
5795
test_framework_skip_if_no_client_side_encryption ,
0 commit comments