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.
136 lines
3.4 KiB
PHP
136 lines
3.4 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App;
|
|
|
|
use App\Enum\RemoteUserMode;
|
|
use Psr\Cache\InvalidArgumentException;
|
|
use Psr\Clock\ClockInterface;
|
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
|
|
|
final readonly class ConfigBag
|
|
{
|
|
private ClockInterface $clock;
|
|
private int $cookieTtl;
|
|
private string $totpUri;
|
|
private ?int $ipTtl;
|
|
private bool $teapot;
|
|
private string $errorMessage;
|
|
private string $teapotTitle;
|
|
private string $tooManyTitle;
|
|
private RemoteUserMode $remoteUserMode;
|
|
private string $remoteUserStatic;
|
|
/** @var array<string,string> */
|
|
private array $remoteUserMap;
|
|
|
|
/** @throws InvalidArgumentException */
|
|
public function __construct(
|
|
Utilities $utilities,
|
|
ClockInterface $clock,
|
|
#[Autowire('%app.cookie_ttl%')] int $cookieTtl,
|
|
#[Autowire('%app.totp_uri%')] string $totpUri,
|
|
#[Autowire('%app.ip_ttl%')] ?int $ipTtl,
|
|
#[Autowire('%app.teapot%')] bool $teapot,
|
|
#[Autowire('%app.error_message%')] string $errorMessage,
|
|
#[Autowire('%app.teapot_title%')] string $teapotTitle,
|
|
#[Autowire('%app.too_many_title%')] string $tooManyTitle,
|
|
#[Autowire('%app.remote_user%')] string $remoteUserMode,
|
|
#[Autowire('%app.remote_user_static%')] string $remoteUserStatic,
|
|
#[Autowire('%app.remote_user_map%')] string $remoteUserMap,
|
|
) {
|
|
$this->clock = $clock;
|
|
$this->cookieTtl = $cookieTtl;
|
|
$this->totpUri = $totpUri ?: $utilities->loadTotp();
|
|
$this->ipTtl = $ipTtl ?: null;
|
|
$this->teapot = $teapot;
|
|
$this->errorMessage = $errorMessage;
|
|
$this->teapotTitle = $teapotTitle;
|
|
$this->tooManyTitle = $tooManyTitle;
|
|
|
|
$this->remoteUserMode = RemoteUserMode::tryFrom($remoteUserMode) ?? RemoteUserMode::Session;
|
|
$this->remoteUserStatic = $remoteUserStatic;
|
|
$this->remoteUserMap = $this->parseUserMap($remoteUserMap);
|
|
}
|
|
|
|
/**
|
|
* Parse a comma-separated map string ("id1:user1,id2:user2") into an array.
|
|
*
|
|
* @return array<string,string>
|
|
*/
|
|
private function parseUserMap(string $map): array
|
|
{
|
|
if ('' === $map) {
|
|
return [];
|
|
}
|
|
|
|
$result = [];
|
|
foreach (explode(',', $map) as $pair) {
|
|
$parts = explode(':', trim($pair), 2);
|
|
if (2 === \count($parts)) {
|
|
$result[trim($parts[0])] = trim($parts[1]);
|
|
}
|
|
}
|
|
|
|
return $result;
|
|
}
|
|
|
|
public function clock(): ClockInterface
|
|
{
|
|
return $this->clock;
|
|
}
|
|
|
|
public function cookieTtl(): int
|
|
{
|
|
return $this->cookieTtl;
|
|
}
|
|
|
|
public function totpUri(): string
|
|
{
|
|
return $this->totpUri;
|
|
}
|
|
|
|
public function ipTtl(): ?int
|
|
{
|
|
return $this->ipTtl;
|
|
}
|
|
|
|
public function teapot(): bool
|
|
{
|
|
return $this->teapot;
|
|
}
|
|
|
|
public function errorMessage(): string
|
|
{
|
|
return $this->errorMessage;
|
|
}
|
|
|
|
public function teapotTitle(): string
|
|
{
|
|
return $this->teapotTitle;
|
|
}
|
|
|
|
public function tooManyTitle(): string
|
|
{
|
|
return $this->tooManyTitle;
|
|
}
|
|
|
|
public function remoteUserMode(): RemoteUserMode
|
|
{
|
|
return $this->remoteUserMode;
|
|
}
|
|
|
|
public function remoteUserStatic(): string
|
|
{
|
|
return $this->remoteUserStatic;
|
|
}
|
|
|
|
/**
|
|
* @return array<string,string>
|
|
*/
|
|
public function remoteUserMap(): array
|
|
{
|
|
return $this->remoteUserMap;
|
|
}
|
|
}
|