Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions core/components/minishop3/config/routes/manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
]);
})->middleware(new AuthMiddleware($modx, 'mgr'));

// Config reads: any authenticated mgr (product forms load page-fields without settings perm)
$router->group('/config', function($router) use ($modx) {
$router->get('/page-fields/{page_key}', function($params) use ($modx) {
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
Expand All @@ -58,6 +59,14 @@
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->getAllPageFields($params);
});
$router->get('/sections/{page_key}', function($params) use ($modx) {
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->getSections($params);
});
});

// Config writes: mssetting_save — same gate as model-fields / extra-fields writes (#381)
$router->group('/config', function($router) use ($modx) {
$router->put('/page-fields/{page_key}', function($params) use ($modx) {
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->updatePageFields($params);
Expand All @@ -66,10 +75,6 @@
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->deleteFieldOverride($params);
});
$router->get('/sections/{page_key}', function($params) use ($modx) {
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->getSections($params);
});
$router->put('/sections/{page_key}', function($params) use ($modx) {
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->updateSections($params);
Expand All @@ -78,8 +83,9 @@
$controller = new \MiniShop3\Controllers\Api\ConfigController($modx);
return $controller->deleteSection($params);
});

});
}, [
new PermissionMiddleware($modx, 'mssetting_save')
]);

$router->group('/models', function($router) use ($modx) {
$router->get('/{alias}/fields', function($params) use ($modx) {
Expand Down
113 changes: 113 additions & 0 deletions core/components/minishop3/tests/ConfigRoutePermissionsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?php

/**
* Router-level check: /api/mgr/config writes require mssetting_save; reads stay Auth-only (#381).
*
* Run: php tests/ConfigRoutePermissionsTest.php
*/

declare(strict_types=1);

require __DIR__ . '/stubs/ModxStub.php';
require __DIR__ . '/../vendor/autoload.php';

use MiniShop3\Router\Middleware\PermissionMiddleware;
use MiniShop3\Router\Router;
use MODX\Revolution\modX;

$fail = static function (string $message): never {
fwrite(STDERR, "FAIL: {$message}\n");
exit(1);
};

$assertSame = static function ($expected, $actual, string $label) use ($fail): void {
if ($actual !== $expected) {
$fail(sprintf(
"%s:\nexpected: %s\nactual: %s",
$label,
var_export($expected, true),
var_export($actual, true)
));
}
};

$permissionFromMiddlewares = static function (array $middlewares): ?string {
$found = null;
foreach ($middlewares as $middleware) {
if (!$middleware instanceof PermissionMiddleware) {
continue;
}
$reflection = new ReflectionProperty(PermissionMiddleware::class, 'permission');
$permission = $reflection->getValue($middleware);
$found = $permission;
}

return $found;
};

$_SERVER['HTTP_MODAUTH'] = 'test-modauth-token';

$modx = new modX();
$router = new Router($modx);
$router->loadRoutes(dirname(__DIR__) . '/config/routes/manager.php');
$router->build();

$routesProperty = new ReflectionProperty(Router::class, 'routes');
$registered = $routesProperty->getValue($router);

$expected = [
'GET /api/mgr/config/page-fields/{page_key}' => null,
'GET /api/mgr/config/page-fields/{page_key}/all' => null,
'GET /api/mgr/config/sections/{page_key}' => null,
'PUT /api/mgr/config/page-fields/{page_key}' => 'mssetting_save',
'DELETE /api/mgr/config/page-fields/{page_key}/{field_name}' => 'mssetting_save',
'PUT /api/mgr/config/sections/{page_key}' => 'mssetting_save',
'DELETE /api/mgr/config/sections/{page_key}/{section_key}' => 'mssetting_save',
];

$actual = [];
foreach ($registered as $route) {
$pattern = $route['pattern'] ?? '';
if (!str_starts_with($pattern, '/api/mgr/config')) {
continue;
}
$method = is_array($route['method'] ?? null)
? implode('|', $route['method'])
: (string) ($route['method'] ?? '');
$key = strtoupper($method) . ' ' . $pattern;
$actual[$key] = $permissionFromMiddlewares($route['middlewares'] ?? []);
}

foreach ($expected as $routeKey => $permission) {
$assertSame($permission, $actual[$routeKey] ?? null, "route {$routeKey}");
}

$unknown = array_diff(array_keys($actual), array_keys($expected));
if ($unknown !== []) {
$fail('unexpected config routes: ' . implode(', ', $unknown));
}

$assertDenied = static function (
Router $router,
string $method,
string $uri,
string $label
) use ($assertSame, $fail): void {
$response = $router->dispatch($uri, $method);
$data = $response->getData();
$assertSame(403, $response->getStatusCode(), "{$label}: status");
$assertSame(false, $data['success'] ?? null, "{$label}: success");
if (!str_contains((string) ($data['message'] ?? ''), 'mssetting_save')) {
$fail("{$label}: message should mention mssetting_save");
}
};

// Runtime: no mssetting_save → write 403; GET still reaches handler (not 403 from permission)
$modx->setPermissions([]);
$assertDenied($router, 'PUT', '/api/mgr/config/page-fields/order', 'PUT page-fields');
$assertDenied($router, 'DELETE', '/api/mgr/config/sections/order/main', 'DELETE section');
$assertDenied($router, 'PUT', '/api/mgr/config/sections/order', 'PUT sections');
$assertDenied($router, 'DELETE', '/api/mgr/config/page-fields/order/title', 'DELETE field override');

fwrite(STDOUT, "OK ConfigRoutePermissionsTest\n");
exit(0);
59 changes: 59 additions & 0 deletions core/components/minishop3/tests/stubs/ModxStub.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php

declare(strict_types=1);

namespace MODX\Revolution;

/**
* Minimal modX stub for standalone router permission tests (no full MODX install).
*/
class modX
{
/** @var object|null */
public $user;

/** @var object|null */
public $context;

/** @var array<string, bool> */
private array $permissions = [];

public function __construct()
{
$this->context = new class {
public function get(string $key): string
{
return $key === 'key' ? 'mgr' : '';
}
};

$this->user = new class {
public function isAuthenticated(string $context): bool
{
return $context === 'mgr';
}

public function getUserToken(string $contextKey): string
{
return 'test-modauth-token';
}
};
}

/**
* @param list<string> $permissions
*/
public function setPermissions(array $permissions): void
{
$this->permissions = array_fill_keys($permissions, true);
}

public function hasPermission(string $permission): bool
{
return !empty($this->permissions[$permission]);
}

public function log($level, $message): void
{
}
}