From d85690a162d04153f707ef87cd44a5368476a91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Kooman?= <fkooman@tuxed.net>
Date: Wed, 20 Mar 2024 17:38:36 +0100
Subject: [PATCH] simplify code somewhat

---
 composer.lock      | Bin 9474 -> 9474 bytes
 web/well-known.php |   7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2ef4d9afbe54d12e7cb12a10a83af314f2e8c6e8..b93f4cc3432190a6f18e8bd2f8ddfc1f7996a007 100644
GIT binary patch
delta 74
zcmZqjYVz8k#iU`9Vs4UTWMN=wnq+EhYMGK|W|nATo@``bW|(G@VwPf=YM5k{WN1El
eBAeXi0;XUVb~7tu6Dw2W$rpvJHnXt*lLY_?kQD*|

delta 74
zcmZqjYVz8k#iU`7mS|*VU~Fh+Zfas|k!oOKVr*cMWMG+=WMO7vVV0a|X_{<kYG^ij
eBAeXi0;XUVb|WhTLn{M|$rpvJHnXt*lLY|gSrjn<

diff --git a/web/well-known.php b/web/well-known.php
index 82359bc..8cc4543 100644
--- a/web/well-known.php
+++ b/web/well-known.php
@@ -39,17 +39,16 @@ use fkooman\SAML\IdP\Http\Request;
 try {
     $config = Config::fromFile($baseDir . '/config/config.php');
 
-    $supportedAlgList = [];
+    // XXX it is insane we need to load all the keys just to get a list of
+    // supported algorithms for the discovery
     $publicKeySet = new PublicKeySet();
     foreach (glob($baseDir . '/config/keys/rsa_*.key') as $secretKeyFile) {
         [,$keyId] = explode('_', basename($secretKeyFile, '.key'), 2);
         $secretKey = RS256SecretKey::fromPem(FileIO::read($secretKeyFile), $keyId);
-        $supportedAlgList[] = $secretKey->alg();
         $publicKeySet->add($secretKey->publicKey());
     }
     foreach (glob($baseDir . '/config/keys/ed_*.key') as $secretKeyFile) {
         $secretKey = EdDSASecretKey::load(FileIO::read($secretKeyFile));
-        $supportedAlgList[] = $secretKey->alg();
         $publicKeySet->add($secretKey->publicKey());
     }
 
@@ -62,7 +61,7 @@ try {
                     $request->getRootUri() . 'openid/authorize',
                     $request->getRootUri() . 'openid/token',
                     $request->getRootUri() . 'openid/userinfo',
-                    array_values(array_unique($supportedAlgList)),
+                    $publicKeySet->algList(),
                     $request->getRootUri() . 'openid/jwks'
                 )
             );
-- 
2.45.2