Merge pull request #1089

Author: alcaeus

php_phongo.c

@@ -2795,6 +2795,11 @@ static bool phongo_manager_set_auto_encryption_opts(php_phongo_manager_t* manage
 		zval*  kms_providers  = php_array_fetch(zAutoEncryptionOpts, "kmsProviders");
 		bson_t bson_providers = BSON_INITIALIZER;
 
+		if (Z_TYPE_P(kms_providers) != IS_OBJECT && Z_TYPE_P(kms_providers) != IS_ARRAY) {
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"kmsProviders\" encryption option to be an array or object");
+			goto cleanup;
+		}
+
 		php_phongo_zval_to_bson(kms_providers, PHONGO_BSON_NONE, &bson_providers, NULL TSRMLS_CC);
 		if (EG(exception)) {
 			goto cleanup;
@@ -2809,6 +2814,11 @@ static bool phongo_manager_set_auto_encryption_opts(php_phongo_manager_t* manage
 		zval*  schema_map = php_array_fetch(zAutoEncryptionOpts, "schemaMap");
 		bson_t bson_map   = BSON_INITIALIZER;
 
+		if (Z_TYPE_P(schema_map) != IS_OBJECT && Z_TYPE_P(schema_map) != IS_ARRAY) {
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"schemaMap\" encryption option to be an array or object");
+			goto cleanup;
+		}
+
 		php_phongo_zval_to_bson(schema_map, PHONGO_BSON_NONE, &bson_map, NULL TSRMLS_CC);
 		if (EG(exception)) {
 			goto cleanup;
@@ -2907,8 +2917,8 @@ static mongoc_client_encryption_opts_t* phongo_clientencryption_opts_from_zval(m
 		zval*  kms_providers  = php_array_fetchc(options, "kmsProviders");
 		bson_t bson_providers = BSON_INITIALIZER;
 
-		if (Z_TYPE_P(kms_providers) != IS_ARRAY) {
-			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"kmsProviders\" encryption option to be an array");
+		if (Z_TYPE_P(kms_providers) != IS_ARRAY && Z_TYPE_P(kms_providers) != IS_OBJECT) {
+			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"kmsProviders\" encryption option to be an array or object");
 			goto cleanup;
 		}
 

tests/clientEncryption/clientEncryption-ctor-001.phpt renamed to tests/manager/manager-createClientEncryption-001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-MongoDB\Driver\ClientEncryption::__construct()
+MongoDB\Driver\Manager::createClientEncryption()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongocrypt(); ?>

tests/clientEncryption/clientEncryption-ctor-error-001.phpt renamed to tests/manager/manager-createClientEncryption-error-001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-MongoDB\Driver\ClientEncryption::__construct() fails if compiled without FLE
+MongoDB\Driver\Manager::createClientEncryption() fails if compiled without FLE
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_libmongocrypt(); ?>

tests/manager/manager-createClientEncryption-error-002.phpt

@@ -0,0 +1,36 @@
+--TEST--
+MongoDB\Driver\Manager::createClientEncryption() with invalid option types
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongocrypt(); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+$tests = [
+    ['kmsProviders' => 'string'],
+    [
+        'kmsProviders' => ['local' => ['key' => new MongoDB\BSON\Binary('', 0)]],
+        'keyVaultClient' => 'string',
+    ],
+];
+
+foreach ($tests as $test) {
+    echo throws(function () use ($test) {
+        $manager = new MongoDB\Driver\Manager();
+        $clientEncryption = $manager->createClientEncryption(['keyVaultNamespace' => 'default.keys'] + $test);
+    }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "kmsProviders" encryption option to be an array or object
+
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "keyVaultClient" encryption option to be MongoDB\Driver\Manager, string given
+
+===DONE===

tests/manager/manager-ctor-auto_encryption-error-003.phpt

@@ -0,0 +1,44 @@
+--TEST--
+MongoDB\Driver\Manager::__construct(): invalid option types
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongocrypt(); ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+$tests = [
+    ['kmsProviders' => 'string'],
+    [
+        'kmsProviders' => ['local' => ['key' => new MongoDB\BSON\Binary('', 0)]],
+        'schemaMap' => 'string',
+    ],
+    [
+        'kmsProviders' => ['local' => ['key' => new MongoDB\BSON\Binary('', 0)]],
+        'keyVaultClient' => 'string',
+    ],
+];
+
+foreach ($tests as $test) {
+    echo throws(function() use ($test) {
+        $autoEncryptionOptions = ['keyVaultNamespace' => 'admin.dataKeys'];
+
+        $manager = new MongoDB\Driver\Manager(null, [], ['autoEncryption' => $autoEncryptionOptions + $test]);
+    }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "kmsProviders" encryption option to be an array or object
+
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "schemaMap" encryption option to be an array or object
+
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "keyVaultClient" encryption option to be MongoDB\Driver\Manager, string given
+
+===DONE===