Merge pull request #1146

Author: jmikola

php_phongo.c

@@ -1435,6 +1435,31 @@ static bool php_phongo_uri_finalize_auth(mongoc_uri_t* uri) /* {{{ */
 	return true;
 } /* }}} */
 
+static bool php_phongo_uri_finalize_directconnection(mongoc_uri_t* uri) /* {{{ */
+{
+	const mongoc_host_list_t* hosts;
+
+	if (!mongoc_uri_get_option_as_bool(uri, MONGOC_URI_DIRECTCONNECTION, false)) {
+		return true;
+	}
+
+	/* Per the URI options spec, directConnection conflicts with multiple hosts
+	 * and SRV URIs, which may resolve to multiple hosts. */
+	if (!strncmp(mongoc_uri_get_string(uri), "mongodb+srv://", 14)) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Failed to parse URI options: SRV URI not allowed with directConnection option.");
+		return false;
+	}
+
+	hosts = mongoc_uri_get_hosts(uri);
+
+	if (hosts && hosts->next) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Failed to parse URI options: Multiple seeds not allowed with directConnection option.");
+		return false;
+	}
+
+	return true;
+} /* }}} */
+
 static bool php_phongo_uri_finalize_tls(mongoc_uri_t* uri) /* {{{ */
 {
 	const bson_t* options;
@@ -1676,12 +1701,17 @@ static bool php_phongo_apply_options_to_uri(mongoc_uri_t* uri, bson_t* options)
 		}
 	}
 
-	// Finalize auth options
+	/* Validate any interactions between URI options */
 	if (!php_phongo_uri_finalize_auth(uri)) {
 		/* Exception should already have been thrown */
 		return false;
 	}
 
+	if (!php_phongo_uri_finalize_directconnection(uri)) {
+		/* Exception should already have been thrown */
+		return false;
+	}
+
 	return true;
 } /* }}} */
 
@@ -2502,7 +2532,7 @@ static bool php_phongo_extract_handshake_data(zval* driver, const char* key, cha
 	zval* zvalue;
 
 	if (!php_array_exists(driver, key)) {
-		*value = NULL;
+		*value     = NULL;
 		*value_len = 0;
 
 		return true;
@@ -2523,7 +2553,7 @@ static bool php_phongo_extract_handshake_data(zval* driver, const char* key, cha
 
 static char* php_phongo_concat_handshake_data(const char* default_value, const char* custom_value, size_t custom_value_len)
 {
-	char*  ret;
+	char* ret;
 	/* Length of the returned value needs to include the trailing null byte */
 	size_t ret_len = strlen(default_value) + 1;
 
@@ -2552,7 +2582,7 @@ static void php_phongo_handshake_data_append(const char* name, size_t name_len,
 	char*  full_platform;
 
 	php_version_string_len = strlen(PHP_VERSION);
-	php_version_string = ecalloc(sizeof(char*), 4 + php_version_string_len);
+	php_version_string     = ecalloc(sizeof(char*), 4 + php_version_string_len);
 	snprintf(php_version_string, 4 + php_version_string_len, "PHP %s", PHP_VERSION);
 
 	driver_name    = php_phongo_concat_handshake_data("ext-mongodb:PHP", name, name_len);
@@ -2583,7 +2613,7 @@ static void php_phongo_set_handshake_data(zval* driverOptions)
 	size_t platform_len = 0;
 
 	if (driverOptions && php_array_existsc(driverOptions, "driver")) {
-		zval*      driver = php_array_fetchc(driverOptions, "driver");
+		zval* driver = php_array_fetchc(driverOptions, "driver");
 
 		if (Z_TYPE_P(driver) != IS_ARRAY) {
 			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"driver\" driver option to be an array, %s given", PHONGO_ZVAL_CLASS_OR_TYPE_NAME_P(driver));
@@ -3489,7 +3519,7 @@ static zend_class_entry* php_phongo_fetch_internal_class(const char* class_name,
 static HashTable* php_phongo_std_get_gc(zval* object, zval** table, int* n) /* {{{ */
 {
 	*table = NULL;
-	*n = 0;
+	*n     = 0;
 	return zend_std_get_properties(object);
 } /* }}} */
 

tests/manager/manager-ctor-directconnection-error-001.phpt

@@ -7,6 +7,10 @@ require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
     $manager = new \MongoDB\Driver\Manager('mongodb://a.example.com,b.example.com/?directConnection=true');
+}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n\n";
+
+echo throws(function() {
+    $manager = new \MongoDB\Driver\Manager('mongodb://a.example.com,b.example.com', ['directConnection' => true]);
 }, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
 
 ?>
@@ -15,4 +19,7 @@ echo throws(function() {
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Failed to parse MongoDB URI: 'mongodb://a.example.com,b.example.com/?directConnection=true'. Multiple seeds not allowed with directConnection option.
+
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Failed to parse URI options: Multiple seeds not allowed with directConnection option.
 ===DONE===

tests/manager/manager-ctor-directconnection-error-002.phpt

@@ -7,6 +7,10 @@ require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
     $manager = new \MongoDB\Driver\Manager('mongodb+srv://a.example.com/?directConnection=true');
+}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n\n";
+
+echo throws(function() {
+    $manager = new \MongoDB\Driver\Manager('mongodb+srv://a.example.com', ['directConnection' => true]);
 }, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
 
 ?>
@@ -15,4 +19,7 @@ echo throws(function() {
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Failed to parse MongoDB URI: 'mongodb+srv://a.example.com/?directConnection=true'. SRV URI not allowed with directConnection option.
+
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Failed to parse URI options: SRV URI not allowed with directConnection option.
 ===DONE===