Tests / test (pull_request) Successful in 1m10s
Brings preauth from 18/34 to 30/34 conformance (auth-gateway profile). The
remaining four checks all depend on files this branch cannot change (see below).
PHP toolchain (§1)
- require.php >=8.4 -> ^8.5, and pin config.platform to 8.5.0. The old
constraint also permitted PHP 9, which is not a promise we can keep.
composer.lock regenerated with --lock: content-hash + platform-overrides
only, zero dependency version movement.
- friendsofphp/php-cs-fixer * -> ^3.95. A wildcard meant CI was not
reproducible.
PHPStan (§2.2)
- vendor the shared phpstan.neon.dist (level 6) + a generated baseline.
187 errors are captured rather than fixed; the baseline should only shrink
from here.
- add phpstan/phpstan:^2.1 to require-dev.
Code style (§8.2)
- vendor the shared .php-cs-fixer.dist.php (@Symfony + @Symfony:risky +
declare_strict_types) and apply it: 59 of 67 files reformatted.
- Verified this is a formatting change, not a behaviour change: all 313 tests
pass after the reformat, all in_array() calls already passed strict=true,
and the remaining edits are @Symfony:risky idiom (yoda conditions, \count(),
self:: over the class name).
Repository layout (§4.4)
- docs/{Caddyfile,compose.yaml,example.env} -> docs/examples/, with
example.env becoming the conventional .env.example. This is the layout
GUIDING-LIGHT already cites preauth as doing correctly — it just needed
renaming.
- update the four readme.md references and a stale compose.yaml comment.
- docs/v1.1-plan.md references are left alone deliberately: it is a historical
plan recording what was done at the time, not live documentation.
Licence and security policy (§7)
- add LICENSE (uniform MIT, matching composer.json).
- add SECURITY.md describing the actual threat model: per-request
allow/intercept, no caching of the login flow, app-set security headers,
TOTP, and the fact that REMOTE_USER is trusted input.
Mobile accessibility (§3.3a)
- templates/base.html.twig: drop maximum-scale=1 and add viewport-fit=cover.
preauth was the one app already past the font-size precondition (controls
render at 21.6px = 0.9em x 24px), so removing the lock is safe here and
restores pinch-zoom for Android users.
Conformance tooling (§8.2)
- vendor .ci/conformance.sh and .ci/css-control-size.py so the check runs
from a checkout rather than fetching from the LAN-only private/ci.
- .editorconfig synced from the version that keeps the Caddyfile tab rule.
Not included (blocked by the .gitea/workflows pre-receive hook):
- ci-composer-audit, ci-composer-validate, ci-reusable-workflows.
Workflow files may only change via a trusted ref, so the caller files are
staged but not committed.
Also not included: dockerfile-nonroot (§6.4). Adding USER to an image with
VOLUME [/config, /data] changes volume ownership and needs an actual container
build/run to verify, so it goes in its own change.
205 lines
5.8 KiB
PHP
205 lines
5.8 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App;
|
|
|
|
use OutOfBoundsException;
|
|
use Psr\Cache\CacheItemInterface;
|
|
use Psr\Cache\CacheItemPoolInterface;
|
|
use Psr\Cache\InvalidArgumentException;
|
|
|
|
/* we must *NOT* store the key-list item or values within this object
|
|
* because it can change from outside this object instance */
|
|
final readonly class MonitorCacheKeys implements CacheItemPoolInterface
|
|
{
|
|
private const string KEY_LIST = '__key_list';
|
|
private const string CHANGE_LIST = '__chg_list';
|
|
public const int UPDATED = 1;
|
|
public const int REMOVED = 2;
|
|
|
|
private CacheItemPoolInterface $cache;
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function __construct(CacheItemPoolInterface $cache)
|
|
{
|
|
$this->cache = $cache;
|
|
$items = $cache->getItems([self::KEY_LIST, self::CHANGE_LIST]);
|
|
foreach ($items as $item) {
|
|
if (!$item->isHit()) {
|
|
$this->initialize();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
private function initialize(): void
|
|
{
|
|
$keyList = $this->cache->getItem(self::KEY_LIST);
|
|
$changeList = $this->cache->getItem(self::CHANGE_LIST);
|
|
$keyList->set([]);
|
|
$changeList->set([]);
|
|
$this->cache->saveDeferred($keyList);
|
|
$this->cache->saveDeferred($changeList);
|
|
$this->cache->commit();
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function getKeys(): array
|
|
{
|
|
$keyList = $this->cache->getItem(self::KEY_LIST);
|
|
|
|
return array_keys($keyList->get() ?? []);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function getChanges(): array
|
|
{
|
|
$changeList = $this->cache->getItem(self::CHANGE_LIST);
|
|
|
|
return $changeList->get() ?? [];
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function markClean(): void
|
|
{
|
|
$changeList = $this->cache->getItem(self::CHANGE_LIST);
|
|
$changeList->set([]);
|
|
$this->cache->save($changeList);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function getItem(string $key): CacheItemInterface
|
|
{
|
|
return $this->cache->getItem($key);
|
|
}
|
|
|
|
/** @return CacheItemInterface[]
|
|
* @throws InvalidArgumentException */
|
|
public function getItems(array $keys = []): iterable
|
|
{
|
|
return $this->cache->getItems($keys);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function hasItem(string $key): bool
|
|
{
|
|
return $this->cache->hasItem($key);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function clear(): bool
|
|
{
|
|
/* only bother clearing the pool if it is not empty */
|
|
if (!empty($this->getKeys())) {
|
|
$response = $this->cache->clear();
|
|
|
|
$this->initialize();
|
|
|
|
return $response;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function deleteItem(string $key): bool
|
|
{
|
|
$this->isValid($key);
|
|
$keyList = $this->cache->getItem(self::KEY_LIST);
|
|
$keyValues = $keyList->get();
|
|
if (isset($keyValues[$key])) {
|
|
unset($keyValues[$key]);
|
|
$keyList->set($keyValues);
|
|
$this->cache->saveDeferred($keyList);
|
|
$this->logChange($key, self::REMOVED);
|
|
$this->cache->commit();
|
|
}
|
|
|
|
return $this->cache->deleteItem($key);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function deleteItems(array $keys): bool
|
|
{
|
|
$this->allValid($keys);
|
|
$keyList = $this->cache->getItem(self::KEY_LIST);
|
|
$keyValues = $keyList->get();
|
|
foreach ($keys as $key) {
|
|
if (isset($keyValues[$key])) {
|
|
unset($keyValues[$key]);
|
|
$this->logChange($key, self::REMOVED);
|
|
}
|
|
}
|
|
$keyList->set($keyValues);
|
|
$this->cache->saveDeferred($keyList);
|
|
$this->cache->commit();
|
|
|
|
return $this->cache->deleteItems($keys);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function save(CacheItemInterface $item): bool
|
|
{
|
|
$this->update($item);
|
|
|
|
return $this->cache->save($item);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function saveDeferred(CacheItemInterface $item): bool
|
|
{
|
|
$this->update($item);
|
|
|
|
return $this->cache->saveDeferred($item);
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function commit(): bool
|
|
{
|
|
return $this->cache->commit();
|
|
}
|
|
|
|
/** @throws InvalidArgumentException|OutOfBoundsException */
|
|
private function update(CacheItemInterface $item): void
|
|
{
|
|
$this->isValid($item->getKey());
|
|
$keyList = $this->cache->getItem(self::KEY_LIST);
|
|
$keyValues = $keyList->get();
|
|
$keyValues[$item->getKey()] = true;
|
|
$keyList->set($keyValues);
|
|
$this->logChange($item->getKey());
|
|
$this->cache->saveDeferred($keyList);
|
|
$this->cache->commit();
|
|
}
|
|
|
|
/** @throws OutOfBoundsException */
|
|
private function isValid(string $key): void
|
|
{
|
|
if (self::KEY_LIST === $key || self::CHANGE_LIST === $key) {
|
|
throw new OutOfBoundsException('Can not modify the private key or change lists');
|
|
}
|
|
}
|
|
|
|
/** @throws OutOfBoundsException */
|
|
private function allValid(array $keys): void
|
|
{
|
|
if (\in_array(self::KEY_LIST, $keys, true)
|
|
|| \in_array(self::CHANGE_LIST, $keys, true)
|
|
) {
|
|
throw new OutOfBoundsException('Can not modify the private key or change lists');
|
|
}
|
|
}
|
|
|
|
/** @throws InvalidArgumentException */
|
|
private function logChange(string $key, int $code = self::UPDATED): void
|
|
{
|
|
$changeList = $this->cache->getItem(self::CHANGE_LIST);
|
|
$changeValues = $changeList->get();
|
|
$changeValues[$key] = $code;
|
|
$changeList->set($changeValues);
|
|
$this->cache->saveDeferred($changeList);
|
|
}
|
|
}
|