Merge pull request #246 from silinternational/feature/instantiate-utils

instantiate SimpleSAML\Utils classes
silinternational · Jul 8, 2024 · dfc6b6e · dfc6b6e
2 parents 6945cda + cf239c1
commit dfc6b6e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/modules/sildisco/public/metadata.php b/modules/sildisco/public/metadata.php
@@ -6,9 +6,7 @@
 require_once('../public/_include.php');
 
 use SAML2\Constants;
-use SimpleSAML\Utils\Config\Metadata as Metadata;
-use SimpleSAML\Utils\Crypto as Crypto;
-use SimpleSAML\Utils\HTTP as HTTP;
+use SimpleSAML\Utils;
 
 // load SimpleSAMLphp, configuration and metadata
 $config = \SimpleSAML\Configuration::getInstance();
@@ -19,7 +17,7 @@
 }
 
 // check if valid local session exists
-//$authUtils = new Auth();
+//$authUtils = new Utils\Auth();
 //if ($config->getOptionalBoolean('admin.protectmetadata', false)) {
 //    $authUtils->requireAdmin();
 //}
@@ -32,7 +30,7 @@
 
     $availableCerts = array();
 
-    $cryptoUtils = new Crypto();
+    $cryptoUtils = new Utils\Crypto();
 
     $keys = array();
     $certInfo = $cryptoUtils->loadPublicKey($idpmeta, false, 'new_');
@@ -114,7 +112,7 @@
         $metaArray['keys'] = $keys;
     }
 
-    $httpUtils = new HTTP();
+    $httpUtils = new Utils\HTTP();
 
     if ($idpmeta->getOptionalBoolean('saml20.sendartifact', false)) {
         // Artifact sending enabled
@@ -156,11 +154,13 @@
         $metaArray['scope'] = $idpmeta->getArray('scope');
     }
 
+    $metadataUtils = new Utils\Metadata();
+
     if ($idpmeta->hasValue('EntityAttributes')) {
         $metaArray['EntityAttributes'] = $idpmeta->getArray('EntityAttributes');
 
         // check for entity categories
-        if (Metadata::isHiddenFromDiscovery($metaArray)) {
+        if ($metadataUtils->isHiddenFromDiscovery($metaArray)) {
             $metaArray['hide.from.discovery'] = true;
         }
     }
@@ -188,7 +188,7 @@
     if ($idpmeta->hasValue('contacts')) {
         $contacts = $idpmeta->getArray('contacts');
         foreach ($contacts as $contact) {
-            $metaArray['contacts'][] = Metadata::getContact($contact);
+            $metaArray['contacts'][] = $metadataUtils->getContact($contact);
         }
     }
 
@@ -197,7 +197,7 @@
         $techcontact['emailAddress'] = $technicalContactEmail;
         $techcontact['name'] = $config->getOptionalString('technicalcontact_name', null);
         $techcontact['contactType'] = 'technical';
-        $metaArray['contacts'][] = Metadata::getContact($techcontact);
+        $metaArray['contacts'][] = $metadataUtils->getContact($techcontact);
     }
 
     $metaBuilder = new \SimpleSAML\Metadata\SAMLBuilder($idpentityid);

diff --git a/modules/sildisco/public/sp/saml2-logout.php b/modules/sildisco/public/sp/saml2-logout.php
@@ -58,8 +58,9 @@
 
 \SimpleSAML\Module\saml\Message::validateMessage($idpMetadata, $spMetadata, $message);
 
+$httpUtils = new \SimpleSAML\Utils\HTTP();
 $destination = $message->getDestination();
-if ($destination !== null && $destination !== \SimpleSAML\Utils\HTTP::getSelfURLNoQuery()) {
+if ($destination !== null && $destination !== $httpUtils->getSelfURLNoQuery()) {
     throw new \SimpleSAML\Error\Exception('Destination in logout message is wrong.');
 }