Skip to content

Allow service tickets on proxyValidate #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pradtke merged 3 commits into from
Nov 21, 2025
Merged

Allow service tickets on proxyValidate #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0edeb3d
Allow service tickets on proxyValidate
dlundgren Nov 12, 2025
d4f1aae
Merge branch 'master' into dl/allow-service-ticket-on-proxyValidate
pradtke Nov 20, 2025
9d28b70
Update to satisfy phpstan
pradtke Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
"scripts": {
"verify": [
"vendor/bin/phpcs -p",
"vendor/bin/phpunit --no-coverage --testdox"
"vendor/bin/phpunit --no-coverage --testdox",
"vendor/bin/phpstan --memory-limit=256M analyze -c phpstan.neon"
],
"tests": [
"vendor/bin/phpunit --no-coverage"
Expand Down
39 changes: 24 additions & 15 deletions src/Controller/Traits/TicketValidatorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,7 @@ public function validate(
$message = '';
// Below, we do not have a ticket or the ticket does not meet the very basic criteria that allow
// any further handling
if (empty($serviceTicket)) {
// No ticket
$message = 'Ticket ' . var_export($ticket, true) . ' not recognized';
$failed = true;
} elseif ($method === 'proxyValidate' && !$this->ticketFactory->isProxyTicket($serviceTicket)) {
// proxyValidate but not a proxy ticket
$message = 'Ticket ' . var_export($ticket, true) . ' is not a proxy ticket.';
$failed = true;
} elseif ($method === 'serviceValidate' && !$this->ticketFactory->isServiceTicket($serviceTicket)) {
// serviceValidate but not a service ticket
$message = 'Ticket ' . var_export($ticket, true) . ' is not a service ticket.';
$failed = true;
}

if ($failed) {
if ($message = $this->validateServiceTicket($serviceTicket, $ticket, $method)) {
$finalMessage = 'casserver:validate: ' . $message;
Logger::error(__METHOD__ . '::' . $finalMessage);

Expand Down Expand Up @@ -185,4 +171,27 @@ public function validate(
Response::HTTP_OK,
);
}

/**
* @param array{'id': string}|null $serviceTicket
*
* @return ?string Message on failure, null on success
*/
private function validateServiceTicket(?array $serviceTicket, string $ticket, string $method): ?string
{
if (empty($serviceTicket)) {
return 'Ticket ' . var_export($ticket, true) . ' not recognized';
}

$isServiceTicket = $this->ticketFactory->isServiceTicket($serviceTicket);
if ($method === 'serviceValidate' && !$isServiceTicket) {
return 'Ticket ' . var_export($ticket, true) . ' is not a service ticket.';
}

if ($method === 'proxyValidate' && !$isServiceTicket && !$this->ticketFactory->isProxyTicket($serviceTicket)) {
return 'Ticket ' . var_export($ticket, true) . ' is not a proxy ticket.';
}

return null;
}
}
19 changes: 10 additions & 9 deletions tests/src/Controller/Cas20ControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,14 +565,6 @@ public static function validateOnDifferentQueryParameterCombinationsProxyValidat
"Ticket 'PT-{$sessionId}' has expired",
'PT-' . $sessionId,
],
'Returns Bad Request on Ticket is A Service Ticket' => [
[
'ticket' => 'ST-' . $sessionId,
'service' => 'https://myservice.com/abcd',
],
"Ticket 'ST-{$sessionId}' is not a proxy ticket.",
'ST-' . $sessionId,
],
'Returns Bad Request on Ticket Issued By Single SignOn Session' => [
[
'ticket' => 'PT-' . $sessionId,
Expand All @@ -583,7 +575,7 @@ public static function validateOnDifferentQueryParameterCombinationsProxyValidat
'PT-' . $sessionId,
9999999999,
],
'Returns Success' => [
'Returns Success with Proxy Ticket' => [
[
'ticket' => 'PT-' . $sessionId,
'service' => 'https://myservice.com/abcd',
Expand All @@ -592,6 +584,15 @@ public static function validateOnDifferentQueryParameterCombinationsProxyValidat
'PT-' . $sessionId,
9999999999,
],
'Returns Success with Service Ticket' => [
[
'ticket' => 'ST-' . $sessionId,
'service' => 'https://myservice.com/abcd',
],
'username@google.com',
'ST-' . $sessionId,
9999999999,
],
];
}

Expand Down