diff --git a/lib/Handler/CertificateEngine/OrderCertificatesTrait.php b/lib/Handler/CertificateEngine/OrderCertificatesTrait.php index 52a7ff34d1..08bf19b24c 100644 --- a/lib/Handler/CertificateEngine/OrderCertificatesTrait.php +++ b/lib/Handler/CertificateEngine/OrderCertificatesTrait.php @@ -17,6 +17,7 @@ public function orderCertificates(array $certificates): array { } $this->ensureValidStructure($certificates); + $certificates = $this->removeDuplicateNames($certificates); if (count($certificates) === 1) { return $certificates; @@ -65,11 +66,14 @@ private function ensureValidStructure(array $certificates): void { throw new InvalidArgumentException('Invalid certificate structure. Certificate must have "subject", "issuer", and "name".'); } } + } - $names = array_column($certificates, 'name'); - if (count($names) !== count(array_unique($names))) { - throw new InvalidArgumentException('Duplicate certificate names detected'); + private function removeDuplicateNames(array $certificates): array { + $unique = []; + foreach ($certificates as $cert) { + $unique[$cert['name']] ??= $cert; } + return array_values($unique); } private function findLeafCertificate(array $certificates): ?array { diff --git a/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php b/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php index e1a88e8902..5db3d89a59 100644 --- a/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php +++ b/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php @@ -534,7 +534,7 @@ public static function dataValidateCertificateChain(): array { ]; } - public function testDuplicateCertificateNames(): void { + public function testDuplicateCertificateNamesKeepFirstOccurrence(): void { $certificates = [ [ 'name' => '/CN=Duplicate', @@ -548,8 +548,33 @@ public function testDuplicateCertificateNames(): void { ], ]; - $this->expectExceptionMessage('Duplicate certificate names detected'); - $this->orderCertificates->orderCertificates($certificates); + $result = $this->orderCertificates->orderCertificates($certificates); + + $this->assertSame([$certificates[0]], $result); + } + + public function testChainWithDuplicatedIntermediateIsOrdered(): void { + $root = ['C' => 'ES', 'O' => 'IZENPE S.A.', 'CN' => 'Izenpe.com']; + $intermediate = ['C' => 'ES', 'O' => 'IZENPE S.A.', 'CN' => 'CA de Ciudadanos y Entidades (4)']; + $leaf = [ + 'name' => '/C=ES/CN=Signer', + 'subject' => ['C' => 'ES', 'CN' => 'Signer'], + 'issuer' => $intermediate, + ]; + $intermediateCert = [ + 'name' => '/C=ES/O=IZENPE S.A./CN=CA de Ciudadanos y Entidades (4)', + 'subject' => $intermediate, + 'issuer' => $root, + ]; + $rootCert = [ + 'name' => '/C=ES/O=IZENPE S.A./CN=Izenpe.com', + 'subject' => $root, + 'issuer' => $root, + ]; + + $result = $this->orderCertificates->orderCertificates([$intermediateCert, $leaf, $intermediateCert, $rootCert]); + + $this->assertSame(['/C=ES/CN=Signer', $intermediateCert['name'], $rootCert['name']], array_column($result, 'name')); } public function testRealChainFromUser(): void {