Fix validation condition for CAS10

Author: ioigoume

src/Cas/AttributeExtractor.php

@@ -55,7 +55,7 @@ public function __construct(
      * @param   array|null  $state
      *
      * @return array
-     * @throws Exception
+     * @throws \Exception
      */
     public function extractUserAndAttributes(?array $state): array
     {
@@ -76,12 +76,11 @@ public function extractUserAndAttributes(?array $state): array
             throw new \Exception("No cas user defined for attribute $casUsernameAttribute");
         }
 
+        $casAttributes = [];
         if ($this->casconfig->getOptionalValue('attributes', true)) {
             $attributesToTransfer = $this->casconfig->getOptionalValue('attributes_to_transfer', []);
 
             if (sizeof($attributesToTransfer) > 0) {
-                $casAttributes = [];
-
                 foreach ($attributesToTransfer as $key) {
                     if (\array_key_exists($key, $attributes)) {
                         $casAttributes[$key] = $attributes[$key];
@@ -90,8 +89,6 @@ public function extractUserAndAttributes(?array $state): array
             } else {
                 $casAttributes = $attributes;
             }
-        } else {
-            $casAttributes = [];
         }
 
         return [

src/Controller/Cas10Controller.php

@@ -147,8 +147,8 @@ public function validate(
         // Get the username field
         $usernameField = $this->casConfig->getOptionalValue('attrname', 'eduPersonPrincipalName');
 
-        // Fail if the username field is not present in the attribute list
-        if (!\array_key_exists($usernameField, $serviceTicket['attributes'])) {
+        // Fail if the username is not present in the ticket
+        if (empty($serviceTicket['userName'])) {
             Logger::error(
                 'casserver:validate: internal server error. Missing user name attribute: '
                 . var_export($usernameField, true),
@@ -161,7 +161,7 @@ public function validate(
 
         // Successful validation
         return new Response(
-            $this->cas10Protocol->getValidateSuccessResponse($serviceTicket['attributes'][$usernameField][0]),
+            $this->cas10Protocol->getValidateSuccessResponse($serviceTicket['userName']),
             Response::HTTP_OK,
         );
     }

tests/src/Controller/Cas10ControllerTest.php

@@ -233,7 +233,7 @@ public function testReturnBadRequestOnTicketMissingUsernameField(): void
             'service' => 'https://myservice.com/abcd',
         ];
         $this->ticket['validBefore'] = 9999999999;
-        $this->ticket['attributes'] = [];
+        $this->ticket['userName'] = '';
 
         $request = Request::create(
             uri: 'http://localhost',
@@ -330,6 +330,6 @@ public function testSuccessfullValidation(): void
         $response = $cas10Controller->validate($request, ...$params);
 
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals("yes\neduPersonPrincipalName@google.com\n", $response->getContent());
+        $this->assertEquals("yes\nusername@google.com\n", $response->getContent());
     }
 }