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.
254 lines
7.9 KiB
PHP
254 lines
7.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Tests\Unit\Trait;
|
|
|
|
use App\Trait\MakeNonceTrait;
|
|
use DateInterval;
|
|
use DateTimeInterface;
|
|
use PHPUnit\Framework\TestCase;
|
|
use Psr\Cache\CacheItemInterface;
|
|
use Psr\Cache\CacheItemPoolInterface;
|
|
use Psr\Log\NullLogger;
|
|
use Symfony\Component\Cache\Adapter\ArrayAdapter;
|
|
use Symfony\Component\HttpKernel\Exception\HttpException;
|
|
|
|
/**
|
|
* Wraps the trait in a concrete class with public proxies so the protected
|
|
* methods can be exercised from test scope.
|
|
*/
|
|
final class MakeNonceTraitTest extends TestCase
|
|
{
|
|
private function makeObject(): object
|
|
{
|
|
return new class {
|
|
use MakeNonceTrait;
|
|
|
|
public function publicMakeNonce(int $retries = 3): string
|
|
{
|
|
return $this->makeNonce($retries);
|
|
}
|
|
|
|
public function publicMakeCacheKey(string $name): string
|
|
{
|
|
return $this->makeCacheKey($name);
|
|
}
|
|
};
|
|
}
|
|
|
|
public function test_make_nonce_returns_base64_url_string(): void
|
|
{
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache(new ArrayAdapter());
|
|
|
|
$nonce = $obj->publicMakeNonce();
|
|
|
|
self::assertIsString($nonce);
|
|
// 15 bytes -> 20 base64 chars without padding
|
|
self::assertSame(20, \strlen($nonce));
|
|
// base64url charset only
|
|
self::assertMatchesRegularExpression('/^[A-Za-z0-9_-]+$/', $nonce);
|
|
}
|
|
|
|
public function test_make_nonce_stores_nonce_in_cache(): void
|
|
{
|
|
$pool = new ArrayAdapter();
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache($pool);
|
|
|
|
$nonce = $obj->publicMakeNonce();
|
|
|
|
// makeNonce stores via makeCacheKey() which rewrites '-' to '_'
|
|
$key = $obj->publicMakeCacheKey($nonce);
|
|
self::assertTrue($pool->hasItem($key));
|
|
$item = $pool->getItem($key);
|
|
self::assertTrue($item->get());
|
|
}
|
|
|
|
public function test_make_nonce_sets_expiry(): void
|
|
{
|
|
$pool = new ArrayAdapter();
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache($pool);
|
|
|
|
$nonce = $obj->publicMakeNonce();
|
|
|
|
$item = $pool->getItem($obj->publicMakeCacheKey($nonce));
|
|
$expiry = $item->getMetadata()['expiry'];
|
|
// NONCE_TTL is 120 seconds
|
|
self::assertLessThanOrEqual(120, (int) $expiry - time());
|
|
self::assertGreaterThan(time(), (int) $expiry);
|
|
}
|
|
|
|
public function test_two_nonces_are_different(): void
|
|
{
|
|
$pool = new ArrayAdapter();
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache($pool);
|
|
|
|
$nonce1 = $obj->publicMakeNonce();
|
|
$nonce2 = $obj->publicMakeNonce();
|
|
|
|
self::assertNotSame($nonce1, $nonce2);
|
|
}
|
|
|
|
public function test_make_nonce_throws_after_max_retries(): void
|
|
{
|
|
// Create a stub pool that always reports every key as a hit (collision)
|
|
$pool = $this->createStub(CacheItemPoolInterface::class);
|
|
$item = $this->createStub(CacheItemInterface::class);
|
|
$item->method('isHit')->willReturn(true);
|
|
$item->method('get')->willReturn(true);
|
|
$pool->method('getItem')->willReturn($item);
|
|
$pool->method('save')->willReturn(true);
|
|
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache($pool);
|
|
|
|
$this->expectException(HttpException::class);
|
|
$this->expectExceptionMessage('Internal Server Error');
|
|
|
|
$obj->publicMakeNonce();
|
|
}
|
|
|
|
public function test_make_nonce_retries_and_succeeds_after_collision(): void
|
|
{
|
|
// Use a spy pool that returns isHit=true on the first getItem call
|
|
// (simulating a collision), then delegates to a real ArrayAdapter for
|
|
// subsequent calls so the retry succeeds.
|
|
$realPool = new ArrayAdapter();
|
|
$collisionCount = 0;
|
|
|
|
$spyPool = new class($realPool, $collisionCount) implements CacheItemPoolInterface {
|
|
private int $hits = 0;
|
|
|
|
public function __construct(
|
|
private CacheItemPoolInterface $inner,
|
|
private int &$hitCounter,
|
|
) {
|
|
}
|
|
|
|
public function getItem(string $key): CacheItemInterface
|
|
{
|
|
$item = $this->inner->getItem($key);
|
|
// pretend the first requested key is already a hit (collision)
|
|
if (0 === $this->hits) {
|
|
++$this->hits;
|
|
++$this->hitCounter;
|
|
|
|
return new class($key) implements CacheItemInterface {
|
|
public function __construct(private string $key)
|
|
{
|
|
}
|
|
|
|
public function getKey(): string
|
|
{
|
|
return $this->key;
|
|
}
|
|
|
|
public function get(): mixed
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public function isHit(): bool
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public function set(mixed $value): static
|
|
{
|
|
return $this;
|
|
}
|
|
|
|
public function expiresAt(?DateTimeInterface $expiration): static
|
|
{
|
|
return $this;
|
|
}
|
|
|
|
public function expiresAfter(int|DateInterval|null $time): static
|
|
{
|
|
return $this;
|
|
}
|
|
};
|
|
}
|
|
|
|
return $item;
|
|
}
|
|
|
|
public function getItems(array $keys = []): iterable
|
|
{
|
|
return $this->inner->getItems($keys);
|
|
}
|
|
|
|
public function hasItem(string $key): bool
|
|
{
|
|
return $this->inner->hasItem($key);
|
|
}
|
|
|
|
public function clear(): bool
|
|
{
|
|
return $this->inner->clear();
|
|
}
|
|
|
|
public function deleteItem(string $key): bool
|
|
{
|
|
return $this->inner->deleteItem($key);
|
|
}
|
|
|
|
public function deleteItems(array $keys): bool
|
|
{
|
|
return $this->inner->deleteItems($keys);
|
|
}
|
|
|
|
public function save(CacheItemInterface $item): bool
|
|
{
|
|
return $this->inner->save($item);
|
|
}
|
|
|
|
public function saveDeferred(CacheItemInterface $item): bool
|
|
{
|
|
return $this->inner->saveDeferred($item);
|
|
}
|
|
|
|
public function commit(): bool
|
|
{
|
|
return $this->inner->commit();
|
|
}
|
|
};
|
|
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache($spyPool);
|
|
|
|
// should retry and succeed on the second attempt
|
|
$nonce = $obj->publicMakeNonce();
|
|
self::assertIsString($nonce);
|
|
self::assertSame(20, \strlen($nonce));
|
|
self::assertSame(1, $collisionCount, 'Expected exactly one collision before success');
|
|
}
|
|
|
|
public function test_make_nonce_throws_immediately_with_zero_retries(): void
|
|
{
|
|
$pool = $this->createStub(CacheItemPoolInterface::class);
|
|
$item = $this->createStub(CacheItemInterface::class);
|
|
$item->method('isHit')->willReturn(true);
|
|
$item->method('get')->willReturn(true);
|
|
$pool->method('getItem')->willReturn($item);
|
|
$pool->method('save')->willReturn(true);
|
|
|
|
$obj = $this->makeObject();
|
|
$obj->setLogger(new NullLogger());
|
|
$obj->setNonceCache($pool);
|
|
|
|
$this->expectException(HttpException::class);
|
|
$obj->publicMakeNonce(0);
|
|
}
|
|
}
|