feat: OIDC initiator throw separate exception type for bad request

oat-sa · Nov 21, 2024 · 2a7a9a0 · 2a7a9a0
1 parent d2af7e4
commit 2a7a9a0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/Security/Oidc/OidcInitiator.php b/src/Security/Oidc/OidcInitiator.php
@@ -22,6 +22,8 @@
 
 namespace OAT\Library\Lti1p3Core\Security\Oidc;
 
+use InvalidArgumentException;
+use OAT\Library\Lti1p3Core\Exception\LtiBadRequestException;
 use OAT\Library\Lti1p3Core\Exception\LtiException;
 use OAT\Library\Lti1p3Core\Exception\LtiExceptionInterface;
 use OAT\Library\Lti1p3Core\Message\LtiMessage;
@@ -121,6 +123,12 @@ public function initiate(ServerRequestInterface $request): LtiMessageInterface
 
         } catch (LtiExceptionInterface $exception) {
             throw $exception;
+        } catch (InvalidArgumentException $exception) {
+            throw new LtiBadRequestException(
+                sprintf('OIDC initiation request failed: %s', $exception->getMessage()),
+                $exception->getCode(),
+                $exception
+            );
         } catch (Throwable $exception) {
             throw new LtiException(
                 sprintf('OIDC initiation failed: %s', $exception->getMessage()),

diff --git a/tests/Unit/Security/Oidc/OidcInitiatorTest.php b/tests/Unit/Security/Oidc/OidcInitiatorTest.php
@@ -23,6 +23,7 @@
 namespace OAT\Library\Lti1p3Core\Tests\Unit\Security\Oidc;
 
 use Exception;
+use OAT\Library\Lti1p3Core\Exception\LtiBadRequestException;
 use OAT\Library\Lti1p3Core\Exception\LtiException;
 use OAT\Library\Lti1p3Core\Registration\RegistrationInterface;
 use OAT\Library\Lti1p3Core\Registration\RegistrationRepositoryInterface;
@@ -150,4 +151,14 @@ public function testInitiationFailureOnGenericError(): void
 
         $this->subject->initiate($request);
     }
+
+    public function testInitiationFailureOnMissingMandatoryRequestParams(): void
+    {
+        $this->expectException(LtiBadRequestException::class);
+        $this->expectExceptionMessage('OIDC initiation request failed: Missing mandatory iss');
+
+        $request = $this->createServerRequest('GET','http://tool.com/init');
+
+        $this->subject->initiate($request);
+    }
 }