Fix duplicate date-header

composer.json

@@ -36,7 +36,7 @@
         "php": "^8.1",
 
         "simplesamlphp/assert": "^1.0.0",
-        "simplesamlphp/simplesamlphp": "^2.2.0",
+        "simplesamlphp/simplesamlphp": "dev-bugfix/discopwer-duplicate-date-header",
         "simplesamlphp/composer-module-installer": "^1.3.4",
         "symfony/http-foundation": "^6.4.0"
     },

src/Controller/DiscoPower.php

@@ -8,15 +8,15 @@
 use SimpleSAML\Error;
 use SimpleSAML\Module\discopower\PowerIdPDisco;
 use SimpleSAML\Session;
-use Symfony\Component\HttpFoundation\{JsonResponse, Request, Response, StreamedResponse};
+use Symfony\Component\HttpFoundation\{JsonResponse, Request, Response};
 
 class DiscoPower
 {
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request The current request.
-     * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function main(Request $request): StreamedResponse
+    public function main(Request $request): Response
     {
         try {
             $discoHandler = new PowerIdPDisco(
@@ -29,7 +29,7 @@
         }
 
         try {
-            return new StreamedResponse([$discoHandler, 'handleRequest']);
+            return $discoHandler->handleRequest();
         } catch (Exception $exception) {
             // An error here should be caused by metadata
             throw new Error\Error('METADATA', $exception);
@@ -58,10 +58,10 @@
         // handle JSONP requests
         if ($request->query->has('callback')) {
             $callback = $request->query->get('callback');
             if (!preg_match('/^[a-z0-9_]+$/i', $callback)) {
                 throw new Error\Exception('Unsafe JSONP callback function name ' . var_export($callback, true));
             }
             $response->setCallback($callback);
         }
 
         $response->setData(

src/PowerIdPDisco.php

@@ -13,6 +13,7 @@
 use SimpleSAML\Utils;
 use SimpleSAML\XHTML\IdPDisco;
 use SimpleSAML\XHTML\Template;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * This class implements a generic IdP discovery service, for use in various IdP discovery service pages. This should
@@ -235,7 +236,7 @@
                  * and because the SP could bypass all of this anyway by specifying a known IdP in scoping.
                  */
                 try {
                     parse_str(parse_url($_GET['return'], PHP_URL_QUERY), $returnState);
                     $state = Auth\State::loadState($returnState['AuthID'], 'saml:sp:sso');
                     if ($state && array_key_exists('SPMetadata', $state)) {
                         $spmd = $state['SPMetadata'];
@@ -289,10 +290,16 @@
      * Handles a request to this discovery service.
      *
      * The IdP disco parameters should be set before calling this function.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handleRequest(): void
+    public function handleRequest(): Response
     {
         $this->start();
+        $result = $this->start();
+        if ($result !== null) {
+            return $result;
+        }
 
         // no choice made. Show discovery service page
         $idpList = $this->getIdPList();
@@ -312,7 +319,7 @@
         $t->data['idplist'] = $idpList;
         $t->data['faventry'] = null;
         foreach ($idpList as $tab => $slist) {
             if (!empty($preferredIdP) && array_key_exists($preferredIdP, $slist)) {
                 $t->data['faventry'] = $slist[$preferredIdP];
                 break;
             }
@@ -344,7 +351,7 @@
                 $t->data['tabNames'][$tab] = $translator::noop($translatableTag);
             }
         }
-        $t->send();
+        return $t;
     }
 
 
@@ -389,11 +396,11 @@
             return [];
         }
 
         $ret = (string) $_COOKIE['_saml_idp'];
         $ret = explode(' ', $ret);
         foreach ($ret as &$idp) {
             $idp = base64_decode($idp);
             if ($idp === false) {
                 // not properly base64 encoded
                 return [];
             }
@@ -437,7 +444,7 @@
                 // we are left with a single entityID whose base64 representation is too long to fit in a cookie
                 break;
             }
             $newCookie = $tmp[1];
         }
 
         $params = [