Migrate to non-static utils

Author: tvdijen

composer.json

@@ -29,7 +29,7 @@
         "simplesamlphp/xml-common": "^0.0.12"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.0.4"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.1.0"
     },
     "support": {
         "issues": "https://github.com/simplesamlphp/simplesamlphp-module-casserver/issues",

lib/Cas/Ticket/TicketFactory.php

@@ -26,7 +26,7 @@
 namespace SimpleSAML\Module\casserver\Cas\Ticket;
 
 use SimpleSAML\Configuration;
-use SimpleSAML\Utils\Random;
+use SimpleSAML\Utils;
 
 class TicketFactory
 {
@@ -58,10 +58,11 @@ public function __construct(Configuration $config)
      */
     public function createSessionTicket(string $sessionId, int $expiresAt): array
     {
+        $randomUtils = new Utils\Random();
         return [
             'id' => $sessionId,
             'validBefore' => $expiresAt,
-            'renewId' => Random::generateID()
+            'renewId' => $randomUtils->generateID()
         ];
     }
 
@@ -72,7 +73,8 @@ public function createSessionTicket(string $sessionId, int $expiresAt): array
      */
     public function createServiceTicket(array $content): array
     {
-        $id = str_replace('_', 'ST-', Random::generateID());
+        $randomUtils = new Utils\Random();
+        $id = str_replace('_', 'ST-', $randomUtils->generateID());
         $expiresAt = time() + $this->serviceTicketExpireTime;
 
         return array_merge(['id' => $id, 'validBefore' => $expiresAt], $content);
@@ -85,8 +87,9 @@ public function createServiceTicket(array $content): array
      */
     public function createProxyGrantingTicket(array $content): array
     {
-        $id = str_replace('_', 'PGT-', Random::generateID());
-        $iou = str_replace('_', 'PGTIOU-', Random::generateID());
+        $randomUtils = new Utils\Random();
+        $id = str_replace('_', 'PGT-', $randomUtils->generateID());
+        $iou = str_replace('_', 'PGTIOU-', $randomUtils->generateID());
 
         $expireAt = time() + $this->proxyGrantingTicketExpireTime;
 
@@ -100,7 +103,8 @@ public function createProxyGrantingTicket(array $content): array
      */
     public function createProxyTicket(array $content): array
     {
-        $id = str_replace('_', 'PT-', Random::generateID());
+        $randomUtils = new Utils\Random();
+        $id = str_replace('_', 'PT-', $randomUtils->generateID());
         $expiresAt = time() + $this->proxyTicketExpireTime;
 
         return array_merge(['id' => $id, 'validBefore' => $expiresAt], $content);

lib/Shib13/AuthnResponse.php

@@ -135,7 +135,8 @@ public function validate(): bool
             $this->validator->validateFingerprint($certFingerprints);
         } elseif ($md->hasValue('caFile')) {
             // Validate against CA
-            $this->validator->validateCA(Utils\Config::getCertPath($md->getString('caFile')));
+            $configUtils = new Utils\Config();
+            $this->validator->validateCA($configUtils->getCertPath($md->getString('caFile')));
         } else {
             throw new Error\Exception(
                 'Missing certificate in Shibboleth 1.3 IdP Remote metadata for identity provider [' . $issuer . '].'
@@ -354,23 +355,25 @@ public function generate(Configuration $idp, Configuration $sp, string $shire, ?
             $scopedAttributes = [];
         }
 
-        $id = Utils\Random::generateID();
+        $randomUtils = new Utils\Random();
+        $timeUtils = new Utils\Time();
 
-        $issueInstant = Utils\Time::generateTimestamp();
+        $id = $randomUtils->generateID();
+        $issueInstant = $timeUtils->generateTimestamp();
 
         // 30 seconds timeskew back in time to allow differing clocks
-        $notBefore = Utils\Time::generateTimestamp(time() - 30);
+        $notBefore = $timeUtils->generateTimestamp(time() - 30);
 
-        $assertionExpire = Utils\Time::generateTimestamp(time() + 300); // 5 minutes
-        $assertionid = Utils\Random::generateID();
+        $assertionExpire = $timeUtils->generateTimestamp(time() + 300); // 5 minutes
+        $assertionid = $randomUtils->generateID();
 
         $spEntityId = $sp->getString('entityid');
 
         $audience = $sp->getString('audience', $spEntityId);
         $base64 = $sp->getBoolean('base64attributes', false);
 
         $namequalifier = $sp->getString('NameQualifier', $spEntityId);
-        $nameid = Utils\Random::generateID();
+        $nameid = $randomUtils->generateID();
         $subjectNode =
             '<Subject>' .
             '<NameIdentifier' .

tests/lib/Ticket/DelegatingTicketStoreTest.php

@@ -9,7 +9,7 @@
 use SimpleSAML\Module\casserver\Cas\Ticket\DelegatingTicketStore;
 use SimpleSAML\Module\casserver\Cas\Ticket\FileSystemTicketStore;
 use SimpleSAML\Module\casserver\Cas\Ticket\TicketStore;
-use SimpleSAML\Utils\Config;
+use SimpleSAML\Utils;
 
 class DelegatingTicketStoreTest extends TestCase
 {
@@ -33,8 +33,9 @@ class DelegatingTicketStoreTest extends TestCase
      */
     public function setup(): void
     {
+        $configUtils = new Utils\Config();
         putenv('SIMPLESAMLPHP_CONFIG_DIR=' . dirname(dirname(__DIR__)) . '/config');
-        Configuration::setConfigDir(Config::getConfigDir());
+        Configuration::setConfigDir($configUtils->getConfigDir());
         $this->ticketstoreConfig = array(
             'delegateTo' => 'all',
             'ticketStores' => [

tests/lib/TicketValidatorTest.php

@@ -10,7 +10,7 @@
 use SimpleSAML\Module\casserver\Cas\Ticket\FileSystemTicketStore;
 use SimpleSAML\Module\casserver\Cas\Ticket\TicketStore;
 use SimpleSAML\Module\casserver\Cas\TicketValidator;
-use SimpleSAML\Utils\Random;
+use SimpleSAML\Utils;
 
 class TicketValidatorTest extends TestCase
 {
@@ -165,7 +165,8 @@ public function urlSanitizationProvider(): array
      */
     private function createTicket(string $serviceUrl, int $expiration = 0): array
     {
-        $id = Random::generateID();
+        $randomUtils = new Utils\Random();
+        $id = $randomUtils->generateID();
         $serviceTicket = [
             'id' => $id,
             'validBefore' => time() + $expiration,

www/login.php

@@ -38,7 +38,7 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
 use SimpleSAML\Session;
-use SimpleSAML\Utils\HTTP;
+use SimpleSAML\Utils;
 
 require_once('utility/urlUtils.php');
 
@@ -97,7 +97,7 @@
 /** @var $ticketFactory TicketFactory */
 /** @psalm-suppress InvalidStringClass */
 $ticketFactory = new $ticketFactoryClass($casconfig);
-
+$httpUtils = new Utils\HTTP();
 $session = Session::getSessionFromRequest();
 
 $sessionTicket = $ticketStore->getTicket($session->getSessionId());
@@ -139,7 +139,7 @@
         $query['debugMode'] = $_REQUEST['debugMode'];
     }
 
-    $returnUrl = HTTP::getSelfURLNoQuery() . '?' . http_build_query($query);
+    $returnUrl = $httpUtils->getSelfURLNoQuery() . '?' . http_build_query($query);
 
     $params = [
         'ForceAuthn' => $forceAuthn,
@@ -227,12 +227,12 @@
             echo '<pre>' . htmlspecialchars($casResponse) . '</pre>';
         }
     } elseif ($redirect) {
-        HTTP::redirectTrustedURL(HTTP::addURLParameters($serviceUrl, $parameters));
+        $httpUtils->redirectTrustedURL($httpUtils->addURLParameters($serviceUrl, $parameters));
     } else {
-        HTTP::submitPOSTData($serviceUrl, $parameters);
+        $httpUtils->submitPOSTData($serviceUrl, $parameters);
     }
 } else {
-    HTTP::redirectTrustedURL(
-        HTTP::addURLParameters(Module::getModuleURL('casserver/loggedIn.php'), $parameters)
+    $httpUtils->redirectTrustedURL(
+        $httpUtils->addURLParameters(Module::getModuleURL('casserver/loggedIn.php'), $parameters)
     );
 }