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.
142 lines
3.9 KiB
PHP
142 lines
3.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Service;
|
|
|
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
|
|
|
/**
|
|
* Matches request paths against configured public path patterns.
|
|
*
|
|
* Patterns are provided as a comma-separated string in the format:
|
|
* /path/pattern, host.example.com/path/pattern, or a mix.
|
|
*
|
|
* Wildcards:
|
|
* - * matches any characters within a single path segment (not crossing /)
|
|
* - ** matches any characters including / (crosses path segments)
|
|
*
|
|
* Query strings are not part of the pattern — matching is against the
|
|
* path only.
|
|
*/
|
|
final readonly class PublicPathMatcher implements PublicPathMatcherInterface
|
|
{
|
|
/** @var list<array{host: ?string, regex: string}> */
|
|
private array $patterns;
|
|
|
|
public function __construct(
|
|
#[Autowire('%app.public_paths%')] string $publicPaths,
|
|
) {
|
|
$this->patterns = $this->parse($publicPaths);
|
|
}
|
|
|
|
public function isEmpty(): bool
|
|
{
|
|
return [] === $this->patterns;
|
|
}
|
|
|
|
public function matches(string $host, string $path): bool
|
|
{
|
|
if ([] === $this->patterns) {
|
|
return false;
|
|
}
|
|
|
|
$host = strtolower($host);
|
|
|
|
foreach ($this->patterns as $entry) {
|
|
if (null !== $entry['host'] && $entry['host'] !== $host) {
|
|
continue;
|
|
}
|
|
|
|
if (1 === preg_match($entry['regex'], $path)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Parse the comma-separated PUBLIC_PATHS string into pattern entries.
|
|
*
|
|
* @return list<array{host: ?string, regex: string}>
|
|
*/
|
|
private function parse(string $publicPaths): array
|
|
{
|
|
if ('' === trim($publicPaths)) {
|
|
return [];
|
|
}
|
|
|
|
$patterns = [];
|
|
|
|
foreach (explode(',', $publicPaths) as $raw) {
|
|
$entry = trim($raw);
|
|
if ('' === $entry) {
|
|
continue;
|
|
}
|
|
|
|
// Check for a host prefix (anything before the first /)
|
|
$host = null;
|
|
$path = $entry;
|
|
|
|
if (preg_match('/^([a-z0-9.-]+)(\/.*)$/i', $entry, $m)) {
|
|
$host = strtolower($m[1]);
|
|
$path = $m[2];
|
|
}
|
|
|
|
// Validate path starts with /
|
|
if (!str_starts_with($path, '/')) {
|
|
continue;
|
|
}
|
|
|
|
$patterns[] = [
|
|
'host' => $host,
|
|
'regex' => $this->compilePattern($path),
|
|
];
|
|
}
|
|
|
|
return $patterns;
|
|
}
|
|
|
|
/**
|
|
* Convert a wildcard path pattern into a regex string.
|
|
*
|
|
* Star becomes a character class matching one or more non-slash chars.
|
|
* Double-star at end of pattern matches zero or more of any char.
|
|
* Double-star followed by slash matches zero or more path segments.
|
|
* Other characters are escaped as literal regex.
|
|
*/
|
|
private function compilePattern(string $pattern): string
|
|
{
|
|
$regex = '';
|
|
$length = \strlen($pattern);
|
|
$i = 0;
|
|
|
|
while ($i < $length) {
|
|
// Check for ** (must be at current position)
|
|
if ($i + 1 < $length && '*' === $pattern[$i] && '*' === $pattern[$i + 1]) {
|
|
$i += 2;
|
|
if ($i >= $length) {
|
|
// ** at end of pattern: zero or more chars including /
|
|
$regex .= '.*';
|
|
} elseif ('/' === $pattern[$i]) {
|
|
// /**/ in middle: zero or more intermediate segments
|
|
$regex .= '(?:.*/)?';
|
|
++$i; // skip the / after **
|
|
} else {
|
|
// ** not followed by / or end, treat as .*
|
|
$regex .= '.*';
|
|
}
|
|
} elseif ('*' === $pattern[$i]) {
|
|
$regex .= '[^/]+';
|
|
++$i;
|
|
} else {
|
|
$regex .= preg_quote($pattern[$i], '#');
|
|
++$i;
|
|
}
|
|
}
|
|
|
|
return '#^'.$regex.'$#';
|
|
}
|
|
}
|