Merge pull request #204 from Icinga/fix-split-sans

CertificateUtils: Split also unknow cert alt names correctly
Icinga · Sep 4, 2023 · fa4f719 · fa4f719
2 parents c2cce53 + a1148f3
commit fa4f719
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/library/X509/CertificateUtils.php b/library/X509/CertificateUtils.php
@@ -161,11 +161,16 @@ public static function splitSANs(?string $sanStr): array
     {
         $sans = [];
         foreach (Str::trimSplit($sanStr) as $altName) {
-            [$k, $v] = Str::trimSplit($altName, ':');
+            if (strpos($altName, ':') === false) {
+                [$k, $v] = Str::trimSplit($altName, '=', 2);
+            } else {
+                [$k, $v] = Str::trimSplit($altName, ':', 2);
+            }
+
             $sans[$k][] = $v;
         }
 
-        $order = array_flip(['DNS', 'URI', 'IP Address', 'email']);
+        $order = array_flip(['DNS', 'URI', 'IP Address', 'email', 'DirName']);
         uksort($sans, function ($a, $b) use ($order) {
             return ($order[$a] ?? PHP_INT_MAX) <=> ($order[$b] ?? PHP_INT_MAX);
         });