Recurring cleanup round over the code since round 7 (bc688f3). The
issue now also asks to fix bugs and small inconsistencies found on the
way, so unlike the rounds before, this one changes behaviour in a few
places. Duplicated code in api went from 23 clones with 228 lines to
none (jscpd, at least 50 tokens). In src it stays at 22 clones with
271 lines, the same before and after.
Bugs:
- nginx served project and snapshot files as they were, so anyone who
knew a project id could read it without signing in. Every file the
API writes now goes through AtomicFile (temp file, mode, rename).
Projects, snapshots, releases, accounts and sessions are 0640, and
nginx answers 403 for them.
- Any signed-in account could delete a shared image, font or sound,
which projects of other accounts may wear. Deleting one is now for
administrators only. The editor never deleted a file, so the
client's delete is gone.
- Two saves of one project could run at once. The lock file was
removed after each save, so a waiting save and the next one locked
different files. The lock file now stays, and deleting a project
takes the lock as well.
- Bytes that are no picture got a 500 instead of a 422, because the
error handler also threw for warnings silenced with @.
- A session file was rewritten in place. A request reading it at that
moment found it empty and was signed out. It is replaced atomically.
- Delete did nothing for a shape picked in the vector art list. Delete
now goes through removeSelection, one case per kind of selection,
and a kind without a case fails the type check.
Inconsistencies:
- Escape on a question does what its Cancel does. Cancel on "Delete
project?" and "Restore snapshot?" leads back to the picker or the
list like the other questions did, and so does deleting a project.
- Editor texts use American spelling throughout, like the port names:
48 British spellings in 45 lines (colour, centre, initialised).
- objectName and groupName replace eleven copies of "own name, else
the asset's" and three of "Group". One copy fell back to the object
id instead of "?".
Duplicates, dead code, comments:
- routeFiles serves images, fonts and sounds instead of three copies.
HashedFileStore holds what the three stores shared: keeping a file
under its hash with its name, listing and deleting. The stores keep
only which bytes they take and what a record says.
- AtomicFile replaces nine copies of temp file plus rename.
- removeShapes is the one way the canvas, the inspector button and
Delete take shapes out.
- GraphInterpreter.fire was called by tests only. The 54 calls use a
helper in tests/helpers.ts now.
- FileStore.delete, HttpFileStore.delete and the PluginApi type were
unused. A doc comment in actions.ts sat above the wrong function.
Checked and left as is:
- solidCells is used by tests only. It is the per-cell view before the
merge into rectangles, the one place the largest-scale rule shows.
- An undo checker ran all 124 commands of the unit tests and compared
the project before and after undo. The only differences are empty
ports, groups and notes lists where there were none, which the file
format drops anyway.
Docs:
- README: the check sum.
- Wiki, own commit: API (admin-only deletes, 422, file modes, lock
file), Home (the "Not yet" list named three things that exist),
Concepts, Keyboard, Vector art, Architecture and Development, and
the 38 characters Gitea flagged as ambiguous on eight pages.
- .gitignore: the lock files, and pasted-*.png in any folder, which
keeps the screenshot archive out.
Tests:
- ./check.sh: 195 files, 2817 tests, exit 0 (+2 for the name helpers).
- PHP: accounts 52 in the web container and 53 in the CI image with
the race test (+2), snapshots 15 (+1), releases 20.
- Full e2e run: ALL PASSED, 1586 checks (+6 in 12, 47, 49 and 50).
- Smokes jumprun, tetris, actor: 24, 19 and 21 checks. The example
project files were restored byte for byte afterwards.
- The file stores of HEAD and of this commit give byte-identical
output for the live folders and for store, list and delete in a
throwaway folder.
- Counter-checks, all fail as expected: a 500 for bad bytes fails 12,
no admin check fails 49, removing the lock file again loses saves
in 3 of 3 runs (151 to 170 of 321), Delete ignoring shapes fails 47,
Escape that only closes fails 50, and dropping the shape case fails
the type check (TS2366).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
172 lines
8.9 KiB
PHP
172 lines
8.9 KiB
PHP
<?php
|
||
declare(strict_types=1);
|
||
|
||
/**
|
||
* Accounts, roles and who may touch which project (#180, #179), without a web server: the stores
|
||
* work on a scratch directory. Plain PHP, no framework – CI runs it with `php tests/php/accounts.test.php`
|
||
* and reads the last line, as it does for the other suites.
|
||
*/
|
||
|
||
require __DIR__ . '/../../api/lib/AccountRules.php';
|
||
require __DIR__ . '/../../api/lib/AtomicFile.php';
|
||
require __DIR__ . '/../../api/lib/Store.php';
|
||
require __DIR__ . '/../../api/lib/UserStore.php';
|
||
|
||
$failed = 0;
|
||
$passed = 0;
|
||
|
||
function check(string $name, bool $ok, mixed $got = null): void
|
||
{
|
||
global $failed, $passed;
|
||
if ($ok) {
|
||
$passed++;
|
||
echo "PASS {$name}\n";
|
||
return;
|
||
}
|
||
$failed++;
|
||
echo "FAIL {$name}", $got === null ? '' : ' — got ' . json_encode($got), "\n";
|
||
}
|
||
|
||
function throws(callable $work): bool
|
||
{
|
||
try {
|
||
$work();
|
||
} catch (InvalidArgumentException) {
|
||
return true;
|
||
}
|
||
return false;
|
||
}
|
||
|
||
$dir = sys_get_temp_dir() . '/game-maker-php-test-' . bin2hex(random_bytes(4));
|
||
mkdir($dir);
|
||
$file = "{$dir}/users.json";
|
||
|
||
// --- UserStore ---------------------------------------------------------------------------------
|
||
|
||
file_put_contents($file, json_encode(['users' => [
|
||
['username' => 'old', 'password' => password_hash('secret12', PASSWORD_DEFAULT)],
|
||
['username' => 'odd', 'password' => password_hash('secret12', PASSWORD_DEFAULT), 'role' => 'root'],
|
||
]]));
|
||
$users = new UserStore($file);
|
||
check('an account without a role is a user', $users->role('old') === 'user', $users->role('old'));
|
||
check('an unknown role counts as user', $users->role('odd') === 'user', $users->role('odd'));
|
||
check('an account that is not there is a user', $users->role('nobody') === 'user');
|
||
check('the old accounts have no creation date', $users->accounts()[1]['createdAt'] === '', $users->accounts());
|
||
|
||
$users->put('boss', 'secret12', 'admin');
|
||
check('a role given on creation is kept', $users->role('boss') === 'admin');
|
||
check('a new account gets a creation date', $users->accounts()[0]['createdAt'] !== '', $users->accounts()[0]);
|
||
$created = $users->accounts()[0]['createdAt'];
|
||
$users->put('boss', 'another12');
|
||
check('a new password without a role leaves the role alone', $users->role('boss') === 'admin');
|
||
check('a new password leaves the creation date alone', $users->accounts()[0]['createdAt'] === $created);
|
||
check('the new password is the one that works', $users->verify('boss', 'another12') === 'boss');
|
||
$users->put('fresh', 'secret12');
|
||
check('a new account without a role is a user', $users->role('fresh') === 'user');
|
||
check('the role is written to the file', str_contains((string) file_get_contents($file), '"role": "admin"'));
|
||
check('an unknown role is refused', throws(fn() => $users->put('x1', 'secret12', 'root')));
|
||
check(
|
||
'the accounts carry no hash',
|
||
!str_contains(json_encode($users->accounts()), 'password') && !str_contains(json_encode($users->accounts()), '$2y$'),
|
||
);
|
||
check('one administrator counted', $users->adminCount() === 1, $users->adminCount());
|
||
$users->setRole('fresh', 'admin');
|
||
check('setRole makes an administrator', $users->role('fresh') === 'admin' && $users->adminCount() === 2);
|
||
check('setRole on nobody answers false', $users->setRole('nobody', 'user') === false);
|
||
|
||
check('rename moves the account', $users->rename('fresh', 'renamed') && $users->exists('renamed') && !$users->exists('fresh'));
|
||
check('rename keeps password and role', $users->verify('renamed', 'secret12') === 'renamed' && $users->role('renamed') === 'admin');
|
||
check('rename onto a taken name is refused', throws(fn() => $users->rename('renamed', 'OLD')));
|
||
check('the refused rename changed nothing', $users->exists('renamed') && $users->role('old') === 'user');
|
||
check('rename to an invalid name is refused', throws(fn() => $users->rename('renamed', 'a b')));
|
||
check('a change of case is the same account', $users->rename('renamed', 'Renamed') && $users->accounts()[0]['username'] === 'Renamed', $users->accounts());
|
||
check('rename of nobody answers false', $users->rename('nobody', 'somebody') === false);
|
||
check('remove takes the account away', $users->remove('renamed') && !$users->exists('renamed'));
|
||
check('remove of nobody answers false', $users->remove('renamed') === false);
|
||
|
||
// --- Store: who reaches a project --------------------------------------------------------------
|
||
|
||
$projects = "{$dir}/projects";
|
||
$mine = new Store($projects, 'anna');
|
||
$doc = $mine->create('Anna\'s game');
|
||
$id = $doc['id'];
|
||
$stranger = new Store($projects, 'bert');
|
||
$admin = new Store($projects, 'boss', true);
|
||
|
||
check('a stranger does not see the project', $stranger->load($id) === null);
|
||
check('a stranger cannot save it', $stranger->save($id, 1, ['name' => 'x']) === null);
|
||
check('a stranger cannot delete it', $stranger->delete($id) === false);
|
||
check('an administrator loads it', $admin->load($id)['name'] === "Anna's game");
|
||
$saved = $admin->save($id, 1, ['name' => 'Edited by boss']);
|
||
check('an administrator saves it', $saved !== null && $saved['revision'] === 2, $saved);
|
||
check('the save keeps the owner', $mine->load($id)['owner'] === 'anna', $mine->load($id)['owner'] ?? null);
|
||
check('the owner sees the edit', $mine->load($id)['name'] === 'Edited by boss');
|
||
check('the administrator\'s own list stays their own', $admin->list() === []);
|
||
check('listOf lists somebody else\'s projects', array_column($admin->listOf('anna'), 'id') === [$id]);
|
||
|
||
check('transfer moves the project to the new name', $admin->transfer('anna', 'annabel') === 1);
|
||
$moved = (new Store($projects, 'annabel'))->load($id);
|
||
check('the new name owns it', $moved !== null && $moved['owner'] === 'annabel');
|
||
check('the old name does not', $mine->load($id) === null);
|
||
check('transfer keeps the revision', $moved['revision'] === 2, $moved['revision'] ?? null);
|
||
|
||
$other = (new Store($projects, 'carl'))->create('Carl\'s game');
|
||
check('an administrator deletes somebody else\'s project', $admin->delete($other['id']) && $admin->listOf('carl') === []);
|
||
|
||
// The web server serves `data/` as static files, so a readable project would skip the sign-in.
|
||
check('a project file is not readable for the web server', (fileperms("{$projects}/{$id}.json") & 0o007) === 0);
|
||
|
||
// --- Store: saves at the same time -------------------------------------------------------------
|
||
|
||
// Every worker saves with the revision it just read and tries again when it was beaten to it, so
|
||
// no save may be lost: each one that succeeded has to show in the revision.
|
||
if (!function_exists('pcntl_fork')) {
|
||
echo "SKIP saves at the same time (this PHP has no pcntl)\n";
|
||
} else {
|
||
$raceDir = "{$dir}/race";
|
||
$raceId = (new Store($raceDir, 'anna'))->create('Race')['id'];
|
||
$workers = 8;
|
||
$rounds = 40;
|
||
$children = [];
|
||
for ($w = 0; $w < $workers; $w++) {
|
||
$pid = pcntl_fork();
|
||
if ($pid === 0) {
|
||
$store = new Store($raceDir, 'anna');
|
||
for ($won = 0; $won < $rounds;) {
|
||
try {
|
||
$store->save($raceId, $store->load($raceId)['revision'], ['name' => 'Race', 'by' => $w]);
|
||
$won++;
|
||
} catch (StaleRevisionException) {
|
||
}
|
||
}
|
||
exit(0);
|
||
}
|
||
$children[] = $pid;
|
||
}
|
||
foreach ($children as $pid) {
|
||
pcntl_waitpid($pid, $status);
|
||
}
|
||
$final = (new Store($raceDir, 'anna'))->load($raceId)['revision'];
|
||
check("{$workers} tabs saving at once lose none of the saves", $final === 1 + $workers * $rounds, $final);
|
||
}
|
||
|
||
// --- AccountRules ------------------------------------------------------------------------------
|
||
|
||
check('renaming yourself is refused', AccountRules::renameRefusal('boss', 'BOSS') !== null);
|
||
check('renaming somebody else is fine', AccountRules::renameRefusal('boss', 'anna') === null);
|
||
check('changing your own role is refused', AccountRules::roleRefusal('boss', 'boss', 'admin', 'user', 2) !== null);
|
||
check('setting your own role to what it is is fine', AccountRules::roleRefusal('boss', 'boss', 'admin', 'admin', 1) === null);
|
||
check('the last administrator cannot be demoted', AccountRules::roleRefusal('x', 'boss', 'admin', 'user', 1) !== null);
|
||
check('an administrator among two can be demoted', AccountRules::roleRefusal('x', 'boss', 'admin', 'user', 2) === null);
|
||
check('deleting yourself is refused', AccountRules::deleteRefusal('boss', 'boss', 'admin', 2) !== null);
|
||
check('the last administrator cannot be deleted', AccountRules::deleteRefusal('x', 'boss', 'admin', 1) !== null);
|
||
check('a user can be deleted', AccountRules::deleteRefusal('boss', 'anna', 'user', 1) === null);
|
||
check('an account with projects is not deleted', AccountRules::ownerRefusal('anna', 2) === 'anna still owns 2 projects');
|
||
check('one project is said as one', AccountRules::ownerRefusal('anna', 1) === 'anna still owns 1 project');
|
||
check('an account without projects may go', AccountRules::ownerRefusal('anna', 0) === null);
|
||
|
||
exec('rm -rf ' . escapeshellarg($dir));
|
||
|
||
echo $failed === 0 ? "ALL PASSED – {$passed} checks\n" : "{$failed} FAILED, {$passed} passed\n";
|
||
exit($failed === 0 ? 0 : 1);
|