Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/Handler/CertificateEngine/OrderCertificatesTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public function orderCertificates(array $certificates): array {
}

$this->ensureValidStructure($certificates);
$certificates = $this->removeDuplicateNames($certificates);

if (count($certificates) === 1) {
return $certificates;
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ public static function dataValidateCertificateChain(): array {
];
}

public function testDuplicateCertificateNames(): void {
public function testDuplicateCertificateNamesKeepFirstOccurrence(): void {
$certificates = [
[
'name' => '/CN=Duplicate',
Expand All @@ -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 {
Expand Down