fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(actions): complete admin request/csrf guard centralization

Browse Source
This commit is contained in:
Felix Schneider
2026-04-24 19:00:13 +02:00
parent 5e705f780d
commit d7b73fcefe
18 changed files with 464 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/admin/imports/index().php
View File

@@ -57,7 +57,7 @@ $hasImportPermission = static function (string $type) use ($currentUserId, $impo
if ($request->isMethod('POST')) {
$stage = trim((string) $request->body('stage', ''));
if (!Session::checkCsrfToken()) {
if (!actionRequireCsrf('admin/imports', flashOnFailure: false, redirectOnFailure: false)) {
$errorBag->addGlobal(t('Form expired, please try again'));
} elseif ($stage === 'analyze') {
if ($selectedType === '' || !$hasImportPermission($selectedType)) {

22
pages/admin/session-ping/data().php
View File

@@ -3,11 +3,13 @@
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Service\Settings\SettingsSessionGateway;
use MintyPHP\Session;
if ((requestInput()->method()) !== 'POST') {
http_response_code(405);
Router::json(['ok' => false, 'error' => 'method_not_allowed']);
if (!actionRequirePost(
'admin',
jsonAware: true,
jsonPayload: ['ok' => false, 'error' => 'method_not_allowed'],
forceJson: true
)) {
return;
}
@@ -20,9 +22,15 @@ if ($currentUserId <= 0) {
return;
}
if (!Session::checkCsrfToken()) {
http_response_code(403);
Router::json(['ok' => false, 'error' => 'csrf']);
if (!actionRequireCsrf(
'admin',
jsonAware: true,
jsonStatusCode: 403,
jsonPayload: ['ok' => false, 'error' => 'csrf'],
flashOnFailure: false,
redirectOnFailure: false,
forceJson: true
)) {
return;
}

24
pages/admin/tenants/ldap-test-connection/data().php
View File

@@ -1,22 +1,32 @@
<?php
use MintyPHP\Service\Access\TenantAuthorizationPolicy;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
Guard::requireLogin();
header('Content-Type: application/json; charset=utf-8');
if (requestInput()->method() !== 'POST') {
http_response_code(405);
echo json_encode(['ok' => false, 'error' => 'Method not allowed']);
if (!actionRequirePost(
'admin/tenants',
jsonAware: true,
jsonError: 'Method not allowed',
jsonPayload: ['ok' => false, 'error' => 'Method not allowed'],
forceJson: true
)) {
return;
}
if (!Session::checkCsrfToken()) {
http_response_code(403);
echo json_encode(['ok' => false, 'error' => 'CSRF token invalid']);
if (!actionRequireCsrf(
'admin/tenants',
jsonAware: true,
jsonError: 'CSRF token invalid',
jsonStatusCode: 403,
jsonPayload: ['ok' => false, 'error' => 'CSRF token invalid'],
flashOnFailure: false,
redirectOnFailure: false,
forceJson: true
)) {
return;
}

20
pages/admin/users/api-token-create($id).php
View File

@@ -3,7 +3,6 @@
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Service\Access\UserAuthorizationPolicy;
use MintyPHP\Session;
use MintyPHP\Support\Flash;
use MintyPHP\Support\Guard;
@@ -20,6 +19,7 @@ $user = $uuid !== '' ? $userAccountService->findByUuid($uuid) : null;
if (!$user) {
Router::redirect('admin/users');
}
$redirectTarget = "admin/users/edit/{$uuid}";
$userId = (int) ($user['id'] ?? 0);
$currentUserId = (int) ($session['user']['id'] ?? 0);
@@ -32,27 +32,29 @@ if (!$decision->isAllowed()) {
return;
}
if (!Session::checkCsrfToken()) {
Flash::error(t('Form expired, please try again'), "admin/users/edit/{$uuid}", 'csrf_expired');
Router::redirect("admin/users/edit/{$uuid}");
if (!actionRequirePost($redirectTarget)) {
return;
}
if (!actionRequireCsrf($redirectTarget, $redirectTarget, 'csrf_expired')) {
return;
}
$name = trim((string) (requestInput()->bodyAll()['token_name'] ?? ''));
if ($name === '') {
Flash::error(t('Token name is required'), "admin/users/edit/{$uuid}", 'api_token_error');
Router::redirect("admin/users/edit/{$uuid}");
Flash::error(t('Token name is required'), $redirectTarget, 'api_token_error');
Router::redirect($redirectTarget);
}
$result = $apiTokenService->create($userId, $name, null, null, $currentUserId);
if ($result['ok'] ?? false) {
$sessionStore->set('api_token_created', ['token' => $result['token'], 'uuid' => $uuid]);
Flash::success(t('API token created. Copy it now — it will not be shown again.'), "admin/users/edit/{$uuid}", 'api_token_created');
Flash::success(t('API token created. Copy it now — it will not be shown again.'), $redirectTarget, 'api_token_created');
} else {
$error = $result['error'] ?? 'create_failed';
Flash::error(t('Could not create API token: %s', $error), "admin/users/edit/{$uuid}", 'api_token_error');
Flash::error(t('Could not create API token: %s', $error), $redirectTarget, 'api_token_error');
}
Router::redirect("admin/users/edit/{$uuid}");
Router::redirect($redirectTarget);

14
pages/admin/users/api-token-revoke($id).php
View File

@@ -3,7 +3,6 @@
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Service\Access\UserAuthorizationPolicy;
use MintyPHP\Session;
use MintyPHP\Support\Flash;
use MintyPHP\Support\Guard;
@@ -18,6 +17,7 @@ $user = $uuid !== '' ? $userAccountService->findByUuid($uuid) : null;
if (!$user) {
Router::redirect('admin/users');
}
$redirectTarget = "admin/users/edit/{$uuid}";
$userId = (int) ($user['id'] ?? 0);
$currentUserId = (int) ($session['user']['id'] ?? 0);
@@ -30,9 +30,11 @@ if (!$decision->isAllowed()) {
return;
}
if (!Session::checkCsrfToken()) {
Flash::error(t('Form expired, please try again'), "admin/users/edit/{$uuid}", 'csrf_expired');
Router::redirect("admin/users/edit/{$uuid}");
if (!actionRequirePost($redirectTarget)) {
return;
}
if (!actionRequireCsrf($redirectTarget, $redirectTarget, 'csrf_expired')) {
return;
}
@@ -40,7 +42,7 @@ $tokenId = (int) (requestInput()->bodyAll()['token_id'] ?? 0);
if ($tokenId > 0) {
$apiTokenService->revoke($tokenId);
Flash::success(t('API token revoked'), "admin/users/edit/{$uuid}", 'api_token_revoked');
Flash::success(t('API token revoked'), $redirectTarget, 'api_token_revoked');
}
Router::redirect("admin/users/edit/{$uuid}");
Router::redirect($redirectTarget);

21
pages/admin/users/bulk($action).php
View File

@@ -4,14 +4,29 @@ use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Service\Access\UserAuthorizationPolicy;
use MintyPHP\Service\User\UserAccessTemplateService;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
$session = app(SessionStoreInterface::class)->all();
Guard::requireLogin();
if (!Session::checkCsrfToken()) {
Router::json(['ok' => false, 'error' => 'csrf_expired']);
if (!actionRequirePost(
'admin/users',
jsonAware: true,
jsonPayload: ['ok' => false, 'error' => 'method_not_allowed'],
forceJson: true
)) {
return;
}
if (!actionRequireCsrf(
'admin/users',
jsonAware: true,
jsonStatusCode: 200,
jsonPayload: ['ok' => false, 'error' => 'csrf_expired'],
flashOnFailure: false,
redirectOnFailure: false,
forceJson: true
)) {
return;
}

5
pages/admin/users/create().php
View File

@@ -9,7 +9,6 @@ use MintyPHP\Service\Access\UiAccessService;
use MintyPHP\Service\Access\UiCapabilityMap;
use MintyPHP\Service\Access\UserAuthorizationPolicy;
use MintyPHP\Service\CustomField\UserCustomFieldValueService;
use MintyPHP\Session;
use MintyPHP\Support\Flash;
use MintyPHP\Support\Guard;
@@ -99,9 +98,7 @@ $form = [
'active' => 1,
];
if ($request->isMethod('POST') && !Session::checkCsrfToken()) {
Flash::error(t('Form expired, please try again'), $createTarget, 'csrf_expired');
Router::redirect($createTarget);
if ($request->isMethod('POST') && !actionRequireCsrf($createTarget, $createTarget, 'csrf_expired')) {
return;
}

20
pages/admin/users/switch-tenant().php
View File

@@ -3,7 +3,6 @@
use MintyPHP\Http\Request;
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
$sessionStore = app(SessionStoreInterface::class);
@@ -13,20 +12,17 @@ Guard::requireLogin();
$userTenantContextService = app(\MintyPHP\Service\User\UserTenantContextService::class);
$errorBag = formErrors();
if ((requestInput()->method()) !== 'POST') {
Router::redirect('admin');
if (!actionRequirePost('admin')) {
return;
}
if (!Session::checkCsrfToken()) {
if (Request::wantsJson()) {
http_response_code(400);
Router::json(['ok' => false, 'error' => 'csrf']);
return;
}
$errorBag->addGlobal(t('Form expired, please try again'));
flashFormErrors($errorBag, 'admin', 'switch_tenant');
Router::redirect('admin');
if (!actionRequireCsrf(
'admin',
'admin',
'switch_tenant',
jsonAware: true,
jsonPayload: ['ok' => false, 'error' => 'csrf']
)) {
return;
}

17
pages/admin/users/theme().php
View File

@@ -3,7 +3,6 @@
use MintyPHP\Http\Request;
use MintyPHP\Http\SessionStoreInterface;
use MintyPHP\Router;
use MintyPHP\Session;
use MintyPHP\Support\Guard;
$sessionStore = app(SessionStoreInterface::class);
@@ -13,18 +12,16 @@ Guard::requireLogin();
$userAccountService = app(\MintyPHP\Service\User\UserAccountService::class);
$errorBag = formErrors();
if ((requestInput()->method()) !== 'POST') {
Router::redirect('admin');
if (!actionRequirePost('admin')) {
return;
}
if (!Session::checkCsrfToken()) {
if (Request::wantsJson()) {
http_response_code(400);
Router::json(['ok' => false, 'error' => 'csrf']);
return;
}
Router::redirect('admin');
if (!actionRequireCsrf(
'admin',
jsonAware: true,
jsonPayload: ['ok' => false, 'error' => 'csrf'],
flashOnFailure: false
)) {
return;
}