Fix SF-Request to PSR-7 conversion

Author: tvdijen

composer.json

@@ -36,9 +36,11 @@
     "require": {
         "php": "^8.1",
 
+        "nyholm/psr7": "~1.8.2",
         "simplesamlphp/saml2": "~5.0.2",
         "simplesamlphp/simplesamlphp": "~2.4.0",
-        "symfony/http-foundation": "~6.4.0"
+        "symfony/http-foundation": "~6.4.0",
+        "symfony/psr-http-message-bridge": "~6.4.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "~1.9.3",

src/Controller/AttributeServer.php

@@ -5,6 +5,7 @@
 namespace SimpleSAML\Module\exampleattributeserver\Controller;
 
 use DateInterval;
+use Nyholm\Psr7\Factory\Psr17Factory;
 use SimpleSAML\{Configuration, Error, Logger};
 use SimpleSAML\HTTP\RunnableResponse;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
@@ -29,6 +30,7 @@
 };
 use SimpleSAML\SAML2\XML\samlp\{AttributeQuery, Response};
 use SimpleSAML\XML\Utils\Random;
+use Symfony\Bridge\PsrHttpMessage\Factory\{HttpFoundationFactory, PsrHttpFactory};
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -77,15 +79,19 @@ public function setMetadataStorageHandler(MetaDataStorageHandler $handler): void
      */
     public function main(/** @scrutinizer ignore-unused */ Request $request): RunnableResponse
     {
-        $binding = Binding::getCurrentBinding();
-        $query = $binding->receive();
-        if (!($query instanceof AttributeQuery)) {
+        $psr17Factory = new Psr17Factory();
+        $psrHttpFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
+        $psrRequest = $psrHttpFactory->createRequest($request);
+
+        $binding = Binding::getCurrentBinding($psrRequest);
+        $message = $binding->receive($psrRequest);
+        if (!($message instanceof AttributeQuery)) {
             throw new Error\BadRequest('Invalid message received to AttributeQuery endpoint.');
         }
 
         $idpEntityId = $this->metadataHandler->getMetaDataCurrentEntityID('saml20-idp-hosted');
 
-        $issuer = $query->getIssuer();
+        $issuer = $message->getIssuer();
         if ($issuer === null) {
             throw new Error\BadRequest('Missing <saml:Issuer> in <samlp:AttributeQuery>.');
         } else {
@@ -130,7 +136,7 @@ public function main(/** @scrutinizer ignore-unused */ Request $request): Runnab
             Logger::debug('No attributes requested - return all attributes.');
             $returnAttributes = $attributes;
         } else {
-            foreach ($query->getAttributes() as $reqAttr) {
+            foreach ($message->getAttributes() as $reqAttr) {
                 foreach ($attributes as $attr) {
                     if ($attr->getName() === $reqAttr->getName() && $attr->getNameFormat() === $reqAttr->getNameFormat()) {
                         // The requested attribute is available
@@ -159,14 +165,14 @@ public function main(/** @scrutinizer ignore-unused */ Request $request): Runnab
             issueInstant: $clock->now(),
             id: (new Random())->generateID(),
             subject: Subject(
-                identifier: $query->getNameID(),
+                identifier: $message->getNameID(),
                 subjectConfirmation: [
                     new SubjectConfirmation(
                         method: C::CM_BEARER,
                         subjectConfirmationData: new SubjectConfirmationData(
                             notOnOrAfter: $clock->now()->add(new DateInterval('PT300S')),
                             recipient: $endpoint,
-                            inResponseTo: $query->getId(),
+                            inResponseTo: $message->getId(),
                         ),
                     ),
                 ],
@@ -196,7 +202,7 @@ public function main(/** @scrutinizer ignore-unused */ Request $request): Runnab
             issuer: new Issuer($issuer),
             id: (new Random())->generateID(),
             version: '2.0',
-            inResponseTo: $query->getId(),
+            inResponseTo: $message->getId(),
             destination: $endpoint,
             assertions: [$assertion],
         );

tests/bootstrap.php

@@ -1,7 +1,13 @@
 <?php
 
+<?php
+
 declare(strict_types=1);
 
+use Beste\Clock\LocalizedClock;
+use SimpleSAML\SAML2\Compat\ContainerSingleton;
+use SimpleSAML\SAML2\Compat\MockContainer;
+
 $projectRoot = dirname(__DIR__);
 require_once($projectRoot . '/vendor/autoload.php');
 
@@ -11,3 +17,11 @@
     echo "Linking '$linkPath' to '$projectRoot'\n";
     symlink($projectRoot, $linkPath);
 }
+
+// Load the system clock
+$systemClock = LocalizedClock::in(new DateTimeZone('Z'));
+
+// And set the Mock container as the Container to use.
+$container = new MockContainer();
+$container->setClock($systemClock);
+ContainerSingleton::setContainer($container);