test: extend CRL provider edge coverage

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

lib/Service/Crl/CrlDistributionPointsExtractor.php

@@ -48,7 +48,11 @@ public function extractFromExtensions(array $extensions): array {
 		foreach ($values as $value) {
 			preg_match_all('/URI\s*:\s*([^\s\n]+)/i', $value, $matches);
 			if (!empty($matches[1])) {
-				$urls = [...$urls, ...$matches[1]];
+				$normalizedUrls = array_map(
+					static fn (string $url): string => rtrim($url, ")]"),
+					$matches[1],
+				);
+				$urls = [...$urls, ...$normalizedUrls];
 			}
 		}
 

tests/php/Unit/Service/Crl/CrlDistributionPointsExtractorTest.php

@@ -89,6 +89,20 @@ public static function crlDistributionPointExtractionProvider(): array {
 				true,
 				['ldap://ldap.example.net/cn=CA,dc=example,dc=net?certificateRevocationList;binary'],
 			],
+			'uri-with-tabs-and-extra-whitespace' => [
+				[
+					'2.5.29.31' => "Full Name:\n\tURI\t:\t https://example.org/crl/with-tabs.crl",
+				],
+				true,
+				['https://example.org/crl/with-tabs.crl'],
+			],
+			'uri-line-with-closing-parenthesis-from-formatted-output' => [
+				[
+					'2.5.29.31' => "Distribution Point (1):\nURI:https://example.org/crl/formatted.crl)",
+				],
+				true,
+				['https://example.org/crl/formatted.crl'],
+			],
 			'multiple-supported-extension-keys-are-merged-and-deduplicated' => [
 				[
 					'2.5.29.31' => "Full Name:\nURI:https://example.org/crl/shared.crl",
@@ -118,6 +132,24 @@ public static function crlDistributionPointExtractionProvider(): array {
 				true,
 				[],
 			],
+			'known-extension-with-general-names-but-no-uri' => [
+				[
+					'X509v3 CRL Distribution Points' => "Full Name:\nDNS:crl.example.org\nDirName:/C=BR/O=Example/CN=CRL Directory",
+				],
+				true,
+				[],
+			],
+			'multiple-supported-keys-preserve-first-seen-order' => [
+				[
+					'crlDistributionPoints' => "Full Name:\nURI:https://example.org/crl/first.crl",
+					'2.5.29.31' => "Full Name:\nURI:https://example.org/crl/second.crl",
+				],
+				true,
+				[
+					'https://example.org/crl/first.crl',
+					'https://example.org/crl/second.crl',
+				],
+			],
 			'unknown-extension-name-should-not-match' => [
 				[
 					'Issuer CRL Distribution Points' => "Full Name:\nURI:https://example.org/crl/issuer.crl",