Fix check:cert subject alternative name matching

flavioheleno · Feb 15, 2024 · c59fc30 · c59fc30
1 parent 8777fd4
commit c59fc30
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Console/Commands/Check/CheckCertificateCommand.php b/src/Console/Commands/Check/CheckCertificateCommand.php
@@ -31,8 +31,8 @@ final class CheckCertificateCommand extends Command {
    * @param string[] $haystack
    */
   private function subjectMatch(string $needle, array $haystack): bool {
-    $needleParts = explode('.', $needle);
-    array_shift($needleParts); // remove the host from $needle
+    // remove the host from $needle
+    $needleParts = array_slice(explode('.', $needle), 1);
     foreach ($haystack as $candidate) {
       if ($needle === $candidate) {
         return true;
@@ -199,7 +199,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
       );
 
       if (
-        $domain !== $cert0->subjectCommonName ||
+        $domain !== $cert0->subjectCommonName &&
         $this->subjectMatch($domain, $cert0->subjectAlternativeNames) === false
       ) {
         $errors[] = sprintf(