Jeppe B
ab6c3ba5b6
## Root cause `route_t::hasPermission()` and `requirePermission()` are instance methods. Route code was invoking them with `self::`; the new XL Vask hall-scope helper made that call from a genuinely static context, causing PHP to throw: `Non-static method routes\\xlvaskUsageLogsRoute::hasPermission() cannot be called statically` ## Changes - Invoke route permission methods through `$this` across all 273 executable legacy calls in 45 route classes. - Make `xlvaskUsageLogsRoute::allowedHallIdsForUser()` an instance helper and update all 13 callers. - Preserve the existing all-scope and own-scope hall selection rules. - Add a token-aware regression test that rejects executable `self::hasPermission()` and `self::requirePermission()` calls, while ignoring comments. - Add focused XL Vask tests for global scanner hall scope and group-limited own scope. - Update affected route contract assertions to the instance-call form. ## Verification - PHP lint: all 53 changed PHP files - Focused PHPStan: changed XL Vask route and both new regression tests — clean - Focused regression slice: 58 passed, 748 assertions - Full local unit suite: 1,300 passed, 9,442 assertions (1 unrelated existing warning, 1 environment skip) - Full local API suite: 285 passed, 11,704 assertions - Exact-SHA GitHub Tests workflow: all 7 jobs passed (unit, API, integration, legacy, edge gateway, and supporting checks) - Independent exact-SHA QA gate: PASS, no findings - Independent exact-SHA security gate: PASS, no findings - Independent exact-SHA reviewer gate: PASS, no findings - Remote comparison: exactly one commit ahead of `40b104abed7723a7d1b7028190ecda0e7aeef829`; all 53 remote blob hashes matched the reviewed worktree ## Delivery state Draft only for human review. No merge or deployment is included. Qodana is skipped while the PR remains draft and is therefore not represented as a passed gate.
64 lines
2.9 KiB
PHP
64 lines
2.9 KiB
PHP
<?php
|
|
|
|
namespace routes;
|
|
|
|
use classes\authentication;
|
|
use objects\logs_o;
|
|
use traits\route_t;
|
|
|
|
|
|
class callbackMicrosoftRoute
|
|
{
|
|
use route_t;
|
|
|
|
public function run(): void
|
|
{
|
|
$this->post('/callback/microsoft/token', function () {
|
|
// Require the user to be logged in
|
|
global $response;
|
|
$this->requirePermission('callback_microsoft_token');
|
|
$user = (new authentication())->get_user();
|
|
// Check if the request was successful
|
|
if (!$user) {
|
|
// Log the incident
|
|
(new logs_o())->add('user_callback', 'global', 0, 0, 'USER_CALLBACK_MICROSOFT_TOKEN', 'User not logged in');
|
|
$response->error('Invalid session', 400);
|
|
}
|
|
// Require the parameters:
|
|
// client_info
|
|
// code
|
|
// session_state
|
|
// state
|
|
self::requireParameters(['client_info', 'code', 'session_state', 'state']);
|
|
// Check if the parameters are valid
|
|
self::requireType((string)self::getParameter('client_info'), self::type_string());
|
|
self::requireType((string)self::getParameter('code'), self::type_string());
|
|
self::requireType((string)self::getParameter('session_state'), self::type_string());
|
|
self::requireType((string)self::getParameter('state'), self::type_string());
|
|
// Check if the parameters are valid
|
|
$client_info = (string)self::getParameter('client_info');
|
|
$code = (string)self::getParameter('code');
|
|
$session_state = (string)self::getParameter('session_state');
|
|
$state = (string)self::getParameter('state');
|
|
// Check if the parameters are valid
|
|
if (empty($client_info) || empty($code) || empty($session_state) || empty($state)) {
|
|
(new logs_o())->add('user_callback', 'global', 0, $user->id, 'USER_CALLBACK_MICROSOFT_TOKEN', 'Invalid parameters');
|
|
$response->error('Invalid parameters', 400);
|
|
}
|
|
|
|
// Log the incident
|
|
(new logs_o())->add('user_callback', 'global', 1, $user->id, 'USER_CALLBACK_MICROSOFT_TOKEN', 'Successfully received callback from Microsoft');
|
|
// Save the parameters to the database
|
|
$user->keys->setValue('microsoft_client_info', $client_info);
|
|
$user->keys->setValue('microsoft_code', $code);
|
|
$user->keys->setValue('microsoft_session_state', $session_state);
|
|
$user->keys->setValue('microsoft_state', $state);
|
|
// Return a success message
|
|
$response->success(['message' => 'Successfully received callback from Microsoft', 'client_info' => $client_info, 'code' => $code, 'session_state' => $session_state, 'state' => $state]);
|
|
},
|
|
[
|
|
'callback_microsoft_token' => 'Callback Microsoft token (Set the token)',
|
|
]
|
|
);
|
|
}
|
|
} |