Fix ValidatorTrait for SVG logos

CESNET · May 9, 2024 · a7595b5 · a7595b5
1 parent aa39fa1
commit a7595b5
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/app/Traits/ValidatorTrait.php b/app/Traits/ValidatorTrait.php
@@ -409,6 +409,16 @@ public function checkUIInfo(object $xpath): void
                     if (! $file) {
                         $this->error .= $SSODescriptor.'/UIInfo/Logo '.$logo->nodeValue.' could not be read. ';
                     } else {
+                        if (str_ends_with($logo->nodeValue, '.svg')) {
+                            $doc = new \DOMDocument();
+                            $doc->load($logo->nodeValue);
+                            if (strcmp($doc->documentElement->nodeName, 'svg') !== 0) {
+                                $this->error .= $SSODescriptor.'/UIInfo/Logo '.$logo->nodeValue.' is not an image. ';
+                            } else {
+                                return;
+                            }
+                        }
+
                         if (exif_imagetype($logo->nodeValue)) {
                             $imagesize = getimagesize($logo->nodeValue);
                             $img_width = $imagesize[0];
@@ -424,14 +434,6 @@ public function checkUIInfo(object $xpath): void
                                 $this->error .= $SSODescriptor.'/UIInfo/Logo[@height="'.$md_height.'"] does not match the height ('.$img_height.'px) of the image '.$logo->nodeValue.'. ';
                             }
                         }
-
-                        if (! exif_imagetype($logo->nodeValue)) {
-                            $doc = new \DOMDocument();
-                            $doc->load($logo->nodeValue);
-                            if (strcmp($doc->documentElement->nodeName, 'svg') !== 0) {
-                                $this->error .= $SSODescriptor.'/UIInfo/Logo '.$logo->nodeValue.' is not an image. ';
-                            }
-                        }
                     }
                 }
             }