PHPC-2103: Report loaded crypt_shared version in phpinfo() (#1351)

* Match error message variations between libmongoc 1.23+ and older

This typo was corrected in mongodb/mongo-c-driver@1d7229f and will appear in the 1.23.0 release.

* PHPC-2103: Report loaded crypt_shared version in phpinfo()

* PHPC-2132: Fix pattern for matching phpinfo() values

Author: jmikola

php_phongo.c

@@ -459,6 +459,17 @@ PHP_MINFO_FUNCTION(mongodb) /* {{{ */
 #else /* MONGOCRYPT_ENABLE_CRYPTO */
 	php_info_print_table_row(2, "libmongocrypt crypto", "disabled");
 #endif
+
+	{
+		const char* crypt_shared_version = php_phongo_crypt_shared_version();
+
+		if (crypt_shared_version) {
+			php_info_print_table_row(2, "crypt_shared library version", crypt_shared_version);
+		} else {
+			php_info_print_table_row(2, "crypt_shared library version", "unknown");
+		}
+	}
+
 #else /* MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION */
 	php_info_print_table_row(2, "libmongocrypt", "disabled");
 #endif

src/LIBMONGOC_VERSION_CURRENT

@@ -1 +1 @@
-1.22.1
+1.11.1-20220829+git623d659f00

src/libmongoc

@@ -51,6 +51,47 @@ typedef struct {
 	bool             is_persistent;
 } php_phongo_pclient_t;
 
+static const mongoc_client_t* get_first_pclient_client(HashTable* ht)
+{
+	if (ht) {
+		php_phongo_pclient_t* pclient = NULL;
+
+		zend_hash_internal_pointer_reset(ht);
+		pclient = zend_hash_get_current_data_ptr(ht);
+
+		if (pclient) {
+			return pclient->client;
+		}
+	}
+
+	return NULL;
+}
+
+/* Returns the version of the crypt_shared library, or NULL if it's unavailable.
+ * Querying the version requires a mongoc_client_t pointer. Since the shared
+ * library can only be loaded once, any client will return the same result so we
+ * consult the first persistent or request-scoped client we can find.
+ *
+ * Note: this may incorrectly return NULL if crypt_shared was loaded through a
+ * mongoc_client_t since destroyed (e.g. single requested-scoped client);
+ * however, that's the best can do with libmongoc's API. */
+const char* php_phongo_crypt_shared_version()
+{
+	const mongoc_client_t* client = NULL;
+
+	client = get_first_pclient_client(&MONGODB_G(persistent_clients));
+
+	if (!client) {
+		client = get_first_pclient_client(MONGODB_G(request_clients));
+	}
+
+	if (client) {
+		return mongoc_client_get_crypt_shared_version(client);
+	}
+
+	return NULL;
+}
+
 static mongoc_uri_t* php_phongo_make_uri(const char* uri_string)
 {
 	mongoc_uri_t* uri;

src/phongo_client.c

@@ -21,6 +21,8 @@
 
 #include "phongo_classes.h"
 
+const char* php_phongo_crypt_shared_version();
+
 void phongo_manager_init(php_phongo_manager_t* manager, const char* uri_string, zval* options, zval* driverOptions);
 
 void php_phongo_client_reset_once(php_phongo_manager_t* manager, int pid);

src/phongo_client.h

@@ -17,8 +17,11 @@ $autoEncryptionOptions = [
 
 create_test_manager(null, [], ['autoEncryption' => $autoEncryptionOptions]);
 
+var_dump(get_module_info('crypt_shared library version'));
+
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
+string(%d) "mongo_crypt%a"
 ===DONE===

tests/manager/manager-ctor-auto_encryption-002.phpt

@@ -25,14 +25,17 @@ foreach ($tests as $autoEncryptionOptions) {
     }, MongoDB\Driver\Exception\EncryptionException::class), "\n\n";
 }
 
+var_dump(get_module_info('crypt_shared library version'));
+
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 OK: Got MongoDB\Driver\Exception\EncryptionException
 A crypt_shared override path was specified [/not/found], but we failed to open a dynamic library at that location
 
 OK: Got MongoDB\Driver\Exception\EncryptionException
-Option 'cryptSharedLibRequired' is 'true', but failed to load the crypt_shared runtime libary
+Option 'cryptSharedLibRequired' is 'true', but failed to load the crypt_shared runtime lib%r(r?)%rary
 
+string(7) "unknown"
 ===DONE===

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

@@ -83,7 +83,7 @@ function get_module_info($row)
     phpinfo(INFO_MODULES);
     $info = ob_get_clean();
 
-    $pattern = sprintf('/^%s([\w ]+)$/m', preg_quote($row . ' => '));
+    $pattern = sprintf('/^%s(.*)$/m', preg_quote($row . ' => '));
 
     if (preg_match($pattern, $info, $matches) !== 1) {
         return null;